fixing test with had error due to error prone and misleading instance method

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
index 3a5e5f84e000833a96830b50eeec6830f94b2fd6..cce8906fa6ff33f42c28cbf6107e8cadcb52e4e4 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
@@ -1,9 +1,9 @@
 // $Id$\r
 /**\r
 * Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
@@ -29,67 +29,68 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  */\r
 public class CategoricalDataTest {\r
 \r
-       /**\r
-        * @throws java.lang.Exception\r
-        */\r
-       @Before\r
-       public void setUp() throws Exception {\r
-       }\r
-\r
-//************************ TESTS ********************************************  \r
-       \r
-       /**\r
-        * Test method for {@link eu.etaxonomy.cdm.model.description.CategoricalData#getStatesOnly()}.\r
-        */\r
-       @Test\r
-       public void testGetStatesOnly() {\r
-               TaxonDescription desc = TaxonDescription.NewInstance();\r
-               CategoricalData data = CategoricalData.NewInstance();\r
-               desc.addElement(data);\r
-               TermVocabulary<State> useCategoryVocabulary = TermVocabulary.NewInstance("Use category vocabulary", "use categories", null, null); \r
-               State useCategory1 = State.NewInstance("My first use category", "use category 1", null);\r
-               useCategoryVocabulary.addTerm(useCategory1);\r
-               State useCategory2 = State.NewInstance("My favorite use category", "use category 2", null);\r
-               useCategoryVocabulary.addTerm(useCategory2);\r
-               \r
-               StateData stateData = StateData.NewInstance(useCategory1);\r
-               data.addState(stateData);\r
-               StateData stateData2 = StateData.NewInstance(useCategory2);\r
-               stateData2.addModifier(Modifier.NewInstance(null, "Any modifer", null));\r
-               data.addState(stateData2);\r
-               \r
-               List<State> states = data.getStatesOnly();\r
-               Assert.assertEquals("There should be 2 states", 2, states.size());\r
-\r
-       }\r
-       \r
-       /**\r
-        * Test method for {@link eu.etaxonomy.cdm.model.description.CategoricalData#setStatesOnly(List)}.\r
-        */\r
-       @Test\r
-       public void testSetStatesOnly() {\r
-               TaxonDescription desc = TaxonDescription.NewInstance();\r
-               CategoricalData data = CategoricalData.NewInstance();\r
-               desc.addElement(data);\r
-               TermVocabulary<State> useCategoryVocabulary = TermVocabulary.NewInstance("Use category vocabulary", "use categories", null, null); \r
-               State useCategory1 = State.NewInstance("My first use category", "use category 1", null);\r
-               useCategoryVocabulary.addTerm(useCategory1);\r
-               data.addState(useCategory1);\r
-               Assert.assertEquals("There should be 1 state now", 1, data.getStates().size());\r
-               \r
-               State useCategory2 = State.NewInstance("My favorite use category", "use category 2", null);\r
-               useCategoryVocabulary.addTerm(useCategory2);\r
-               State useCategory3 = State.NewInstance("My 3rd use category", "use category 3", null);\r
-               useCategoryVocabulary.addTerm(useCategory3);\r
-               List<State> newStates = new ArrayList<State>();\r
-               newStates.addAll(Arrays.asList(useCategory2, useCategory3));\r
-               \r
-               List<StateData> states = data.setStatesOnly(newStates);\r
-               Assert.assertEquals("There should be 2 states", 2, states.size());\r
-               Assert.assertEquals("There should be 2 states", 2, data.getStates().size());\r
-               Assert.assertFalse("Category 1 should not be included anymore", data.getStatesOnly().contains(useCategory1));\r
-               Assert.assertFalse("Category 2 should be included", data.getStatesOnly().contains(useCategory2));\r
-\r
-       }\r
+    /**\r
+     * @throws java.lang.Exception\r
+     */\r
+    @Before\r
+    public void setUp() throws Exception {\r
+    }\r
+\r
+//************************ TESTS ********************************************\r
+\r
+    /**\r
+     * Test method for {@link eu.etaxonomy.cdm.model.description.CategoricalData#getStatesOnly()}.\r
+     */\r
+    @Test\r
+    public void testGetStatesOnly() {\r
+        TaxonDescription desc = TaxonDescription.NewInstance();\r
+        CategoricalData data = CategoricalData.NewInstance();\r
+        desc.addElement(data);\r
+        TermVocabulary<State> useCategoryVocabulary = TermVocabulary.NewInstance("Use category vocabulary", "use categories", null, null);\r
+        State useCategory1 = State.NewInstance("My first use category", "use category 1", null);\r
+        useCategoryVocabulary.addTerm(useCategory1);\r
+        State useCategory2 = State.NewInstance("My favorite use category", "use category 2", null);\r
+        useCategoryVocabulary.addTerm(useCategory2);\r
+\r
+        StateData stateData = StateData.NewInstance(useCategory1);\r
+        data.addState(stateData);\r
+        StateData stateData2 = StateData.NewInstance(useCategory2);\r
+        stateData2.addModifier(Modifier.NewInstance(null, "Any modifer", null));\r
+        data.addState(stateData2);\r
+\r
+        List<State> states = data.getStatesOnly();\r
+        Assert.assertEquals("There should be 2 states", 2, states.size());\r
+\r
+    }\r
+\r
+    /**\r
+     * Test method for {@link eu.etaxonomy.cdm.model.description.CategoricalData#setStatesOnly(List)}.\r
+     */\r
+    @Test\r
+    public void testSetStatesOnly() {\r
+        TaxonDescription desc = TaxonDescription.NewInstance();\r
+        CategoricalData data = CategoricalData.NewInstance();\r
+        desc.addElement(data);\r
+        TermVocabulary<State> useCategoryVocabulary = TermVocabulary.NewInstance("Use category vocabulary", "use categories", null, null);\r
+        State useCategory1 = State.NewInstance("My first use category", "use category 1", null);\r
+        useCategoryVocabulary.addTerm(useCategory1);\r
+        data.addState(useCategory1);\r
+        Assert.assertEquals("There should be 1 state now", 1, data.getStates().size());\r
+\r
+        State useCategory2 = State.NewInstance("My favorite use category", "use category 2", null);\r
+        useCategoryVocabulary.addTerm(useCategory2);\r
+        State useCategory3 = State.NewInstance("My 3rd use category", "use category 3", null);\r
+        useCategoryVocabulary.addTerm(useCategory3);\r
+        List<State> newStates = new ArrayList<State>();\r
+        newStates.addAll(Arrays.asList(useCategory2, useCategory3));\r
+\r
+        // setting new states and thus removing useCategory1\r
+        List<StateData> stateDataList = data.setStatesOnly(newStates);\r
+        Assert.assertEquals("There should be 2 StateData objects", 2, stateDataList.size());\r
+        Assert.assertEquals("There should be 2 StateData objects", 2, data.getStates().size());\r
+        Assert.assertFalse("Category 1 should not be included anymore", data.getStatesOnly().contains(useCategory1));\r
+        Assert.assertTrue("Category 2 should be included", data.getStatesOnly().contains(useCategory2));\r
+\r
+    }\r
 \r
 }\r