From: Cherian Mathew Date: Thu, 25 Jun 2015 13:34:45 +0000 (+0200) Subject: Fix remaining test erros for collection call changes from #5031 X-Git-Tag: remoting-3.9.0~131 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4cea6554505cc2b31d99cb09f3fec9fc01a08d04?ds=sidebyside Fix remaining test erros for collection call changes from #5031 --- diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/model/TaxonNavigatorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/model/TaxonNavigatorTest.java index f50b33a9b..54fedb0fd 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/model/TaxonNavigatorTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/model/TaxonNavigatorTest.java @@ -9,6 +9,7 @@ */ package eu.etaxonomy.cdm.model; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -141,6 +142,10 @@ public class TaxonNavigatorTest extends BaseOperationTest { UUID taxonNodeUuid = UUID.fromString("2f05d429-632d-4230-b9cb-70299360b470"); TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid); List childNodes = taxonNode.getChildNodes(); + List childNodeUuids = new ArrayList(); + for(TaxonNode childNode : childNodes) { + childNodeUuids.add(childNode.getUuid()); + } Assert.assertTrue(taxonNode.getCountChildren() > 0); Set nodes = new HashSet(); @@ -160,8 +165,8 @@ public class TaxonNavigatorTest extends BaseOperationTest { operation.execute(monitor, info); TaxonNode reloadedNode = taxonNodeService.load(taxonNode.getUuid()); Assert.assertNull(reloadedNode); - for(TaxonNode childNode : childNodes) { - TaxonNode reloadedChildNode = taxonNodeService.load(childNode.getUuid()); + for(UUID childNodeUuid : childNodeUuids) { + TaxonNode reloadedChildNode = taxonNodeService.load(childNodeUuid); Assert.assertNull(reloadedChildNode); } } @@ -208,6 +213,10 @@ public class TaxonNavigatorTest extends BaseOperationTest { TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid); TaxonNode parentTaxonNode = taxonNode.getParent(); List childNodes = taxonNode.getChildNodes(); + List childNodeUuids = new ArrayList(); + for(TaxonNode childNode : childNodes) { + childNodeUuids.add(childNode.getUuid()); + } Assert.assertTrue(taxonNode.getCountChildren() > 0); Set nodes = new HashSet(); @@ -227,7 +236,12 @@ public class TaxonNavigatorTest extends BaseOperationTest { TaxonNode reloadedNode = taxonNodeService.load(taxonNode.getUuid()); Assert.assertNull(reloadedNode); List parentChildNodes = parentTaxonNode.getChildNodes(); - Assert.assertTrue(parentChildNodes.containsAll(childNodes)); + List parentChildNodeUuids = new ArrayList(); + for(TaxonNode parentChildNode : parentChildNodes) { + parentChildNodeUuids.add(parentChildNode.getUuid()); + } + parentChildNodeUuids.containsAll(childNodeUuids); + } @Test