Merge pull request #3378 from DamnClin/merge-bean-validation-test

Merge bean validation test in spring boot
jhipster · Sep 1, 2022 · 92ec744 · 92ec744
2 parents 4965b2a + 6bdb9c4
commit 92ec744
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 141 deletions.
diff --git a/...erver/springboot/beanvalidationtest/application/BeanValidationTestApplicationService.java b/...erver/springboot/beanvalidationtest/application/BeanValidationTestApplicationService.java
diff --git a/...enerator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactory.java b/...enerator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactory.java
diff --git a/...boot/beanvalidationtest/infrastructure/primary/BeanValidationTestModuleConfiguration.java b/...boot/beanvalidationtest/infrastructure/primary/BeanValidationTestModuleConfiguration.java
diff --git a/...ch/jhipster/lite/generator/server/springboot/core/domain/SpringBootCoreModuleFactory.java b/...ch/jhipster/lite/generator/server/springboot/core/domain/SpringBootCoreModuleFactory.java
@@ -57,6 +57,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .addDependency(springBootConfigurationProcessor())
         .addDependency(groupId("org.apache.commons"), artifactId("commons-lang3"))
         .addDependency(springBootTest())
+        .addDependency(reflectionsDependency())
         .and()
       .javaBuildPlugins()
         .pluginManagement(springBootPluginManagement())
@@ -73,6 +74,10 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .add(SOURCE.template("logback.xml"), TEST_RESOURCES_DESTINATION.append("logback.xml"))
         .add(SOURCE.template("LogsSpy.java"), toSrcTestJava().append(properties.packagePath()).append("LogsSpy.java"))
         .add(SOURCE.template("ApplicationStartupTracesTest.java"), toSrcTestJava().append(packagePath).append("ApplicationStartupTracesTest.java"))
+        .batch(SOURCE, toSrcTestJava().append(properties.packagePath()))
+          .addTemplate("BeanValidationAssertions.java")
+          .addTemplate("BeanValidationTest.java")
+          .and()
         .and()
       .optionalReplacements()
         .in("pom.xml")
@@ -107,6 +112,15 @@ private JavaDependency springBootTest() {
       .build();
   }
 
+  private JavaDependency reflectionsDependency() {
+    return javaDependency()
+      .groupId("org.reflections")
+      .artifactId("reflections")
+      .versionSlug("reflections")
+      .scope(JavaDependencyScope.TEST)
+      .build();
+  }
+
   private JavaBuildPlugin springBootPluginManagement() {
     return JavaBuildPlugin
       .builder()

diff --git a/.../springboot/mvc/dummy/feature/infrastructure/primary/DummyFeatureModuleConfiguration.java b/.../springboot/mvc/dummy/feature/infrastructure/primary/DummyFeatureModuleConfiguration.java
@@ -25,7 +25,6 @@ JHipsterModuleResource dummyFeatureModule(DummyApplicationService dummy) {
           .addFeatureDependency("web-error-management")
           .addFeatureDependency("springdoc")
           .addModuleDependency("java-base")
-          .addModuleDependency("bean-validation-test")
           .build()
       )
       .tags("server")

diff --git a/...st/BeanValidationAssertions.java.mustache → ...re/BeanValidationAssertions.java.mustache b/...st/BeanValidationAssertions.java.mustache → ...re/BeanValidationAssertions.java.mustache
diff --git a/...tiontest/BeanValidationTest.java.mustache → ...oot/core/BeanValidationTest.java.mustache b/...tiontest/BeanValidationTest.java.mustache → ...oot/core/BeanValidationTest.java.mustache
diff --git a/src/test/features/bean-validation-test.feature b/src/test/features/bean-validation-test.feature
diff --git a/...ator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactoryTest.java b/...ator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactoryTest.java
diff --git a/...hipster/lite/generator/server/springboot/core/domain/SpringBootCoreModuleFactoryTest.java b/...hipster/lite/generator/server/springboot/core/domain/SpringBootCoreModuleFactoryTest.java
@@ -67,6 +67,16 @@ void shouldBuildModuleOnProjectWithoutDefaultGoal() {
             </dependency>
         """
       )
+      .containing(
+        """
+            <dependency>
+              <groupId>org.reflections</groupId>
+              <artifactId>reflections</artifactId>
+              <version>${reflections.version}</version>
+              <scope>test</scope>
+            </dependency>
+        """
+      )
       .containing(
         """
                 <plugin>
@@ -146,6 +156,7 @@ void shouldBuildModuleOnProjectWithoutDefaultGoal() {
         "src/main/resources/config/application-local.properties",
         "src/test/resources/config/application.properties"
       )
+      .createPrefixedFiles("src/test/java/com/jhipster/test", "BeanValidationAssertions.java", "BeanValidationTest.java")
       .createFiles("src/test/resources/logback.xml", "src/main/resources/logback-spring.xml")
       .createFiles("documentation/logs-spy.md")
       .createJavaTests("com/jhipster/test/LogsSpy.java");

diff --git a/tests-ci/generate.sh b/tests-ci/generate.sh
@@ -120,7 +120,6 @@ elif [[ $application == 'fullapp' ]]; then
   applyModules "postgresql" "liquibase"
 
   applyModules \
-  "bean-validation-test" \
   "dummy-feature" \
   "dummy-jpa-persistence" \
   "dummy-liquibase-changelog" \
@@ -142,7 +141,6 @@ elif [[ $application == 'oauth2app' ]]; then
   applyModules \
   "spring-boot-cucumber" \
   "spring-boot-cucumber-oauth2-authentication" \
-  "bean-validation-test" \
   "dummy-feature"
 
 elif [[ $application == 'mysqlapp' ]]; then
@@ -156,7 +154,6 @@ elif [[ $application == 'mysqlapp' ]]; then
   applyModules "spring-boot-cucumber-jpa-reset"
 
   applyModules \
-  "bean-validation-test" \
   "dummy-feature" \
   "dummy-jpa-persistence" \
   "dummy-liquibase-changelog" \
@@ -189,7 +186,6 @@ elif [[ $application == 'flywayapp' ]]; then
   applyModules "spring-boot-cucumber-jpa-reset"
 
   applyModules \
-  "bean-validation-test" \
   "dummy-feature" \
   "dummy-jpa-persistence" \
   "dummy-postgresql-flyway-changelog" \
@@ -207,7 +203,6 @@ elif [[ $application == 'undertowapp' ]]; then
   applyModules "spring-boot-cucumber-jpa-reset"
 
   applyModules \
-  "bean-validation-test" \
   "dummy-feature" \
   "dummy-jpa-persistence" \
   "dummy-not-postgresql-flyway-changelog" \
@@ -247,7 +242,6 @@ elif [[ $application == 'mongodbapp' ]]; then
   cucumber_with_jwt
 
   applyModules \
-  "bean-validation-test" \
   "dummy-feature" \
   "dummy-mongodb-persistence"