Fix test by making sure that all entities are loaded in sessions

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
index e4f0e32b131a5cda38b3c1322066348ebc251731..4862559db97fa7bc56cd667ea57a011d3895a94a 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
@@ -61,7 +61,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     ICommonService commonService = getRemoteApplicationController().getCommonService();
     ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
 
-    Language english = Language.getLanguageFromUuid(Language.uuidEnglish);
+    //Language english = Language.getLanguageFromUuid(Language.uuidEnglish);
 
 
 
@@ -130,7 +130,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         Integer sortIndex = (Integer)getFieldValueViaReflection(rootNode.getChildAt(0), "sortIndex");
         Assert.assertEquals(sortIndex, new Integer(0));
         String statement = "Capitula without ligulate ray-florets; leaves entire or subentire";
-        Assert.assertEquals(rootNode.getChildAt(0).getStatement().getLabelText(english), statement);
+        Assert.assertEquals(rootNode.getChildAt(0).getStatement().getLabelText(Language.ENGLISH()), statement);
 
         Assert.assertEquals(rootNode.getChildAt(1).getId(), 2753);
         Assert.assertEquals(rootNode.getChildAt(1).getParent().getId(), rootNode.getId());
@@ -138,7 +138,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         sortIndex = (Integer)getFieldValueViaReflection(rootNode.getChildAt(1), "sortIndex");
         Assert.assertEquals(sortIndex, new Integer(1));
         statement = "Capitula with ligulate ray-florets; leaves pinnatisect";
-        Assert.assertEquals(rootNode.getChildAt(1).getStatement().getLabelText(english), statement);
+        Assert.assertEquals(rootNode.getChildAt(1).getStatement().getLabelText(Language.ENGLISH()), statement);
 
         Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getId(), 2754);
         Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getParent().getId(), rootNode.getChildAt(1).getId());
@@ -146,7 +146,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         sortIndex = (Integer)getFieldValueViaReflection(rootNode.getChildAt(1).getChildAt(0), "sortIndex");
         Assert.assertEquals(sortIndex, new Integer(0));
         statement = "Ray-florets yellow";
-        Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getStatement().getLabelText(english), statement);
+        Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getStatement().getLabelText(Language.ENGLISH()), statement);
         Assert.assertEquals(rootNode.getChildAt(1).getChildAt(0).getChildAt(0).getTaxon().getTitleCache(), "Achillea arabica Kotschy sec. Cyprus");
     }
 
@@ -158,7 +158,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         String newQuestion = "New Question";
         String newStatement = "New Statement";
 
-        Assert.assertEquals("Question 1",pkeynode.getQuestion().getLabel().get(english).getText());
+        Assert.assertEquals("Question 1",pkeynode.getQuestion().getLabel().get(Language.ENGLISH()).getText());
         for(PolytomousKeyNode node : pkeynode.getChildren()) {
 
             node.setQuestion(null);
@@ -170,10 +170,10 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         //Assert.assertEquals(feature.getTitleCache(),"Systematics");
         //pkeynode.setFeature(null);
 
-        Assert.assertEquals(pkeynode.getChildAt(0).getModifyingText().get(english).getText(),"Modifying Text 1a");
+        Assert.assertEquals(pkeynode.getChildAt(0).getModifyingText().get(Language.ENGLISH()).getText(),"Modifying Text 1a");
         String modifyingText = "Modifying Text 1a updated";
 
-        //pkeynode.getChildAt(0).putModifyingText(english, modifyingText);
+        //pkeynode.getChildAt(0).putModifyingText(Language.ENGLISH(), modifyingText);
 
         Assert.assertEquals(pkeynode.getChildAt(0).getSubkey().getId(),751);
         Assert.assertEquals("Asphodeline", pkeynode.getChildAt(0).getSubkey().getTitleCache());
@@ -189,9 +189,9 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         pkeynode = pkey.getRoot();
         for(PolytomousKeyNode node : pkeynode.getChildren()) {
             Assert.assertNull(node.getQuestion());
-            node.setQuestion(KeyStatement.NewInstance(english,newQuestion));
+            node.setQuestion(KeyStatement.NewInstance(Language.ENGLISH(),newQuestion));
             Assert.assertNull(node.getStatement());
-            node.setStatement(KeyStatement.NewInstance(english,newStatement));
+            node.setStatement(KeyStatement.NewInstance(Language.ENGLISH(),newStatement));
         }
 
         Assert.assertEquals(pkeynode.getChildAt(1).getTaxon(), taxon);
@@ -204,9 +204,9 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
         for(PolytomousKeyNode node : pkeynode.getChildren()) {
             Assert.assertNotNull(node.getQuestion());
             Map<Language, LanguageString> label = node.getQuestion().getLabel();
-            Assert.assertEquals(newQuestion, label.get(english).getText());
+            Assert.assertEquals(newQuestion, label.get(Language.ENGLISH()).getText());
             Assert.assertNotNull(node.getStatement());
-            Assert.assertEquals(newStatement, node.getStatement().getLabel(english).getText());
+            Assert.assertEquals(newStatement, node.getStatement().getLabel(Language.ENGLISH()).getText());
         }
         //Assert.assertEquals(pkeynode.getFeature().getId(), feature.getId());