From 36f45052aaf3b523aa9a6bf60be4ac1aac1b93b7 Mon Sep 17 00:00:00 2001 From: stiv03 Date: Mon, 4 Aug 2025 10:52:28 +0300 Subject: [PATCH 1/2] fix wrong validation message for deep module properties LMCROSSITXSADEPLOY-268 --- .../helpers/MtaDescriptorPropertiesResolverTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java index a647b8ac85..ecf561fb29 100644 --- a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java +++ b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java @@ -1,8 +1,5 @@ package org.cloudfoundry.multiapps.controller.core.helpers; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; - import java.util.function.BiFunction; import java.util.stream.Stream; @@ -23,6 +20,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + class MtaDescriptorPropertiesResolverTest { private final Tester tester = Tester.forClass(getClass()); @@ -36,7 +36,8 @@ class MtaDescriptorPropertiesResolverTest { static Stream testResolve() { return Stream.of(Arguments.of("mtad-properties-resolver-test/mtad-with-route.yaml", - new Expectation(Expectation.Type.JSON, "mtad-properties-resolver-test/mtad-with-route-result.json")), + new Expectation(Expectation.Type.EXCEPTION, + "Unable to resolve \"hello-backend#backend#routes/0/route")), Arguments.of("mtad-properties-resolver-test/mtad-with-domain.yaml", new Expectation(Expectation.Type.JSON, "mtad-properties-resolver-test/mtad-with-domain-result.json")), Arguments.of("mtad-properties-resolver-test/mtad-with-escaped-references.yaml", From 2a9d14a247ca79b28c3d4296e95593b694f17808 Mon Sep 17 00:00:00 2001 From: stiv03 Date: Mon, 11 Aug 2025 09:43:39 +0300 Subject: [PATCH 2/2] fix comments --- .../core/helpers/MtaDescriptorPropertiesResolverTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java index ecf561fb29..49c543548d 100644 --- a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java +++ b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/helpers/MtaDescriptorPropertiesResolverTest.java @@ -36,8 +36,7 @@ class MtaDescriptorPropertiesResolverTest { static Stream testResolve() { return Stream.of(Arguments.of("mtad-properties-resolver-test/mtad-with-route.yaml", - new Expectation(Expectation.Type.EXCEPTION, - "Unable to resolve \"hello-backend#backend#routes/0/route")), + new Expectation(Expectation.Type.JSON, "mtad-properties-resolver-test/mtad-with-route-result.json")), Arguments.of("mtad-properties-resolver-test/mtad-with-domain.yaml", new Expectation(Expectation.Type.JSON, "mtad-properties-resolver-test/mtad-with-domain-result.json")), Arguments.of("mtad-properties-resolver-test/mtad-with-escaped-references.yaml", @@ -81,4 +80,4 @@ void testResolve(String descriptorFile, Expectation expectation) { tester.test(() -> resolver.resolve(descriptor), expectation); } -} +} \ No newline at end of file