Project

General

Profile

« Previous | Next » 

Revision 4cea6554

Added by Cherian Mathew almost 9 years ago

Fix remaining test erros for collection call changes from #5031

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/model/TaxonNavigatorTest.java
9 9
 */
10 10
package eu.etaxonomy.cdm.model;
11 11

  
12
import java.util.ArrayList;
12 13
import java.util.HashSet;
13 14
import java.util.List;
14 15
import java.util.Set;
......
141 142
        UUID taxonNodeUuid = UUID.fromString("2f05d429-632d-4230-b9cb-70299360b470");
142 143
        TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
143 144
        List<TaxonNode> childNodes = taxonNode.getChildNodes();
145
        List<UUID> childNodeUuids = new ArrayList<UUID>();
146
        for(TaxonNode childNode : childNodes) {
147
            childNodeUuids.add(childNode.getUuid());
148
        }
144 149
        Assert.assertTrue(taxonNode.getCountChildren() > 0);
145 150

  
146 151
        Set<ITaxonTreeNode> nodes = new HashSet<ITaxonTreeNode>();
......
160 165
        operation.execute(monitor, info);
161 166
        TaxonNode reloadedNode = taxonNodeService.load(taxonNode.getUuid());
162 167
        Assert.assertNull(reloadedNode);
163
        for(TaxonNode childNode : childNodes) {
164
            TaxonNode reloadedChildNode = taxonNodeService.load(childNode.getUuid());
168
        for(UUID childNodeUuid : childNodeUuids) {
169
            TaxonNode reloadedChildNode = taxonNodeService.load(childNodeUuid);
165 170
            Assert.assertNull(reloadedChildNode);
166 171
        }
167 172
    }
......
208 213
        TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
209 214
        TaxonNode parentTaxonNode = taxonNode.getParent();
210 215
        List<TaxonNode> childNodes = taxonNode.getChildNodes();
216
        List<UUID> childNodeUuids = new ArrayList<UUID>();
217
        for(TaxonNode childNode : childNodes) {
218
            childNodeUuids.add(childNode.getUuid());
219
        }
211 220
        Assert.assertTrue(taxonNode.getCountChildren() > 0);
212 221

  
213 222
        Set<ITaxonTreeNode> nodes = new HashSet<ITaxonTreeNode>();
......
227 236
        TaxonNode reloadedNode = taxonNodeService.load(taxonNode.getUuid());
228 237
        Assert.assertNull(reloadedNode);
229 238
        List<TaxonNode> parentChildNodes = parentTaxonNode.getChildNodes();
230
        Assert.assertTrue(parentChildNodes.containsAll(childNodes));
239
        List<UUID> parentChildNodeUuids = new ArrayList<UUID>();
240
        for(TaxonNode parentChildNode : parentChildNodes) {
241
            parentChildNodeUuids.add(parentChildNode.getUuid());
242
        }
243
        parentChildNodeUuids.containsAll(childNodeUuids);
244

  
231 245
    }
232 246

  
233 247
    @Test

Also available in: Unified diff