Merge pull request #1489 from turkeylurkey/fix-it

Ignore resolveDependencyTest which is not reliable and …

liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevTest.java

@@ -185,7 +185,8 @@ public void invalidDependencyTest() throws Exception {
  replaceString(invalidDepComment, invalidDep, pom);
  assertTrue(verifyLogMessageExists("The POM for io.openliberty.features:abcd:jar:1.0 is missing, no dependency information available", 10000));
  }
-
+
+ @Ignore // TODO remove when liberty issue 20749 and 1481
  @Test
  public void resolveDependencyTest() throws Exception { 
  assertTrue(verifyLogMessageExists("Liberty is running in dev mode.", 10000));
@@ -235,8 +236,6 @@ public void resolveDependencyTest() throws Exception {
  public void generateFeatureTest() throws Exception {
  final String SERVER_XML_COMMENT = "Plugin has generated Liberty features"; // the explanation added to server.xml
  final String NEW_FILE_INFO_MESSAGE = "This file was generated by the Liberty Maven Plugin and will be overwritten"; // the explanation added to the generated features file
- // After generate features is toggled off and on we end up with 'No functional changes were detected'
- final String SERVER_NOT_UPDATED = "CWWKG0018I:";
  final String SERVER_UPDATE_COMPLETE = "CWWKF0008I:"; // Feature update completed in 0.649 seconds.
 
  // Verify generate features runs when dev mode first starts
@@ -296,8 +295,8 @@ public void generateFeatureTest() throws Exception {
  writer.write("g\n");
  writer.flush();
  assertTrue(autoGenOn, verifyLogMessageExists(autoGenOn, 10000));
- // Check for server response to regenerated feature list.
- assertTrue(SERVER_NOT_UPDATED, verifyLogMessageExists(SERVER_NOT_UPDATED, 10000));
+ // After generate features is toggled off and on we end up with the same
+ // features as before so no action is taken.
 
  // Remove a class and use 'optimize' to rebuild the generated features
  assertTrue(helloBatchSrc.delete());