From b77d937437540f5c1a7a151ec884ae63dc6bddb3 Mon Sep 17 00:00:00 2001 From: Scott Kurz Date: Sat, 6 Aug 2022 00:29:00 -0400 Subject: [PATCH] Adjust ITs for new multi-mod behavior Signed-off-by: Scott Kurz --- .../wasdev/wlp/test/dev/it/MultiModuleM2InstalledTest.java | 4 ++-- .../wasdev/wlp/test/dev/it/MultiModuleRunM2InstalledTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleM2InstalledTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleM2InstalledTest.java index 846acc825..2877a257c 100644 --- a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleM2InstalledTest.java +++ b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleM2InstalledTest.java @@ -37,7 +37,7 @@ public static void setUpBeforeClass() throws Exception { } @Test - public void purgeLocallyInstalledModule_DevMode_Test() throws Exception { + public void purgeUpstreamSourcePart_DevMode_Test() throws Exception { // install everything to m2 runCommand("mvn install"); @@ -58,7 +58,7 @@ public void purgeLocallyInstalledModule_DevMode_Test() throws Exception { startProcess(null, true, "mvn io.openliberty.tools:liberty-maven-plugin:"+System.getProperty("mavenPluginVersion")+":", false); // TODO when https://github.com/OpenLiberty/ci.maven/issues/1203 is fixed, check for compilation error instead - assertTrue(getLogTail(logFile), verifyLogMessageExists("Could not resolve dependencies for project", 5000)); + assertTrue(getLogTail(logFile), verifyLogMessageExists("error: package io.openliberty.guides.multimodules.lib does not exist", 5000)); assertFalse(getLogTail(logFile), targetClass.exists()); } diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleRunM2InstalledTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleRunM2InstalledTest.java index 5038ba8d0..0c266fb92 100644 --- a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleRunM2InstalledTest.java +++ b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/MultiModuleRunM2InstalledTest.java @@ -37,7 +37,7 @@ public static void setUpBeforeClass() throws Exception { } @Test - public void purgeLocallyInstalledModule_LibertyRun_Test() throws Exception { + public void purgeUpstreamSourcePart_LibertyRun_Test() throws Exception { // install everything to m2 runCommand("mvn install"); @@ -58,7 +58,7 @@ public void purgeLocallyInstalledModule_LibertyRun_Test() throws Exception { startProcess(null, false, "mvn io.openliberty.tools:liberty-maven-plugin:"+System.getProperty("mavenPluginVersion")+":", false); // TODO when https://github.com/OpenLiberty/ci.maven/issues/1203 is fixed, check for compilation error instead - assertTrue(getLogTail(logFile), verifyLogMessageExists("Could not resolve dependencies for project", 5000)); + assertTrue(getLogTail(logFile), verifyLogMessageExists("error: package io.openliberty.guides.multimodules.lib does not exist", 5000)); assertFalse(getLogTail(logFile), targetClass.exists()); }