From 623ae5bd34e4e3261e55e37358e7ea890abeff6a Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Sat, 2 Apr 2016 21:18:58 +0200 Subject: [PATCH] Revert changes to baseClassForTests --- .../AbstractGenerateVerificationCodeMojo.java | 8 -------- .../src/test/projects/spring-boot-java/pom.xml | 15 +-------------- .../{BaseAccurest.java => BaseMockMvcTest.java} | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) rename maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/{BaseAccurest.java => BaseMockMvcTest.java} (87%) diff --git a/maven-plugin/src/main/java/io/codearte/accurest/maven/AbstractGenerateVerificationCodeMojo.java b/maven-plugin/src/main/java/io/codearte/accurest/maven/AbstractGenerateVerificationCodeMojo.java index c7691c3662..02f59dc8b2 100644 --- a/maven-plugin/src/main/java/io/codearte/accurest/maven/AbstractGenerateVerificationCodeMojo.java +++ b/maven-plugin/src/main/java/io/codearte/accurest/maven/AbstractGenerateVerificationCodeMojo.java @@ -7,7 +7,6 @@ import java.io.File; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; -import org.assertj.core.util.Strings; import io.codearte.accurest.AccurestException; import io.codearte.accurest.TestGenerator; @@ -44,13 +43,6 @@ public abstract class AbstractGenerateVerificationCodeMojo extends AbstractMojo config.setContractsDslDir(new File(baseDir, contractsDir)); config.setBasePackageForTests(basePackageForTests); config.setGeneratedTestSourcesDir(new File(projectBuildDirectory, generatedTestSourcesDir)); - if (Strings.isNullOrEmpty(baseClassForTests)) { - if (!Strings.isNullOrEmpty(basePackageForTests)) { - baseClassForTests = basePackageForTests + '.' + "BaseAccurest"; - } else { - baseClassForTests = "io.codearte.accurest.tests.BaseAccurest"; - } - } config.setBaseClassForTests(baseClassForTests); config.setTargetFramework(testFramework); config.setTestMode(testMode); diff --git a/maven-plugin/src/test/projects/spring-boot-java/pom.xml b/maven-plugin/src/test/projects/spring-boot-java/pom.xml index e7be85facd..1bdf2d1333 100644 --- a/maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -55,7 +55,6 @@ 1.8 - @@ -76,6 +75,7 @@ hello + hello.BaseMockMvcTest @@ -123,17 +123,4 @@ - - - - spring-releases - https://repo.spring.io/libs-release - - - - - spring-releases - https://repo.spring.io/libs-release - - diff --git a/maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseAccurest.java b/maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java similarity index 87% rename from maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseAccurest.java rename to maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java index d3bf7124e2..2fe6a9564a 100644 --- a/maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseAccurest.java +++ b/maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseMockMvcTest.java @@ -3,7 +3,7 @@ package hello; import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc; import org.junit.Before; -public class BaseAccurest { +public class BaseMockMvcTest { @Before public void setup() {