applied setting skip changes in other classes with 'catatlog' spelling

Signed-off-by: Fiona Ampofo <[email protected]>
galasa-dev · Feb 22, 2024 · aa3a34c · aa3a34c
1 parent 1915c44
commit aa3a34c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/BuildBundleTestCatalog.java b/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/BuildBundleTestCatalog.java
@@ -63,18 +63,16 @@ public class BuildBundleTestCatalog extends AbstractMojo {
     @Parameter(defaultValue = "${project.compileClasspathElements}", readonly = true, required = true)
     private List<String>       classpathElements;
 
-    private boolean skip;
-
     @Parameter(defaultValue = "${galasa.skip.bundletestcatatlog}", readonly = true, required = false)
     private boolean            typoSkip;
-
+    
     @Parameter(defaultValue = "${galasa.skip.bundletestcatalog}", readonly = true, required = false)
     private boolean            correctSkip;
+
+    private boolean skip = DeployTestCatalog.setSkip(correctSkip, typoSkip);
 
     public void execute() throws MojoExecutionException, MojoFailureException {
 
-        skip = DeployTestCatalog.setSkip(correctSkip, typoSkip);
-
         if (skip) {
             getLog().info("Skipping Bundle Test Catalog build");
             return;

diff --git a/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/BuildGherkinTestCatalog.java b/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/BuildGherkinTestCatalog.java
@@ -39,9 +39,14 @@ public class BuildGherkinTestCatalog extends AbstractMojo {
 
     @Parameter(defaultValue = "${project.build.directory}", property = "outputDir", required = true)
     private File               outputDirectory;
-
+    
     @Parameter(defaultValue = "${galasa.skip.gherkintestcatatlog}", readonly = true, required = false)
-    private boolean            skip;
+    private boolean            typoSkip;
+
+    @Parameter(defaultValue = "${galasa.skip.gherkintestcatalog}", readonly = true, required = false)
+    private boolean            correctSkip;
+
+    private boolean skip = DeployTestCatalog.setSkip(correctSkip, typoSkip);
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

diff --git a/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/DeployTestCatalog.java b/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/DeployTestCatalog.java
@@ -39,21 +39,21 @@ public class DeployTestCatalog extends AbstractMojo {
     @Parameter(defaultValue = "${galasa.bootstrap}", readonly = true, required = false)
     private URL          bootstrapUrl;
 
-    private boolean      skip;
-    private boolean      skipDeploy;
-
-    @Parameter(defaultValue = "${galasa.skip.bundletestcatalog}", readonly = true, required = false)
+
+    @Parameter(defaultValue = "${galasa.skip.bundletestcatatlog}", readonly = true, required = false)
     private boolean      typoSkip;
-
+    
     @Parameter(defaultValue = "${galasa.skip.bundletestcatalog}", readonly = true, required = false)
     private boolean      correctSkip;
-
+    
     @Parameter(defaultValue = "${galasa.skip.deploytestcatatlog}", readonly = true, required = false)
     private boolean      typoSkipDeploy;
-
+    
     @Parameter(defaultValue = "${galasa.skip.deploytestcatalog}", readonly = true, required = false)
     private boolean      correctSkipDeploy;
-
+
+    private boolean      skip = setSkip(correctSkip, typoSkip);
+    private boolean      skipDeploy = setSkip(correctSkip, typoSkip);
 
     protected static boolean setSkip(boolean correctSkip, boolean typoSkip) {
         boolean skip = false;
@@ -67,9 +67,6 @@ protected static boolean setSkip(boolean correctSkip, boolean typoSkip) {
 
     public void execute() throws MojoExecutionException, MojoFailureException {
 
-        skip = setSkip(correctSkip, typoSkip);
-        skipDeploy = setSkip(correctSkip, typoSkip);
-
         if (skip || skipDeploy) {
             getLog().info("Skipping Deploy Test Catalog");
             return;

diff --git a/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/MergeTestCatalogs.java b/galasa-maven-plugin/src/main/java/dev/galasa/maven/plugin/MergeTestCatalogs.java
@@ -62,9 +62,14 @@ public class MergeTestCatalogs extends AbstractMojo {
 
     @Parameter(defaultValue = "${project.build.directory}", property = "outputDir", required = true)
     private File                    outputDirectory;
-
+    
     @Parameter(defaultValue = "${galasa.skip.bundletestcatatlog}", readonly = true, required = false)
-    private boolean                 skip;
+    private boolean                 typoSkip;
+
+    @Parameter(defaultValue = "${galasa.skip.bundletestcatalog}", readonly = true, required = false)
+    private boolean                 correctSkip;
+
+    private boolean skip = DeployTestCatalog.setSkip(correctSkip, typoSkip);
 
     @Parameter(defaultValue = "${galasa.build.job}", readonly = true, required = false)
     private String                  buildJob;