BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ref #9359 upgrade TaxEditor to log4j2
[taxeditor.git] / eu.etaxonomy.taxeditor.test / src / test / java / eu / etaxonomy / taxeditor / lazyloading / RemoteLazyLoadingTest.java
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
index 5a6368050b8fd7685df3079fc7d9579cc288b479..ff272ce29b6ca98e7105c72781f18e1ac2ab5fb3 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -27,12 +27,13 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
+import eu.etaxonomy.cdm.model.name.IBotanicalName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
+import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.httpinvoker.BaseRemotingTest;
 
 
@@ -49,7 +50,7 @@ import eu.etaxonomy.taxeditor.httpinvoker.BaseRemotingTest;
 @Ignore
 public class RemoteLazyLoadingTest extends BaseRemotingTest {
 
-    private static final Logger logger = Logger.getLogger(RemoteLazyLoadingTest.class);
+    private static final Logger logger = LogManager.getLogger(RemoteLazyLoadingTest.class);
 
     private static IClassificationService classificationService;
     private static ITaxonService taxonService;
@@ -92,7 +93,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
             String taxonTitle = taxon.getTitleCache();
             logger.info("Taxon : " + taxonTitle);
 
-            TaxonNameBase name = taxon.getName();
+            TaxonName name = taxon.getName();
             Assert.assertNotNull(name);
 
             String nameTitle = name.getTitleCache();
@@ -140,7 +141,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
 
         Team combAuthor = Team.NewInstance();
         combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
-        BotanicalName name = BotanicalName.NewInstance(null, "Test1", null, null, null, null, null, null, null);
+        IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
         name.setCombinationAuthorship(combAuthor);
         Taxon taxon = Taxon.NewInstance(name, null);
         UUID taxonUuid = taxonService.save(taxon).getUuid();
@@ -162,7 +163,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
                 "name"
         });
         Taxon taxonNew = (Taxon)taxonService.findTaxonByUuid(taxonUuid,TAXON_INIT_STRATEGY);
-        NonViralName nvn = CdmBase.deproxy(taxonNew.getName(),NonViralName.class);
+        TaxonName nvn = CdmBase.deproxy(taxonNew.getName());
         Team team = CdmBase.deproxy(nvn.getCombinationAuthorship(),Team.class);
         String oldTitleCache = nvn.getTitleCache();
         System.out.println("Taxon Name Title : " + oldTitleCache);
@@ -176,7 +177,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
     public void testCDMEntitySaveLazy() {
         Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
 
-        NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+        INonViralName nvn = CdmBase.deproxy(taxon.getName());
         String oldTitleCache = nvn.getTitleCache();
         System.out.println("Taxon Name Title : " + oldTitleCache);
         nvn.setTitleCache(oldTitleCache + ":updated", true);
@@ -202,21 +203,21 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
     public void testCDMEntitySaveLazyNew() {
         Team combAuthor = Team.NewInstance();
         combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
-        BotanicalName name = BotanicalName.NewInstance(null, "Test1", null, null, null, null, null, null, null);
+        IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
         name.setCombinationAuthorship(combAuthor);
         Taxon tax1 = Taxon.NewInstance(name, null);
         UUID taxonUuid1 = taxonService.save(tax1).getUuid();
 
         Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
 
-        NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+        INonViralName nvn = CdmBase.deproxy(taxon.getName());
         String oldTitleCache = nvn.getTitleCache();
         logger.info("Taxon Name Title : " + oldTitleCache);
         nvn.setTitleCache(oldTitleCache + ":updated",false);
         taxonService.update(taxon);
 
         Taxon taxonNew = (Taxon)taxonService.find(taxonUuid1);
-        NonViralName nvnNew = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+        INonViralName nvnNew = CdmBase.deproxy(taxon.getName());
         logger.info("New Taxon Name Title : " + nvnNew.getTitleCache());
 
         Assert.assertTrue("Title caches should not be equal",oldTitleCache.equals(nvnNew.getTitleCache()));
@@ -225,7 +226,7 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
         taxonService.update(taxon);
 
         Taxon taxonOld = (Taxon)taxonService.find(taxonUuid1);
-        NonViralName nvnOld = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+        INonViralName nvnOld = CdmBase.deproxy(taxon.getName());
         logger.info("Old Taxon Name Title : " + nvnNew.getTitleCache());
 
         Assert.assertEquals("Title caches should be equal",oldTitleCache,nvnOld.getTitleCache());
@@ -235,41 +236,41 @@ public class RemoteLazyLoadingTest extends BaseRemotingTest {
     public void testCDMEntitySaveCollection() {
         Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
 
-        Set<SynonymRelationship> synRelations = taxon.getSynonymRelations();
+        Set<TaxonRelationship> taxRelations = taxon.getTaxonRelations();
         Set<String> relToTitles = new HashSet<String>();
-        Iterator<SynonymRelationship> srItr = synRelations.iterator();
-        while(srItr.hasNext()) {
-            SynonymRelationship sr = srItr.next();
-            System.out.println("Synonym Title Cache : " + sr.getSynonym().getTitleCache());
-            relToTitles.add(sr.getSynonym().getTitleCache());
-            sr.getSynonym().setTitleCache(sr.getSynonym().getTitleCache() + ":updated");
+        Iterator<TaxonRelationship> trItr = taxRelations.iterator();
+        while(trItr.hasNext()) {
+            TaxonRelationship tr = trItr.next();
+            System.out.println("Synonym Title Cache : " + tr.getFromTaxon().getTitleCache());
+            relToTitles.add(tr.getFromTaxon().getTitleCache());
+            tr.getFromTaxon().setTitleCache(tr.getFromTaxon().getTitleCache() + ":updated");
 
         }
         taxonService.merge(taxon);
 
         Taxon taxonNew = (Taxon)taxonService.find(taxonUuid1);
-        Set<SynonymRelationship> synRelationsNew = taxonNew.getSynonymRelations();
+        Set<TaxonRelationship> taxRelationsNew = taxonNew.getTaxonRelations();
 
-        Iterator<SynonymRelationship> srItrNew = synRelationsNew.iterator();
+        Iterator<TaxonRelationship> trItrNew = taxRelationsNew.iterator();
         Iterator<String> relToTitlesItr = relToTitles.iterator();
-        while(srItrNew.hasNext() && relToTitlesItr.hasNext()) {
-            SynonymRelationship srNew = srItrNew.next();
+        while(trItrNew.hasNext() && relToTitlesItr.hasNext()) {
+            TaxonRelationship trNew = trItrNew.next();
             String relToTitle = relToTitlesItr.next();
-            System.out.println("New Synonym Title Cache: " + srNew.getSynonym().getTitleCache());
-            Assert.assertTrue("Synonym Title caches should not be equal", srNew.getSynonym().getTitleCache().equals(relToTitle));
-            srNew.getSynonym().setTitleCache(relToTitle);
+            System.out.println("New Synonym Title Cache: " + trNew.getFromTaxon().getTitleCache());
+            Assert.assertTrue("Synonym Title caches should not be equal", trNew.getFromTaxon().getTitleCache().equals(relToTitle));
+            trNew.getFromTaxon().setTitleCache(relToTitle);
         }
 
         Taxon taxonOld = (Taxon)taxonService.find(taxonUuid1);
 
-        Set<SynonymRelationship> synRelationsOld = taxonNew.getSynonymRelations();
-        Iterator<SynonymRelationship> srItrOld = synRelationsOld.iterator();
+        Set<TaxonRelationship> synRelationsOld = taxonNew.getTaxonRelations();
+        Iterator<TaxonRelationship> srItrOld = synRelationsOld.iterator();
         relToTitlesItr = relToTitles.iterator();
         while(srItrOld.hasNext() && relToTitlesItr.hasNext()) {
-            SynonymRelationship srOld = srItrOld.next();
+            TaxonRelationship srOld = srItrOld.next();
             String relToTitle = relToTitlesItr.next();
-            System.out.println("New Synonym Title Cache: " + srOld.getSynonym().getTitleCache());
-            Assert.assertEquals("Synonym Title caches should be equal", srOld.getSynonym().getTitleCache(), relToTitle);
+            System.out.println("New Synonym Title Cache: " + srOld.getFromTaxon().getTitleCache());
+            Assert.assertEquals("Synonym Title caches should be equal", srOld.getFromTaxon().getTitleCache(), relToTitle);
 
         }
     }