From 97a6a0a044d12adeab82d6000b096cbc927d56c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Wed, 18 Sep 2024 18:15:47 +0200 Subject: [PATCH] test: remove redundant partial assertions, already covered by the matchingSavedSnapshot() assertion --- .../core/domain/VueModulesFactoryTest.java | 36 -- ...leSystemJHipsterModulesRepositoryTest.java | 366 ------------------ 2 files changed, 402 deletions(-) diff --git a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java index 8b8bee8fa5..a0ba30e1cb 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java @@ -63,48 +63,12 @@ void shouldCreateVueModule() { .hasPrefixedFiles("", "eslint.config.js", "tsconfig.build.json", "vite.config.ts", "vitest.config.ts") .hasFile("tsconfig.json") .matchingSavedSnapshot() - .containing("\"extends\": \"@vue/tsconfig/tsconfig.dom.json\"") - .containing("\"allowJs\": true,") - .containing("\"sourceMap\": true,") - .containing("\"types\": [\"vite/client\", ") .and() .hasFile("vitest.config.ts") .matchingSavedSnapshot() - .containing("import vue from '@vitejs/plugin-vue';") - .containing("plugins: [vue(), tsconfigPaths()],") - .containing("environment: 'jsdom',") - .containing(""" - exclude: [ - ...configDefaults.coverage.exclude as string[], - 'src/main/webapp/app/main.ts', - 'src/main/webapp/app/injections.ts', - 'src/main/webapp/app/router.ts', - 'src/main/webapp/**/*.component.ts', - """ - ) .and() .hasFile("eslint.config.js") .matchingSavedSnapshot() - .containing("import vue from 'eslint-plugin-vue';") - .containing(""" - ...vue.configs['flat/recommended'], - { - files: ['**/*.vue'], - languageOptions: { - parserOptions: { parser: '@typescript-eslint/parser' }, - globals: { ...globals.browser }, - }, - }, - """ - ) - .containing(""" - rules: { - quotes: ['error', 'single', { avoidEscape: true }], - '@typescript-eslint/no-empty-object-type': 'off', - '@typescript-eslint/no-explicit-any': 'off', - 'vue/html-self-closing': 'off', - """ - ) .and() .hasFiles("src/main/webapp/app/shared/http/infrastructure/secondary/AxiosHttp.ts") .hasFiles("src/main/webapp/index.html") diff --git a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java index 153cea9065..859dd61304 100644 --- a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java @@ -79,291 +79,9 @@ void shouldApplyModuleToMavenProject() { .and() .hasFile("pom.xml") .matchingSavedSnapshot() - .containing("local") - .notContaining( - """ - - net.logstash.logback - logstash-logback-encoder - - """ - ) - .notContaining( - """ - - org.springdoc - springdoc-openapi-ui - ${springdoc-openapi.version} - - """ - ) - .containing("") - .containing("") - .containing( - """ - - org.reflections - reflections - ${reflections.version} - test - - """ - ) - .containing( - """ - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - import - - """ - ) - .containing( - """ - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - """ - ) - .containing( - """ - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - """ - ) - .containing( - """ - - org.junit.jupiter - junit-jupiter-engine - ${spring-boot.version} - test - test - true - - """ - ) - .containing("") - .containing("") - .containing("spring-boot-starter") - .notContaining( - """ - - org.assertj - assertj-core - ${assertj.version} - test - - """ - ) - .containing("") - .containing("") - .containing( - """ - - - - org.springframework.boot - spring-boot-maven-plugin - - - maven-enforcer-plugin - - - org.asciidoctor - asciidoctor-maven-plugin - - - org.asciidoctor - asciidoctorj-screenshot - - - org.asciidoctor - asciidoctorj-diagram - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - ${start-class} - - - - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-versions - - enforce - - - - enforce-dependencyConvergence - - enforce - - - - - - false - - - - - - io.jsonwebtoken - jjwt-jackson - ${json-web-token.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - - - - You are running an older version of Maven. JHipster requires at least Maven ${maven.version} - [${maven.version},) - - - You are running an incompatible version of Java. JHipster engine supports JDK 21+. - [21,22) - - - - - - - - """ - ) - .containing("") - .containing( - """ - - - local - - - - - - maven-enforcer-plugin - ${maven-enforcer-plugin.version} - - - enforce-versions - - enforce - - - - enforce-dependencyConvergence - - enforce - - - - - - false - - - - - - io.jsonwebtoken - jjwt-jackson - ${json-web-token.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - - - - - You are running an older version of Maven. JHipster requires at least Maven ${maven.version} - [${maven.version},) - - - You are running an incompatible version of Java. JHipster engine supports JDK 21+. - [21,22) - - - - - - - - - maven-enforcer-plugin - - - - - local - - - - org.cassandraunit - cassandra-unit - ${cassandraunit.version} - test - - - - - """ - ) .and() .hasFile("package.json") .matchingSavedSnapshot() - .containing(" \"jestSonar\": {\n \"reportPath\": \"target/test-results\",\n \"reportFile\": \"TESTS-results-sonar.xml\"\n }") - .containing( - """ - "scripts": { - "build": "ng build --output-path=target/classes/static", - "serve": "tikui-core serve" - }, - """ - ) - .containing("\"dependencies\": {\n \"@angular/animations\": \"") - .containing("\"devDependencies\": {\n \"@playwright/test\": \"") .and() .hasFile("src/main/java/com/company/myapp/errors/Assert.java") .containing("Dummy replacement") @@ -470,82 +188,9 @@ void shouldApplyModuleToGradleProject() { .and() .hasFile("gradle/libs.versions.toml") .matchingSavedSnapshot() - .containing("spring-boot = \"") - .containing("json-web-token = \"") - .containing("cassandraunit = \"") - .containing("git-properties = \"") .and() .hasFile("build.gradle.kts") .matchingSavedSnapshot() - .notContaining("implementation(libs.logstash.logback.encoder)") - .notContaining("implementation(libs.springdoc.openapi.ui)") - .containing("implementation(platform(libs.spring.boot.dependencies))") - .containing("implementation(libs.spring.boot.starter.web)") - .containing("testImplementation(libs.junit.jupiter.engine)") - .containing("implementation(libs.spring.boot.starter)") - .notContaining("testImplementation(libs.assertj.core)") - .containing( - """ - import java.util.Properties - // jhipster-needle-gradle-imports - """ - ) - .containing(""" - plugins { - java - jacoco - checkstyle - // jhipster-needle-gradle-plugins - } - """ - ) - .containing(""" - checkstyle { - toolVersion = libs.versions.checkstyle.get() - } - """ - ) - .containing( - """ - val profiles = (project.findProperty("profiles") as String? ?: "") - .split(",") - .map { it.trim() } - .filter { it.isNotEmpty() } - if (profiles.contains("local")) { - apply(plugin = "profile-local") - } - // jhipster-needle-profile-activation\ - """ - ) - .containing( - """ - val springProfilesActive by extra("local") - // jhipster-needle-gradle-properties - """ - ) - .containing( - """ - tasks.build { - dependsOn("processResources") - } - - tasks.processResources { - filesMatching("**/*.yml", "**/*.properties") { - filter { - it.replace("@spring.profiles.active@", springProfilesActive) - } - } - } - - // jhipster-needle-gradle-free-configuration-blocks - """ - ) - .containing( - """ - finalizedBy("jacocoTestReport") - // jhipster-needle-gradle-tasks-test - """ - ) .and() .hasFile("buildSrc/build.gradle.kts") .containing( @@ -605,17 +250,6 @@ val springProfilesActive by extra("local") .and() .hasFile("package.json") .matchingSavedSnapshot() - .containing(" \"jestSonar\": {\n \"reportPath\": \"build/test-results\",\n \"reportFile\": \"TESTS-results-sonar.xml\"\n }") - .containing( - """ - "scripts": { - "build": "ng build --output-path=build/classes/static", - "serve": "tikui-core serve" - }, - """ - ) - .containing("\"dependencies\": {\n \"@angular/animations\": \"") - .containing("\"devDependencies\": {\n \"@playwright/test\": \"") .and() .hasFile("src/main/java/com/company/myapp/errors/Assert.java") .containing("Dummy replacement")