From a0069258b7b57056642d2bb5c8933b8165bf6fa2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 14 Nov 2016 10:57:18 +0100 Subject: [PATCH] Try to reinstall tests for MoveTaxonOperation (maybe not yet correct) --- .../operation/MoveTaxonOperationTest.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java index f69dac038..0e61b15b1 100644 --- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java +++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java @@ -65,9 +65,9 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTestBase { public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException { operation.execute(monitor, info); -// Assert.assertEquals(newParentTaxon ,taxon.getTaxonomicParent()); -// Assert.assertEquals(taxon, newParentTaxon.getTaxonomicChildren().toArray(new Taxon[0])[0]); -// Assert.assertTrue(oldParentTaxon.getTaxonomicChildrenCount() == 0); + Assert.assertEquals(newParentTaxon ,taxon.getTaxonNodes().iterator().next().getParent().getTaxon()); + Assert.assertEquals(taxon, newParentTaxon.getTaxonNodes().iterator().next().getChildNodes().iterator().next()); + Assert.assertEquals(0, oldParentTaxon.getTaxonNodes().iterator().next().getChildNodes().size()); } @@ -82,6 +82,12 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTestBase { // Assert.assertEquals(oldParentTaxon ,taxon.getTaxonomicParent()); // Assert.assertTrue(newParentTaxon.getTaxonomicChildren().size() == 0); // Assert.assertEquals(taxon, oldParentTaxon.getTaxonomicChildren().toArray(new Taxon[0])[0]); + + Assert.assertEquals(newParentTaxon ,taxon.getTaxonNodes().iterator().next().getParent().getTaxon()); + Assert.assertEquals(taxon, newParentTaxon.getTaxonNodes().iterator().next().getChildNodes().iterator().next()); + Assert.assertEquals(0, oldParentTaxon.getTaxonNodes().iterator().next().getChildNodes().size()); + + } /** @@ -92,8 +98,9 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTestBase { public void testRedoIProgressMonitorIAdaptable() throws ExecutionException { operation.redo(monitor, info); -// Assert.assertEquals(newParentTaxon ,taxon.getTaxonomicParent()); -// Assert.assertEquals(taxon, newParentTaxon.getTaxonomicChildren().toArray(new Taxon[0])[0]); -// Assert.assertTrue(oldParentTaxon.getTaxonomicChildrenCount() == 0); + Assert.assertEquals(newParentTaxon ,taxon.getTaxonNodes().iterator().next().getParent().getTaxon()); + Assert.assertEquals(taxon, newParentTaxon.getTaxonNodes().iterator().next().getChildNodes().iterator().next()); + Assert.assertEquals(0, oldParentTaxon.getTaxonNodes().iterator().next().getChildNodes().size()); + } } -- 2.34.1