From 428b523006b529cee9468adecced026c50b9eca0 Mon Sep 17 00:00:00 2001
From: Kristijan Mitrovic <kmitrovic@itekako.com>
Date: Tue, 14 Apr 2020 15:42:40 +0200
Subject: [PATCH] Move account deletion test

---
 .../test/system/AccountDeletionTest.java      | 29 +++++++++++++++++++
 .../java/bubble/test/system/AuthTest.java     |  1 -
 .../full_delete_account.json}                 |  0
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 bubble-server/src/test/java/bubble/test/system/AccountDeletionTest.java
 rename bubble-server/src/test/resources/models/tests/{auth/delete_account.json => account_deletion/full_delete_account.json} (100%)

diff --git a/bubble-server/src/test/java/bubble/test/system/AccountDeletionTest.java b/bubble-server/src/test/java/bubble/test/system/AccountDeletionTest.java
new file mode 100644
index 00000000..e1bcbc09
--- /dev/null
+++ b/bubble-server/src/test/java/bubble/test/system/AccountDeletionTest.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2020 Bubble, Inc.  All rights reserved.
+ * For personal (non-commercial) use, see license: https://bubblev.com/bubble-license/
+ */
+package bubble.test.system;
+
+import bubble.dao.account.AccountDAO;
+import bubble.model.account.Account;
+import bubble.test.ActivatedBubbleModelTestBase;
+import lombok.extern.slf4j.Slf4j;
+import org.cobbzilla.wizard.model.HashedPassword;
+import org.junit.Before;
+import org.junit.Test;
+
+@Slf4j
+public class AccountDeletionTest extends ActivatedBubbleModelTestBase {
+
+    @Override protected String getManifest() { return "manifest-test"; }
+
+    @Before public void resetRootPassword() {
+        // reset root password, some tests change it
+        final AccountDAO accountDAO = getConfiguration().getBean(AccountDAO.class);
+        final Account rootUser = accountDAO.findFirstAdmin();
+        accountDAO.update(rootUser.setHashedPassword(new HashedPassword(ROOT_PASSWORD)));
+    }
+
+    @Test public void testFullAccountDeletion() throws Exception { modelTest("account_deletion/full_delete_account"); }
+
+}
diff --git a/bubble-server/src/test/java/bubble/test/system/AuthTest.java b/bubble-server/src/test/java/bubble/test/system/AuthTest.java
index e333ce36..d1c2d5b2 100644
--- a/bubble-server/src/test/java/bubble/test/system/AuthTest.java
+++ b/bubble-server/src/test/java/bubble/test/system/AuthTest.java
@@ -24,7 +24,6 @@ public class AuthTest extends ActivatedBubbleModelTestBase {
         accountDAO.update(rootUser.setHashedPassword(new HashedPassword(ROOT_PASSWORD)));
     }
 
-    @Test public void testAccountDeletion () throws Exception { modelTest("auth/delete_account"); }
     @Test public void testBasicAuth () throws Exception { modelTest("auth/basic_auth"); }
     @Test public void testAccountCrud () throws Exception { modelTest("auth/account_crud"); }
     @Test public void testDeviceCrud () throws Exception { modelTest("auth/device_crud"); }
diff --git a/bubble-server/src/test/resources/models/tests/auth/delete_account.json b/bubble-server/src/test/resources/models/tests/account_deletion/full_delete_account.json
similarity index 100%
rename from bubble-server/src/test/resources/models/tests/auth/delete_account.json
rename to bubble-server/src/test/resources/models/tests/account_deletion/full_delete_account.json