BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6261e82)
cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 17 Mar 2021 17:03:10 +0000 (18:03 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 17 Mar 2021 17:03:34 +0000 (18:03 +0100)
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java patch | blob | history
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml patch | blob | history
eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd patch | blob | history

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java
index 47e09af4a34763fb96661358401f65fd59e36176..c2bac1d257c4c872e736c5f33ead530b0b76c090 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java
@@ -17,14 +17,11 @@ import java.util.UUID;
 
 import org.apache.log4j.Logger;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.unitils.dbunit.annotation.DataSet;
 
-import eu.etaxonomy.cdm.api.service.ICommonService;
 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.cache.CdmTransientEntityCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
@@ -37,7 +34,6 @@ import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
 /**
  * @author cmathew
  * @date 7 Oct 2014
- *
  */
 @DataSet
 public class CdmClientCachingTest extends RemotingSessionAwareTest {
@@ -46,16 +42,12 @@ public class CdmClientCachingTest extends RemotingSessionAwareTest {
        private static final Logger logger = Logger.getLogger(CdmClientCachingTest.class);
 
     private final UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66");
-    private final UUID taxon1Uuid = UUID.fromString("2b336df7-29e8-4f79-985f-66502739d22f");
     private final UUID polytomousKeyNodeUuid1 = UUID.fromString("75e4c924-ff58-4ee7-a59d-fd9173517d08");
     private final UUID polytomousKeyNodeUuid2 = UUID.fromString("b775c027-13c0-4b87-8aa9-712faeaafbdc");
 
 
     private final IPolytomousKeyService polytomousKeyService = getRemoteApplicationController().getPolytomousKeyService();
     private final IPolytomousKeyNodeService polytomousKeyNodeService = getRemoteApplicationController().getPolytomousKeyNodeService();
-    private final ICommonService commonService = getRemoteApplicationController().getCommonService();
-    private final ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
-
 
     private static final List<String> PKEY_DEPTH1_INIT_STRATEGY = Arrays.asList(new String[] {
                        });
@@ -66,15 +58,6 @@ public class CdmClientCachingTest extends RemotingSessionAwareTest {
     private static final List<String> PKEY_DEPTH3_INIT_STRATEGY = Arrays.asList(new String[] {
                "root.statement"});
 
-
-    @BeforeClass
-    public static void initializePolytomousKeyTest() {
-
-    }
-
-
-
-
     @Test
     public void recursiveLoadSubGraphDepth1Test() {
 
@@ -86,10 +69,8 @@ public class CdmClientCachingTest extends RemotingSessionAwareTest {
 
         // checking to make sure the root object is in the session cache
         Assert.assertSame(CdmBase.deproxy(pkey1.getRoot(),PolytomousKeyNode.class), cacher.getFromCache(pkey1.getRoot()));
-
     }
 
-
     @Test
     public void recursiveLoadSubGraphDepth2Test() {
 
@@ -105,7 +86,6 @@ public class CdmClientCachingTest extends RemotingSessionAwareTest {
         Assert.assertSame(CdmBase.deproxy(pkey.getRoot()), cacher.getFromCache(pkey.getRoot()));
         Assert.assertSame(CdmBase.deproxy(pkey.getRoot().getStatement()), cacher.getFromCache(pkey.getRoot().getStatement()));
         Assert.assertSame(CdmBase.deproxy(pkey.getRoot().getQuestion()), cacher.getFromCache(pkey.getRoot().getQuestion()));
-
     }
 
     /**
@@ -152,7 +132,6 @@ public class CdmClientCachingTest extends RemotingSessionAwareTest {
 
         Assert.assertSame(ks2, cacher.getFromCache(ks2));
         Assert.assertSame(cacher.getFromCache(ks1), cacher.getFromCache(ks2));
-
     }
 
     /**
diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml
index b43e96c717b6242f8f2007883bb52bf130252afc..b2c3d7fa75caecfd8776a2f7da0be221c36a84a4 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml
@@ -24,11 +24,11 @@
       RightsInfo                     1
       TaxonBase                      6
   
---><dataset>
+--><dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../database/schema/dataset.dtd">
   <PolytomousKey_Extension PolytomousKey_id="1550" extensions_id="10"/>
 
   <PolytomousKey_Credit PolytomousKey_id="1550" credits_id="20" sortIndex="0"/>
-
+  
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2751" modifyingtext_id="13780" modifyingtext_mapkey_id="124"/>
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2752" modifyingtext_id="13781" modifyingtext_mapkey_id="124"/>
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2753" modifyingtext_id="13795" modifyingtext_mapkey_id="124"/>
@@ -38,7 +38,7 @@
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2757" modifyingtext_id="13794" modifyingtext_mapkey_id="124"/>
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2758" modifyingtext_id="13791" modifyingtext_mapkey_id="124"/>
   <PolytomousKeyNode_LanguageString PolytomousKeyNode_id="2759" modifyingtext_id="13793" modifyingtext_mapkey_id="124"/>
-
+  
   <LanguageString id="13780" uuid="cceaa60b-61f4-4c8a-bb0e-d45f0fa3e2dc" text="Modifying Text 1a" language_id="124"/>
   <LanguageString id="13781" uuid="01a0ace4-de49-4725-9909-e881fb13035d" text="Modifying Text 1b" language_id="124"/>
   <LanguageString id="13782" uuid="ec0fea40-69dd-4c3e-ab7a-34948037a069" text="Capitula with ligulate ray-florets; leaves pinnatisect" createdby_id="30" updatedby_id="30" language_id="124"/>
diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
index aceb7052f4af8dd752b07b32794207d0ce919bd3..3090c413059c4edf18c4dd350b198a6b65be045b 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
@@ -881,6 +881,8 @@
     EXTERNALLINK CDATA #IMPLIED
     AUTHORITYTYPE CDATA #IMPLIED
     IMPORTMETHOD CDATA #IMPLIED
+    NOMENCLATURALSTANDING CDATA #IMPLIED
+    NOMENCLATURALSTANDINGINVERSE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     KINDOF_ID CDATA #IMPLIED
@@ -936,6 +938,8 @@
     EXTERNALLINK CDATA #IMPLIED
     AUTHORITYTYPE CDATA #IMPLIED
     IMPORTMETHOD CDATA #IMPLIED
+    NOMENCLATURALSTANDING CDATA #IMPLIED
+    NOMENCLATURALSTANDINGINVERSE CDATA #IMPLIED
     LEVEL_ID CDATA #IMPLIED
     POINTAPPROXIMATION_REFERENCESYSTEM_ID CDATA #IMPLIED
     SHAPE_ID CDATA #IMPLIED
@@ -1694,8 +1698,8 @@
 
 <!ELEMENT HIBERNATE_SEQUENCES EMPTY>
 <!ATTLIST HIBERNATE_SEQUENCES
-       SEQUENCE_NAME CDATA #IMPLIED
-       NEXT_VAL CDATA #IMPLIED
+    SEQUENCE_NAME CDATA #IMPLIED
+    NEXT_VAL CDATA #IMPLIED
 >
 
 <!ELEMENT HOMOTYPICALGROUP EMPTY>
@@ -2358,6 +2362,7 @@
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
     CDMSOURCE_ID CDATA #IMPLIED
+    SOURCEDNAME_ID CDATA #IMPLIED
 >
 
 <!ELEMENT ORIGINALSOURCEBASE_AUD EMPTY>
@@ -2376,6 +2381,7 @@
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
     CDMSOURCE_ID CDATA #IMPLIED
+    SOURCEDNAME_ID CDATA #IMPLIED
 >
 
 <!ELEMENT ORIGINALSOURCEBASE_ANNOTATION EMPTY>
@@ -3392,7 +3398,6 @@
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     HOMOTYPICALGROUP_ID CDATA #IMPLIED
-    NOMENCLATURALSOURCE_ID CDATA #IMPLIED
     RANK_ID CDATA #IMPLIED
     BASIONYMAUTHORSHIP_ID CDATA #IMPLIED
     COMBINATIONAUTHORSHIP_ID CDATA #IMPLIED
@@ -3437,7 +3442,6 @@
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     HOMOTYPICALGROUP_ID CDATA #IMPLIED
-    NOMENCLATURALSOURCE_ID CDATA #IMPLIED
     RANK_ID CDATA #IMPLIED
     ACRONYM CDATA #IMPLIED
     AUTHORSHIPCACHE CDATA #IMPLIED