fix test

Author: stiv03

multiapps-common-test/src/main/java/org/cloudfoundry/multiapps/common/test/Tester.java

@@ -1,9 +1,5 @@
 package org.cloudfoundry.multiapps.common.test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Objects;
@@ -15,6 +11,10 @@
 import org.cloudfoundry.multiapps.common.util.JsonUtil;
 import org.junit.jupiter.api.Assertions;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class Tester {
 
     private final Class<?> testedClass;
@@ -94,12 +94,13 @@ private void validateSuccessForSetExpectation(Set<Object> expectedSet, Set<Objec
     private void validateFailure(Expectation expectation, Exception e) {
         if (!expectation.expectsFailure()) {
             e.printStackTrace();
-            fail("Test failed: " + e.toString());
+            fail("Test failed: " + e);
         }
         String exceptionMessage = e.getMessage();
         assertTrue(exceptionMessage.contains(expectation.getExpectationAsString()),
-                   MessageFormat.format("Exception's message doesn't match up! Expected [{0}] to contain [{1}]!", exceptionMessage,
-                                        expectation.getExpectationAsString()));
+                   MessageFormat.format("Exception's message doesn't match up! Expected [{0}] to contain [{1}]!",
+                                        expectation.getExpectationAsString(), exceptionMessage)
+        );
     }
 
     private Object loadResourceAsJsonObject(String resource) {

multiapps-mta/src/test/java/org/cloudfoundry/multiapps/mta/resolvers/v3/DescriptorReferenceResolverTest.java

@@ -35,8 +35,7 @@ static Stream<Arguments> testResolve() {
                          new Expectation(Expectation.Type.JSON, "result-from-escaped-references.json")),
             // (5)
             Arguments.of("merged-05.yaml",
-                         new Expectation(Expectation.Type.EXCEPTION,
-                                         "Unable to resolve \"qux#benefits-app-example1#benefits-app-example1##parameters##destinations##0##url\"")));
+                         new Expectation(Expectation.Type.EXCEPTION, "Unable to resolve \"module-a##module-b#invalid/0/url\"")));
     }
 
     @ParameterizedTest

multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/merged-05.yaml

@@ -1,19 +1,50 @@
-_schema-version: "3"
-ID: com.sap.mta.v3.test.array
+ID: com.sap.mta.v2.test.config-02
+_schema-version: 3.3.0
 version: 1.0.0
 
 modules:
-  - name: qux
-    type: qux
+  - name: module-a
+    type: com.sap.application.content
+    parameters:
+      content:
+        subaccount:
+          existing_destinations_policy: update
+          destinations:
+            - Name: destination-a
+              URL: ~{module-b/invalid/0/url}
+              forwardAuthToken: true
+              ServiceInstanceName: "service-a"
+    requires:
+      - name: service-destination
+        parameters:
+          content-target: true
+      - name: service-a
+      - name: module-b
+
+  - name: module-b
+    type: application
+    path: "appBits.zip"
     requires:
-      - name: benefits-app-example1
-        group: configuration
+      - name: service-a
+    parameters:
+      buildpack: staticfile_buildpack
+      memory: 1G
+      disk-quota: 1G
+    provides:
+      - name: module-b
         properties:
-          array-ref: ~{benefits-app-example1##parameters##destinations##0##url}
+          default-url: ${default-url}
 
 resources:
-  - name: benefits-app-example1
-    type: configuration
+  - name: service-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-name: service-destination
+      service-plan: lite
+
+  - name: service-a
+    type: org.cloudfoundry.managed-service
     parameters:
-      destinations:
-        - name: dest-0
+      service: xsuaa
+      service-plan: application