cleanup

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
index c44d337d87934cd460e3c344d79186600b56a84b..f099561e14830a898ca84eef09062262f41e0dde 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
@@ -10,7 +10,8 @@ package eu.etaxonomy.taxeditor.httpinvoker;
 
 import java.util.UUID;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -27,11 +28,10 @@ import eu.etaxonomy.taxeditor.session.MockSessionOwner;
 /**
  * @author cmathew
  * @date 12 Jun 2015
- *
  */
 public abstract class RemotingSessionAwareTest extends BaseRemotingTest {
 
-    private static final Logger logger = LogManager.getLogger(RemotingSessionAwareTest.class);
+    private static final Logger logger = LogManager.getLogger();
 
     protected ConversationalTransientEntityCacher cacher;
     protected MockSessionOwner sessionOwner;

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 48fb345afe62b1a412bfb5366901c5157d9f093f..ddf80cc8330552678003c9ab46d1f839c9ca2aa6 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
@@ -18,7 +18,6 @@ import java.util.UUID;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.unitils.dbunit.annotation.DataSet;
@@ -30,7 +29,6 @@ import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
@@ -64,25 +62,17 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     @SuppressWarnings("unused")
     private static final Logger logger = LogManager.getLogger(CdmEntitySessionAwareTest.class);
 
-    UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66");
-    UUID subKeyUuid = UUID.fromString("9d8bf4f6-a70a-4b80-8556-2ccfb436ff01");
-    //UUID polytomousKeyUuid = UUID.fromString("bab66772-2c83-428a-bb6d-655d12ac6097");
-    UUID taxon1Uuid = UUID.fromString("2b336df7-29e8-4f79-985f-66502739d22f");
-    UUID personUuid = UUID.fromString("945d08f2-eb92-45b6-9252-6275ea6d338b");
+    private UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66");
+    private UUID subKeyUuid = UUID.fromString("9d8bf4f6-a70a-4b80-8556-2ccfb436ff01");
+    private UUID taxon1Uuid = UUID.fromString("2b336df7-29e8-4f79-985f-66502739d22f");
+    private UUID personUuid = UUID.fromString("945d08f2-eb92-45b6-9252-6275ea6d338b");
 
-    IPolytomousKeyService polytomousKeyService = getRemoteApplicationController().getPolytomousKeyService();
-    IPolytomousKeyNodeService polytomousKeyNodeService = getRemoteApplicationController().getPolytomousKeyNodeService();
-    ICommonService commonService = getRemoteApplicationController().getCommonService();
-    ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
-    IVocabularyService vocabularyService = getRemoteApplicationController().getVocabularyService();
-    ITermService termService = getRemoteApplicationController().getTermService();
-    IUserService userService = getRemoteApplicationController().getUserService();
-
-    //Language english = Language.getLanguageFromUuid(Language.uuidEnglish);
-
-    @BeforeClass
-    public static void initializePolytomousKeyTest() {
-    }
+    private IPolytomousKeyService polytomousKeyService = getRemoteApplicationController().getPolytomousKeyService();
+    private IPolytomousKeyNodeService polytomousKeyNodeService = getRemoteApplicationController().getPolytomousKeyNodeService();
+    private ICommonService commonService = getRemoteApplicationController().getCommonService();
+    private ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
+    private IVocabularyService vocabularyService = getRemoteApplicationController().getVocabularyService();
+    private ITermService termService = getRemoteApplicationController().getTermService();
 
     @Test
     @Ignore
@@ -94,7 +84,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void readPolytmousKeyData() {
+    public void testReadPolytmousKeyData() {
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
         Set<Taxon> taxonomicScope = pKey.getTaxonomicScope();
         Iterator<Taxon> tsItr = taxonomicScope.iterator();
@@ -130,7 +120,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void readPolytomousKeyDataFromNodes() {
+    public void testReadPolytomousKeyDataFromNodes() {
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid), PolytomousKey.class);
         PolytomousKeyNode rootNode = pKey.getRoot();
 
@@ -185,7 +175,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void addGreatGrandChildPolytomousKeyNode() {
+    public void testAddGreatGrandChildPolytomousKeyNode() {
 
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
         PolytomousKeyNode rootChildNode = pKey.getRoot().getChildAt(0);
@@ -198,7 +188,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void savePolytomousKeyNodeData() {
+    public void testSavePolytomousKeyNodeData() {
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
         PolytomousKeyNode pkeynode = pkey.getRoot();
@@ -258,7 +248,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void savePolytomousKeyNodeDataWithSameSubKey() {
+    public void testSavePolytomousKeyNodeDataWithSameSubKey() {
 
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
@@ -278,7 +268,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void savePolytomousKeyNodeDataWithSameSubKeyUsingService() {
+    public void testSavePolytomousKeyNodeDataWithSameSubKeyUsingService() {
 
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
@@ -303,7 +293,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void savePolytomousKeyNodeDataWithSameLanguageInLabel() {
+    public void testSavePolytomousKeyNodeDataWithSameLanguageInLabel() {
 
         PolytomousKey pkey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
         PolytomousKeyNode pkeynode = pkey.getRoot();
@@ -318,7 +308,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void deleteSubKeyInPolytomousSubKeyWithoutInitializing() {
+    public void testDeleteSubKeyInPolytomousSubKeyWithoutInitializing() {
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
         PolytomousKeyNode rootNode = pKey.getRoot();
@@ -356,7 +346,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
 
 
     @Test
-    public void deleteSubKeyInPolytomousNode() {
+    public void testDeleteSubKeyInPolytomousNode() {
         PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
         PolytomousKeyNode rootNode = pKey.getRoot();
@@ -372,9 +362,9 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void deleteSubKeyInPolytomousSubKeyAfterInitializing() {
-        PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
+    public void testDeleteSubKeyInPolytomousSubKeyAfterInitializing() {
 
+        PolytomousKey pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
 
         PolytomousKeyNode rootNode = pKey.getRoot();
         PolytomousKeyNode child = rootNode.getChildAt(0);
@@ -394,7 +384,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void saveNewTermVocabulary() {
+    public void testSaveNewTermVocabulary() {
         TermVocabulary<Feature> termVocabulary =
                 TermVocabulary.NewInstance(TermType.Feature,
                         null,
@@ -418,7 +408,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void saveNewTerm() {
+    public void testSaveNewTerm() {
         UUID vocNameFeatureUuid = UUID.fromString("fa7ca3eef-4092-49e1-beec-ed5096193e5e");
         UUID vocFeatureUuid = UUID.fromString("b187d555-f06f-4d65-9e53-da7c93f8eaa8");
         Feature newTerm = (Feature)TermType.Feature.getEmptyDefinedTermBase(null);
@@ -493,7 +483,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void updatePerson() {
+    public void testUpdatePerson() {
         // Test for #5138
         Person person = (Person) CdmApplicationState.getCurrentAppConfig().getAgentService().load(personUuid);
         person.setGivenName("Me");
@@ -501,7 +491,7 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest {
     }
 
     @Test
-    public void createPerson() {
+    public void testCreatePerson() {
         // Test for #5138
         Person person = Person.NewInstance();
         person = (Person) CdmApplicationState.getCurrentAppConfig().getAgentService().merge(person);