Update JUnit and Spock Feature

grails · Jul 18, 2023 · ff24e33 · ff24e33
1 parent a6ddddf
commit ff24e33
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 20 deletions.
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/test/Junit.java b/grails-forge-core/src/main/java/org/grails/forge/feature/test/Junit.java
@@ -17,12 +17,18 @@
 
 import io.micronaut.core.annotation.NonNull;
 import jakarta.inject.Singleton;
+import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.generator.GeneratorContext;
 import org.grails.forge.build.dependencies.Dependency;
+import org.grails.forge.feature.DefaultFeature;
+import org.grails.forge.feature.Feature;
+import org.grails.forge.options.Options;
 import org.grails.forge.options.TestFramework;
 
+import java.util.Set;
+
 @Singleton
-public class Junit implements TestFeature {
+public class Junit implements TestFeature, DefaultFeature {
 
  @Override
  public String getTitle() {
@@ -54,4 +60,8 @@ public TestFramework getTestFramework() {
  return TestFramework.JUNIT;
  }
 
+ @Override
+ public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
+ return options.getTestFramework() == TestFramework.JUNIT;
+ }
 }
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/test/Mockito.java b/grails-forge-core/src/main/java/org/grails/forge/feature/test/Mockito.java
@@ -51,7 +51,7 @@ public boolean supports(ApplicationType applicationType) {
 
  @Override
  public String getCategory() {
- return Category.DEV_TOOLS;
+ return Category.VALIDATION;
  }
 
  @Override
@@ -61,7 +61,7 @@ public String getThirdPartyDocumentation() {
 
  @Override
  public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
- return true;
+ return selectedFeatures.stream().anyMatch(f -> f instanceof TestFeature);
  }
 
  @Override

diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java b/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java
@@ -16,12 +16,18 @@
 package org.grails.forge.feature.test;
 
 import jakarta.inject.Singleton;
+import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.generator.GeneratorContext;
 import org.grails.forge.build.dependencies.Dependency;
+import org.grails.forge.feature.DefaultFeature;
+import org.grails.forge.feature.Feature;
+import org.grails.forge.options.Options;
 import org.grails.forge.options.TestFramework;
 
+import java.util.Set;
+
 @Singleton
-public class Spock implements TestFeature {
+public class Spock implements TestFeature, DefaultFeature {
 
  @Override
  public String getName() {
@@ -42,4 +48,8 @@ public TestFramework getTestFramework() {
  return TestFramework.SPOCK;
  }
 
+ @Override
+ public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
+ return options.getTestFramework() == null || options.getTestFramework() == TestFramework.SPOCK;
+ }
 }
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/test/TestFeature.java b/grails-forge-core/src/main/java/org/grails/forge/feature/test/TestFeature.java
@@ -17,15 +17,17 @@
 
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.generator.GeneratorContext;
-import org.grails.forge.feature.DefaultFeature;
-import org.grails.forge.feature.Feature;
+import org.grails.forge.feature.Category;
 import org.grails.forge.feature.FeaturePhase;
-import org.grails.forge.options.Options;
+import org.grails.forge.feature.OneOfFeature;
 import org.grails.forge.options.TestFramework;
 
-import java.util.Set;
+public interface TestFeature extends OneOfFeature {
 
-public interface TestFeature extends DefaultFeature {
+ @Override
+ default Class<?> getFeatureClass() {
+ return TestFeature.class;
+ }
 
  @Override
  default boolean isVisible() {
@@ -37,6 +39,11 @@ default int getOrder() {
  return FeaturePhase.TEST.getOrder();
  }
 
+ @Override
+ default String getCategory() {
+ return Category.VALIDATION;
+ }
+
  @Override
  default void apply(GeneratorContext generatorContext) {
  doApply(generatorContext);
@@ -54,17 +61,6 @@ default boolean isSpock() {
  return getTestFramework() == TestFramework.SPOCK;
  }
 
- @Override
- default boolean shouldApply(ApplicationType applicationType,
- Options options,
- Set<Feature> selectedFeatures) {
- TestFramework selectedTest = options.getTestFramework();
- if (selectedTest == null) {
- selectedTest = options.getLanguage().getDefaults().getTest();
- }
- return supports(applicationType) && selectedTest == getTestFramework();
- }
-
  @Override
  default boolean supports(ApplicationType applicationType) {
  return true;