WIP

AoU-IntegrationTests/src/test/java/ch/unige/aou/test/B_AdminTestSuite.java

@@ -8,7 +8,6 @@ import ch.unige.aou.test.admin.OAuth2ClientIT;
 import ch.unige.aou.test.admin.PersonAsAdminIT;
 import ch.unige.aou.test.admin.PersonAsRootIT;
 import ch.unige.aou.test.admin.PersonAsUserIT;
-import ch.unige.aou.test.admin.PersonUserCleanIT;
 import ch.unige.aou.test.admin.PublicationSubtypeIT;
 import ch.unige.aou.test.admin.ResearchGroupIT;
 import ch.unige.aou.test.admin.RoleAsAdminIT;
@@ -34,7 +33,6 @@ import ch.unige.aou.test.admin.UserAsUserIT;
                             UserAsUserIT.class,
                             UserAsAdminIT.class,
                             UserAsRootIT.class,
-                            OAuth2ClientIT.class,
-                            PersonUserCleanIT.class })
+                            OAuth2ClientIT.class})
 public class B_AdminTestSuite {
 }

AoU-IntegrationTests/src/test/java/ch/unige/aou/test/admin/PersonUserCleanIT.java

-package ch.unige.aou.test.admin;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-// Should be executed after PersonAsUserIT
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles("admin")
-public class PersonUserCleanIT extends AbstractAdminIT {
-  @Test
-  public void empty() {
-  }
-
-  @Override
-  protected void deleteFixtures() {
-    this.clearPeopleFixtures();
-    this.clearInstitutionsFixtures();
-  }
-}

AoU-IntegrationTests/src/test/java/ch/unige/aou/test/clean/CleanIT.java

@@ -7,13 +7,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import ch.unige.aou.test.AbstractIT;
+import ch.unige.aou.test.admin.AbstractAdminIT;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ActiveProfiles("root")
 
-public class CleanIT extends AbstractIT {
+public class CleanIT extends AbstractAdminIT {
 
   @Test
   public void cleanTest() {
@@ -24,5 +24,7 @@ public class CleanIT extends AbstractIT {
   @Override
   protected void deleteFixtures() {
     this.clearLicenseFixtures();
+    this.clearPeopleFixtures();
+    this.clearInstitutionsFixtures();
   }
 }