CategoryBean provides super and sub categories

src/main/java/de/unipotsdam/cs/toolup/ws/beans/CategoryBean.java

@@ -14,10 +14,14 @@ import java.util.Map;
 public class CategoryBean extends BusinessObjectBean{
 
     private Collection<String> applications;
+    private String superCategory;
+    private Collection<String> subCategories;
 
     public CategoryBean(Category cat) {
         super(cat);
         this.applications = cat.getRelatedApplications();
+        this.superCategory = cat.getSuperCategory();
+        this.subCategories = cat.getSubCategories();
     }
 
 
@@ -36,6 +40,14 @@ public class CategoryBean extends BusinessObjectBean{
         }
         return result;
     }
+
+    public String getSuperCategory() {
+        return superCategory;
+    }
+
+    public Collection<String> getSubCategories() {
+        return subCategories;
+    }
 }
 
 

src/test/java/de/unipotsdam/cs/toolup/database/DatabaseControllerForCategoryTest.java

@@ -9,7 +9,7 @@ import java.util.Collection;
 
 import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.*;
 import static de.unipotsdam.cs.toolup.util.AssertionUtil.assertCollectionEquals;
-import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 public class DatabaseControllerForCategoryTest extends AbstractDatabaseTest {
 

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

@@ -5,10 +5,11 @@ import org.testng.annotations.Test;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.*;
 import static de.unipotsdam.cs.toolup.util.AssertionUtil.assertCollectionEquals;
-import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
-public class CategoryTest extends BusinessObjectTest {
+public class CategoryTest {
 
     @Test
     public void testThatCategoryMayHaveSuperCategory() {

src/test/java/de/unipotsdam/cs/toolup/ws/beans/CategoryBeanTest.java

+package de.unipotsdam.cs.toolup.ws.beans;
+
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static de.unipotsdam.cs.toolup.model.BusinessObjectTest.*;
+import static de.unipotsdam.cs.toolup.util.AssertionUtil.assertCollectionEquals;
+import static org.testng.AssertJUnit.assertEquals;
+
+public class CategoryBeanTest {
+
+    @Test
+    public void testThatCategoryBeanHasSuperCategoryField() throws Exception {
+        //arrange
+        String expectedSuperCategoryId = CATEGORY_TEST_ID_13;
+
+        //act
+        CategoryBean bean = CategoryBean.getBean(CATEGORY_TEST_ID_11);
+
+        //assert
+        assertEquals(expectedSuperCategoryId, bean.getSuperCategory());
+    }
+
+    @Test
+    public void testThatCategoryBeanHasSubCategoriesField() throws Exception {
+        //arrange
+        Collection<String> expectedSubcategoryIDs = Arrays.asList(CATEGORY_TEST_ID_11, CATEGORY_TEST_ID_12);
+
+        //act
+        CategoryBean bean = CategoryBean.getBean(CATEGORY_TEST_ID_13);
+
+        //assert
+        assertCollectionEquals(expectedSubcategoryIDs, bean.getSubCategories());
+    }
+}