From b5513e3ea95b9d5d0d9a3a7da6172c070c58ee18 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Tue, 27 Nov 2018 09:33:54 -0800 Subject: [PATCH] DRYD-547: Update Maven surefire plugin to more recent version. --- services/client/pom.xml | 2 +- services/common-test/pom.xml | 2 +- .../services/client/PlaceAuthorityClientUtils.java | 2 +- .../services/client/test/PlaceAuthorityServiceTest.java | 3 ++- services/pom.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/services/client/pom.xml b/services/client/pom.xml index fc4a0471f..2ba53db9f 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.4.3 + 3.0.0-M1 test diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index b390d1983..fbec1faa2 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.4.3 + 3.0.0-M1 commons-io diff --git a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java index 12d30078e..52410fdd1 100644 --- a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java +++ b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java @@ -279,7 +279,7 @@ public class PlaceAuthorityClientUtils { return newStr.toString(); } - private static List getTermGroupInstance(String shortIdentifier, String displayName) { + public static List getTermGroupInstance(String shortIdentifier, String displayName) { if (Tools.isBlank(shortIdentifier)) { shortIdentifier = getGeneratedIdentifier(); } diff --git a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java index 676d64cfa..f8b7f4044 100644 --- a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java +++ b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java @@ -437,11 +437,12 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest nonexMap = new HashMap(); nonexMap.put(PlaceJAXBSchema.PLACE_NAME, TEST_NAME); nonexMap.put(PlaceJAXBSchema.SHORT_IDENTIFIER, "nonEx"); + nonexMap.put(PlaceJAXBSchema.DISPLAY_NAME, "nonEx-displayName"); nonexMap.put(PlaceJAXBSchema.PLACE_TYPE, TEST_PLACE_TYPE); final String EMPTY_REFNAME = ""; PoxPayloadOut result = PlaceAuthorityClientUtils.createPlaceInstance(EMPTY_REFNAME, - nonexMap, PlaceAuthorityClientUtils.getTermGroupInstance(TEST_NAME), commonPartName); + nonexMap, PlaceAuthorityClientUtils.getTermGroupInstance(TEST_NAME, nonexMap.get(PlaceJAXBSchema.DISPLAY_NAME)), commonPartName); return result; } diff --git a/services/pom.xml b/services/pom.xml index b83fa6fed..a81fe9592 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.7.1 + 3.0.0-M1 -- 2.47.3