[Task 71442] fixed the tests without the additional cleanup required

DSpace · Jun 19, 2020 · 891ab3f · 891ab3f
1 parent de6bc7d
commit 891ab3f
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestControllerIT.java
@@ -12,19 +12,16 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.RegistrationRest;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.eperson.RegistrationData;
 import org.dspace.eperson.dao.RegistrationDataDAO;
 import org.dspace.services.ConfigurationService;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -36,19 +33,6 @@ public class RegistrationRestControllerIT extends AbstractControllerIntegrationT
     @Autowired
     private ConfigurationService configurationService;
 
-
-    @Before
-    public void setup() throws SQLException {
-        CollectionUtils.emptyIfNull(registrationDataDAO.findAll(context, RegistrationData.class)).stream()
-                       .forEach(registrationData -> {
-                           try {
-                               registrationDataDAO.delete(context, registrationData);
-                           } catch (SQLException e) {
-                               throw new RuntimeException(e);
-                           }
-                       });
-    }
-
     @Test
     public void registrationFlowTest() throws Exception {
         List<RegistrationData> registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
@@ -119,5 +103,6 @@ public void forgotPasswordTest() throws Exception {
             RegistrationData registrationData = iterator.next();
             registrationDataDAO.delete(context, registrationData);
         }
+        context.complete();
     }
 }