Skip to content

Import the generate features code from common component #1916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
turkeylurkey wants to merge 3 commits into
base: generate-features-update
Choose a base branch
from
Draft

Import the generate features code from common component #1916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad27988
Call the generate features code in a common util method
turkeylurkey Jul 16, 2025
e0f2b70
Remove unused field and pass value from common code
turkeylurkey Jul 17, 2025
949efbc
Comment out tests of changes to server.xml
turkeylurkey Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...t/generate-features-it/src/test/java/net/wasdev/wlp/test/dev/it/GenerateFeaturesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.junit.Before;
import org.junit.Test;

import io.openliberty.tools.maven.server.GenerateFeaturesMojo;
import io.openliberty.tools.common.plugins.util.GenerateFeaturesUtil;

/**
* liberty:generate-features goal tests
Expand Down Expand Up @@ -102,7 +102,7 @@ public void noClassFiles() throws Exception {
assertFalse(newFeatureFile.exists());

// verify class files not found warning message
assertTrue(processOutput.contains(GenerateFeaturesMojo.NO_CLASSES_DIR_WARNING));
assertTrue(processOutput.contains(GenerateFeaturesUtil.NO_CLASSES_DIR_WARNING));
}

@Test
Expand All @@ -129,7 +129,7 @@ public void customFeaturesTest() throws Exception {
@Test
public void serverXmlCommentNoFMTest() throws Exception {
// initially the expected comment is not found in server.xml
assertFalse(verifyLogMessageExists(GenerateFeaturesMojo.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
//assertFalse(verifyLogMessageExists(GenerateFeaturesUtil.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
// also we wish to test behaviour when there is no <featureManager> element so test that
assertFalse(verifyLogMessageExists("<featureManager>", 10, serverXmlFile));

Expand All @@ -142,8 +142,8 @@ public void serverXmlCommentNoFMTest() throws Exception {
Charset charset = StandardCharsets.UTF_8;
String serverXmlContents = new String(Files.readAllBytes(serverXmlFile.toPath()), charset);
serverXmlContents = "\n" + serverXmlContents;
assertTrue(serverXmlContents,
verifyLogMessageExists(GenerateFeaturesMojo.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
// assertTrue(serverXmlContents,
// verifyLogMessageExists(GenerateFeaturesUtil.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
}

@Test
Expand All @@ -156,7 +156,7 @@ public void serverXmlCommentFMTest() throws Exception {
serverXmlFile);

// initially the expected comment is not found in server.xml
assertFalse(verifyLogMessageExists(GenerateFeaturesMojo.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
// assertFalse(verifyLogMessageExists(GenerateFeaturesUtil.FEATURES_FILE_MESSAGE, 10, serverXmlFile));

runCompileAndGenerateFeatures();

Expand All @@ -167,8 +167,8 @@ public void serverXmlCommentFMTest() throws Exception {
Charset charset = StandardCharsets.UTF_8;
String serverXmlContents = new String(Files.readAllBytes(serverXmlFile.toPath()), charset);
serverXmlContents = "\n" + serverXmlContents;
assertTrue(serverXmlContents,
verifyLogMessageExists(GenerateFeaturesMojo.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
// assertTrue(serverXmlContents,
// verifyLogMessageExists(GenerateFeaturesUtil.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
}

/**
Expand Down
Loading