From 21ee68311b885074f0c35c3b0b46a9cb31b3f695 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Fri, 11 Nov 2022 16:25:44 +0100
Subject: Ensure enforcer is executed from root of aggregator pom

---
 .../enforcer/EnforceDependenciesAllProjectsTest.java       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'vespa-enforcer-extensions/src/test')

diff --git a/vespa-enforcer-extensions/src/test/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjectsTest.java b/vespa-enforcer-extensions/src/test/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjectsTest.java
index a6d6661071e..81e22d81f44 100644
--- a/vespa-enforcer-extensions/src/test/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjectsTest.java
+++ b/vespa-enforcer-extensions/src/test/java/com/yahoo/vespa/maven/plugin/enforcer/EnforceDependenciesAllProjectsTest.java
@@ -31,7 +31,7 @@ class EnforceDependenciesAllProjectsTest {
                 Dependency.fromString("com.example:foo:1.2.3"),
                 Dependency.fromString("com.example:bar:2.3.4")));
         Path specFile = Paths.get("src/test/resources/allowed-dependencies.txt");
-        assertDoesNotThrow(() -> validateDependencies(dependencies, specFile));
+        assertDoesNotThrow(() -> validateDependencies(dependencies, specFile, "my-dep-enforcer"));
     }
 
     @Test
@@ -42,13 +42,15 @@ class EnforceDependenciesAllProjectsTest {
                 Dependency.fromString("com.example:foobar:3.4.5")));
         Path specFile = Paths.get("src/test/resources/allowed-dependencies.txt");
         var exception = assertThrows(EnforcerRuleException.class,
-                                     () -> validateDependencies(dependencies, specFile));
+                                     () -> validateDependencies(dependencies, specFile, "my-dep-enforcer"));
         String expectedErrorMessage =
                 """
                 The dependency enforcer failed:
                 Forbidden dependencies:
                  - com.example:foobar:3.4.5
-                Maven dependency validation failed. To update dependency spec run 'mvn enforcer:enforce -DdependencyEnforcer.writeSpec'""";
+                Maven dependency validation failed. To update dependency spec execute following the command from root of aggregator pom:
+                $ mvn enforcer:enforce -DdependencyEnforcer.writeSpec -pl my-dep-enforcer
+                """;
         assertEquals(expectedErrorMessage, exception.getMessage());
     }
 
@@ -58,13 +60,15 @@ class EnforceDependenciesAllProjectsTest {
                 Dependency.fromString("com.example:foo:1.2.3")));
         Path specFile = Paths.get("src/test/resources/allowed-dependencies.txt");
         var exception = assertThrows(EnforcerRuleException.class,
-                                     () -> validateDependencies(dependencies, specFile));
+                                     () -> validateDependencies(dependencies, specFile, "my-dep-enforcer"));
         String expectedErrorMessage =
                 """
                 The dependency enforcer failed:
                 Removed dependencies:
                  - com.example:bar:2.3.4
-                Maven dependency validation failed. To update dependency spec run 'mvn enforcer:enforce -DdependencyEnforcer.writeSpec'""";
+                Maven dependency validation failed. To update dependency spec execute following the command from root of aggregator pom:
+                $ mvn enforcer:enforce -DdependencyEnforcer.writeSpec -pl my-dep-enforcer
+                """;
         assertEquals(expectedErrorMessage, exception.getMessage());
     }
 
-- 
cgit v1.2.3