[MNG-7138] Proper verify of plugin configuration Bean set method call

apache · Nov 10, 2021 · 3314a24 · 3314a24
1 parent c1344c0
commit 3314a24
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -95,6 +94,7 @@ public void testitMNG3827()
 
         assertEquals( "field", props.getProperty( "beanParam.fieldParam" ) );
         assertEquals( "setter", props.getProperty( "beanParam.setterParam" ) );
+        assertEquals( "false", props.getProperty( "beanParam.setCalled" ) );
         assertEquals( "true", props.getProperty( "beanParam.setterCalled" ) );
 
         assertEquals( "4", props.getProperty( "domParam.children" ) );

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -95,6 +94,7 @@ public void testitMNG3864()
 
         assertEquals( "field", props.getProperty( "beanParam.fieldParam" ) );
         assertEquals( "setter", props.getProperty( "beanParam.setterParam" ) );
+        assertEquals( "false", props.getProperty( "beanParam.setCalled" ) );
         assertEquals( "true", props.getProperty( "beanParam.setterCalled" ) );
 
         assertEquals( "4", props.getProperty( "domParam.children" ) );

diff --git a/...rc/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/...rc/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -54,7 +53,8 @@ public void testit()
 
         Properties props = verifier.loadProperties( "target/config.properties" );
         assertEquals( "PASSED", props.getProperty( "beanParam.fieldParam" ) );
-        assertEquals( "true", props.getProperty( "beanParam.setterCalled" ) );
+        assertEquals( "true", props.getProperty( "beanParam.setCalled" ) );
+        assertEquals( "false", props.getProperty( "beanParam.setterCalled" ) );
     }
 
 }
diff --git a/...gins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java b/...gins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java
@@ -32,12 +32,20 @@ public class Bean
 
     String setterParam;
 
+    /**
+     * default method of bean was called
+     */
+    boolean setCalled;
+
+    /**
+     * setter method of ben was called
+     */
     boolean setterCalled;
 
     public void set( String value )
     {
         fieldParam = value;
-        setterCalled = true;
+        setCalled = true;
     }
 
     public void setSetterParam( String value )
@@ -49,7 +57,7 @@ public void setSetterParam( String value )
     public String toString()
     {
         return getClass().getName() + "[fieldParam=" + fieldParam + ", setterParam=" + setterParam
-                + ", setterCalled=" + setterCalled + "]";
+                + ", setterCalled=" + setterCalled + ", setCalled=" + setCalled + "]";
     }
 
 }
diff --git a/...aven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java b/...aven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
@@ -246,6 +246,7 @@ public class ConfigMojo
      *
      * @parameter
      */
+
     private Bean beanParam;
 
     /**
@@ -335,6 +336,7 @@ private void dumpConfiguration( Properties props )
         {
             PropertiesUtil.serialize( props, "beanParam.fieldParam", beanParam.fieldParam );
             PropertiesUtil.serialize( props, "beanParam.setterParam", beanParam.setterParam );
+            PropertiesUtil.serialize( props, "beanParam.setCalled", beanParam.setCalled );
             PropertiesUtil.serialize( props, "beanParam.setterCalled", beanParam.setterCalled );
         }
     }