From bc28f104fdea8ec055059235eebfec41a15eb0f3 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Wed, 17 Feb 2010 02:05:58 +0000 Subject: [PATCH] CSPACE-489: Clean up extra VocabularyItems created during client tests of the Vocabulary service. Clean up of sub-resource items has been working in client tests of the Person and Organization services, but a single line of code required when doing so was inadvertently omitted in the Vocabulary service. --- .../client/test/VocabularyServiceTest.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java index 90c1f9033..b6d04b567 100644 --- a/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java +++ b/services/vocabulary/client/src/test/java/org/collectionspace/services/client/test/VocabularyServiceTest.java @@ -132,11 +132,20 @@ public class VocabularyServiceTest extends AbstractServiceTestImpl { HashMap itemInfo = new HashMap(); itemInfo.put(VocabularyItemJAXBSchema.DISPLAY_NAME, createIdentifier()); - knownItemResourceId = VocabularyClientUtils.createItemInVocabulary(knownResourceId, + String newID = VocabularyClientUtils.createItemInVocabulary(knownResourceId, knownResourceRefName, itemInfo, client); - if(logger.isDebugEnabled()){ - logger.debug(testName + ": knownItemResourceId=" + knownItemResourceId); + // Store the ID returned from the first item resource created + // for additional tests below. + if (knownItemResourceId == null){ + knownItemResourceId = newID; + if (logger.isDebugEnabled()) { + logger.debug(testName + ": knownItemResourceId=" + knownItemResourceId); + } } + // Store the IDs from any item resources created + // by tests, along with the IDs of their parents, so these items + // can be deleted after all tests have been run. + allResourceItemIdsCreated.put(newID, knownResourceId); } @Override -- 2.47.3