diff --git a/.idea/runConfigurations/_template__of_Mocha.xml b/.idea/runConfigurations/_template__of_mocha_javascript_test_runner.xml similarity index 100% rename from .idea/runConfigurations/_template__of_Mocha.xml rename to .idea/runConfigurations/_template__of_mocha_javascript_test_runner.xml diff --git a/.idea/runConfigurations/_template__of_mocha_javascript_test_runner2.xml b/.idea/runConfigurations/_template__of_mocha_javascript_test_runner2.xml new file mode 100644 index 000000000000..ca239908f8f9 --- /dev/null +++ b/.idea/runConfigurations/_template__of_mocha_javascript_test_runner2.xml @@ -0,0 +1,15 @@ + + + project + + $PROJECT_DIR$/node_modules/esmocha + + true + bdd + --config .mocharc.cjs --forbid-only --max-old-space-size=4096 --no-parallel + DIRECTORY + + false + + + \ No newline at end of file diff --git a/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs b/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs index 11909a5f6d12..669865db9063 100644 --- a/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs +++ b/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs @@ -31,7 +31,7 @@ import java.util.Set; <%_ } _%> import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import <%= packageName %>.web.rest.TestUtil; +import <%= packageName %>.TestUtil; class <%= persistClass %>Test { diff --git a/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs b/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs index cb80e8fe4e16..291009a95761 100644 --- a/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs +++ b/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs @@ -20,7 +20,7 @@ package <%= entityAbsolutePackage %>.domain; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import <%= packageName %>.web.rest.TestUtil; +import <%= packageName %>.TestUtil; <%_ if (fields.some(field => field.fieldTypeString) || fields.some(field => field.fieldTypeUUID)) { _%> import java.util.UUID; <%_ } _%> diff --git a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs index 92545c3ff241..e95cc2fbb4e5 100644 --- a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs +++ b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs @@ -38,4 +38,4 @@ file_env 'SPRING_LIQUIBASE_PASSWORD' <%_ } _%> file_env 'JHIPSTER_REGISTRY_PASSWORD' -exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "<%= packageName %>.<%= mainClass %>" "$@" +exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/urandom -cp /app/resources:/app/classes:/app/libs/* ... diff --git a/generators/spring-boot/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs index ee5be98ba862..34de6f90ad27 100644 --- a/generators/spring-boot/templates/build.gradle.ejs +++ b/generators/spring-boot/templates/build.gradle.ejs @@ -113,7 +113,7 @@ test { testLogging { events 'FAILED', 'SKIPPED' } - jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx512m' + jvmArgs += '-Djava.security.egd=file:/dev/urandom -Xmx512m' // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs index 070b35e934dc..a74cf78c3f56 100644 --- a/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs +++ b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs @@ -109,7 +109,7 @@ task integrationTest(type: Test) { exceptionFormat "full" } systemProperty('spring.profiles.active', 'test,testdev') - systemProperty('java.security.egd', 'file:/dev/./urandom') + systemProperty('java.security.egd', 'file:/dev/urandom') // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs index 609e8c80d69f..51fdba75539c 100644 --- a/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs +++ b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs @@ -83,7 +83,7 @@ task integrationTest(type: Test) { exceptionFormat "full" } systemProperty('spring.profiles.active', 'test,testprod') - systemProperty('java.security.egd', 'file:/dev/./urandom') + systemProperty('java.security.egd', 'file:/dev/urandom') // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs index 0c09ae4906a9..6b4d8d69dad1 100644 --- a/generators/spring-boot/templates/pom.xml.ejs +++ b/generators/spring-boot/templates/pom.xml.ejs @@ -52,7 +52,7 @@ ${java.version} ${java.version} <%= packageName %>.<%= mainClass %> - -Djava.security.egd=file:/dev/./urandom -Xmx1G + -Djava.security.egd=file:/dev/urandom -Xmx1G jdt_apt false diff --git a/generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_TestUtil.java.ejs similarity index 99% rename from generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs rename to generators/spring-boot/templates/src/test/java/_package_/_TestUtil.java.ejs index bd1fb86d0fb5..3d719ae94f97 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_TestUtil.java.ejs @@ -16,7 +16,8 @@ See the License for the specific language governing permissions and limitations under the License. -%> -package <%= packageName %>.web.rest; +package <%= packageName %>; + import java.lang.reflect.Method; import org.hamcrest.Description; diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs index d5e2d953c818..4c2aa4a451e0 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs @@ -113,7 +113,7 @@ import java.util.UUID; <%_ } _%> <%_ if (databaseTypeCouchbase) { _%> -import static <%= packageName %>.web.rest.TestUtil.mockAuthentication; +import static <%= packageName %>.TestUtil.mockAuthentication; <%_ } _%> import static org.assertj.core.api.Assertions.assertThat; <%_ if (searchEngineElasticsearch) { _%> diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs index e024e532cf98..7fe77bca6cdc 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/dto/_dtoClass_Test.java.ejs @@ -20,7 +20,7 @@ package <%= entityAbsolutePackage %>.service.dto; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import <%= packageName %>.web.rest.TestUtil; +import <%= packageName %>.TestUtil; <%_ let id1; let id2; diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs index fd25eee5e020..10df1a0757c8 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs @@ -19,7 +19,7 @@ package <%= entityAbsolutePackage %>.web.rest; import static <%= entityAbsolutePackage %>.domain.<%= persistClass %>Asserts.*; -import static <%= packageName %>.web.rest.TestUtil.createUpdateProxyForBean; +import static <%= packageName %>.TestUtil.createUpdateProxyForBean; <%_ var filterTestableRelationships = (reactive ? reactiveEagerRelations : relationships).filter(rel => rel.persistableRelationship && !rel.otherEntity.hasCyclicRequiredRelationship); const fieldsToTest = fields.filter(field => !field.id && !field.autoGenerate && !field.transient); @@ -57,7 +57,7 @@ if (databaseTypeSql && !reactive) { _%> <%_ if (entityAbsolutePackage !== packageName) { _%> -import <%= packageName %>.web.rest.TestUtil; +import <%= packageName %>.TestUtil; <% } %> import <%= packageName %>.IntegrationTest; import <%= entityAbsolutePackage %>.domain.<%= persistClass %>; @@ -212,10 +212,10 @@ import java.util.concurrent.atomic.AtomicInteger; <%_ } _%> <%_ if (anyFieldIsBigDecimal) { _%> -import static <%= packageName %>.web.rest.TestUtil.sameNumber; +import static <%= packageName %>.TestUtil.sameNumber; <%_ } _%> <%_ if (anyFieldIsZonedDateTime) { _%> -import static <%= packageName %>.web.rest.TestUtil.sameInstant; +import static <%= packageName %>.TestUtil.sameInstant; <%_ } _%> import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.hasItem;