ref #6359, ref #9627 fix tests for setSecundumForSubtree workaround

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
index 86c4b058834c8d6dd11da9ea10922e90b28359e6..1e69237d5f55f991a0cef413e2d4a6d589b9d274 100755 (executable)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
@@ -775,19 +775,20 @@ public class TaxonNodeDaoHibernateImpl extends AnnotatableDaoImpl<TaxonNode>
                     }\r
                     //compute updated objects\r
                     SecundumSource secSourceAfter = taxonBase.getSecSource();\r
-                    //FIXME #9627\r
-                    if (true){\r
-                        result.add(taxonBase);\r
-                    }\r
-                    //EMXIF\r
 \r
                     if (!CdmUtils.nullSafeEqual(secSourceBefore, secSourceAfter)){\r
                         result.add(taxonBase);\r
+                        //FIXME #9627 remove if fixed\r
+                        result.add(taxonBase);\r
+                        //EMXIF\r
                     }else if (secSourceBefore != null && secSourceBefore.equals(secSourceAfter)\r
                             && (!CdmUtils.nullSafeEqual(refBefore, secSourceAfter.getCitation())\r
                                  || !CdmUtils.nullSafeEqual(refDetailBefore, secSourceAfter.getCitationMicroReference()))\r
                             ){\r
                         result.add(secSourceBefore);\r
+                        //FIXME #9627 remove if fixed\r
+                        result.add(taxonBase);\r
+                        //EMXIF\r
                     }\r
 \r
                     monitor.worked(1);\r
@@ -843,18 +844,20 @@ public class TaxonNodeDaoHibernateImpl extends AnnotatableDaoImpl<TaxonNode>
                     }\r
                     //compute updated objects\r
                     NamedSource sourceAfter = rel.getSource();\r
-                    //FIXME #9627 remove if fixed\r
-                    if (true){\r
-                        result.add(rel.getToTaxon());\r
-                    }\r
-                    //EMXIF\r
                     if (!CdmUtils.nullSafeEqual(sourceBefore, sourceAfter)){\r
                         result.add(rel);\r
+                        //FIXME #9627 remove if fixed\r
+                        result.add(rel.getToTaxon());\r
+                        //EMXIF\r
+\r
                     }else if (sourceBefore != null && sourceBefore.equals(sourceAfter)\r
                             && (!CdmUtils.nullSafeEqual(refBefore, sourceAfter.getCitation())\r
                                  || !CdmUtils.nullSafeEqual(refDetailBefore,sourceAfter.getCitationMicroReference()))\r
                             ){\r
                         result.add(sourceBefore);\r
+                        //FIXME #9627 remove if fixed\r
+                        result.add(rel.getToTaxon());\r
+                        //EMXIF\r
                     }\r
 \r
                     monitor.worked(1);\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
index a03d2a2737c78b135ac5317e01fe60fc567efc0a..5e6f62d03a2a387393a1fa655814aafe6cbda456 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
@@ -747,7 +747,7 @@ public class TaxonNodeServiceImplTest extends CdmTransactionalIntegrationTest{
         UpdateResult result = taxonNodeService.setSecundumForSubtree(config);
         Assert.assertTrue(result.getExceptions().isEmpty());
         Assert.assertTrue(result.isOk());
-        Assert.assertEquals(5, result.getUpdatedObjects().size());
+        Assert.assertEquals(6, result.getUpdatedObjects().size());  //should be 5 without workaround for #9627,#6359
 
         commitAndStartNewTransaction(/*new String[]{"TaxonBase","TaxonBase_AUD"}*/);
         Assert.assertEquals(newSec, taxonService.find(1).getSec());
@@ -796,7 +796,7 @@ public class TaxonNodeServiceImplTest extends CdmTransactionalIntegrationTest{
         UpdateResult result = taxonNodeService.setSecundumForSubtree(config);
         Assert.assertTrue(result.getExceptions().isEmpty());
         Assert.assertTrue(result.isOk());
-        Assert.assertEquals(3, result.getUpdatedObjects().size());
+        Assert.assertEquals(4, result.getUpdatedObjects().size()); //should be 3 without workaround for #9627,#6359
 
         commitAndStartNewTransaction();  //new String[]{"TaxonBase","TaxonBase_AUD"}
         Assert.assertEquals(newSec, taxonService.find(1).getSec());