From 6ac1f1fd5aacc7662ab69df0eb0c7f3f7cceabf0 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Fri, 4 Sep 2015 11:42:17 +0200 Subject: [PATCH] Correct test to use uuids --- .../session/CdmEntitySessionAwareTest.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java index 65445fc57..29a52b8f0 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java @@ -322,16 +322,8 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { PolytomousKeyNode child = rootNode.getChildAt(0); PolytomousKey subKey = child.getSubkey(); - polytomousKeyService.delete(subKey); - - // since subKey was not initialized before the delete, an attempt - // to initialize it after will lead to an NPE - try { - PolytomousKeyNode subKeyRootNode = subKey.getRoot(); - Assert.fail("A NullPointerException indicating null root node should be thrown here"); - } catch(NullPointerException npe) { + polytomousKeyService.delete(subKey.getUuid()); - } // retrieving subkey shows its null subKey = CdmBase.deproxy(polytomousKeyService.find(subKeyUuid),PolytomousKey.class); Assert.assertNull(subKey); @@ -344,15 +336,9 @@ public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { subKey = child.getSubkey(); // subkey will not be null, because the delete functionality of the subkey // does not currently delete it from a polytomous key node - Assert.assertNotNull(subKey); - // after reloading the object graph, accessing subKey should throw a null pointer exception - try { - PolytomousKeyNode subKeyRootNode = subKey.getRoot(); - Assert.fail("A NullPointerException indicating null root node should be thrown here"); - } catch(NullPointerException npe) { - - } + // FIXME: With the new delete functionality this should be null, shouldn't it ? + Assert.assertNotNull(subKey); } -- 2.34.1