Adjust tests to new database schema

src/test/java/de/unipotsdam/cs/toolup/model/BusinessObjectTest.java

@@ -21,6 +21,7 @@ public class BusinessObjectTest {
     public static final String APPLICATION_TEST_ID_2 = "application-test_id_2";
     public static final String CATEGORY_TEST_ID_11 = "category-test_id_11";
     public static final String CATEGORY_TEST_ID_12 = "category-test_id_12";
+    public static final String CATEGORY_TEST_ID_13 = "category-test_id_13";
     public static final String PROVIDE_SAMPLE_IDS = "provideSampleIds";
     public static final String PROVIDE_BOS_TO_COMPARE = "provideBOsToCompare";
     public static final String PROVIDE_BUSINESS_OBJECTS = "provideBusinessObjects";
@@ -116,7 +117,7 @@ public class BusinessObjectTest {
     }
 
     @DataProvider(name = PROVIDE_BOS_TO_COMPARE)
-    private Object[][] provideBOsToCompare() {
+    public Object[][] provideBOsToCompare() {
 
         HashSet<String> emptySet = new HashSet<>();
         HashSet<String> featSet = new HashSet<>();

src/test/java/de/unipotsdam/cs/toolup/ws/integration/IntegrationTestWebService.java

@@ -115,7 +115,7 @@ public class IntegrationTestWebService extends AbstractTestWebService {
     @DataProvider
     public Iterator<Object[]> provideAllIdsAndResourceUrl() {
         List<Object[]> data = Arrays.asList(
-                new Object[]{Arrays.asList(CATEGORY_TEST_ID_11, CATEGORY_TEST_ID_12), CATEGORY_RESOURCE_URL},
+                new Object[]{Arrays.asList(CATEGORY_TEST_ID_11, CATEGORY_TEST_ID_12, CATEGORY_TEST_ID_13), CATEGORY_RESOURCE_URL},
                 new Object[]{Arrays.asList(APPLICATION_TEST_ID_1, APPLICATION_TEST_ID_2), APPLICATION_RESOURCE_URL},
                 new Object[]{Arrays.asList(FEATURE_TEST_ID_21, FEATURE_TEST_ID_22), FEATURE_RESOURCE_URL}
         );

src/test/java/de/unipotsdam/cs/toolup/ws/resource/CategoryResourceTest.java

@@ -6,9 +6,8 @@ import org.testng.annotations.Test;
 import java.util.Arrays;
 import java.util.Collection;
 
-import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.CATEGORY_TEST_ID_11;
-import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.CATEGORY_TEST_ID_12;
-import static org.testng.Assert.assertEquals;
+import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.*;
+import static de.unipotsdam.cs.toolup.util.AssertionUtil.assertCollectionEquals;
 
 public class CategoryResourceTest {
 
@@ -17,7 +16,8 @@ public class CategoryResourceTest {
         //arrange
         Collection<CategoryBean> expectedCats = Arrays.asList(
                 CategoryBean.getBean(CATEGORY_TEST_ID_11),
-                CategoryBean.getBean(CATEGORY_TEST_ID_12)
+                CategoryBean.getBean(CATEGORY_TEST_ID_12),
+                CategoryBean.getBean(CATEGORY_TEST_ID_13)
         );
 
         CategoryResource catRes = new CategoryResource();
@@ -26,7 +26,7 @@ public class CategoryResourceTest {
         Collection<CategoryBean> cats = catRes.getAll();
 
         //assert
-        assertEquals(expectedCats, cats);
+        assertCollectionEquals(expectedCats, cats);
     }
 
 }