Skip to content

Commit

Permalink
Test fixed (#353)
Browse files Browse the repository at this point in the history
* Test fixed

* Fix Version
  • Loading branch information
jemacineiras authored Nov 2, 2024
1 parent b693f1f commit e0f6003
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion multiapi-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.sngular</groupId>
<artifactId>multiapi-engine</artifactId>
<version>6.0.3</version>
<version>6.0.4</version>
<packaging>jar</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,31 +197,31 @@ public final class OpenApiGeneratorFixtures {
);

static final List<SpecFile> TEST_REST_CLIENT_GENERATION = List.of(
SpecFile
.builder()
.filePath("openapigenerator/testRestClientApiGeneration/api-test.yml")
.apiPackage("com.sngular.multifileplugin.restclient")
.modelPackage("com.sngular.multifileplugin.restclient.model")
.clientPackage("com.sngular.multifileplugin.restclient.client")
.modelNamePrefix("Api")
.modelNameSuffix("DTO")
.useLombokModelAnnotation(false)
.callMode(true)
.build()
SpecFile
.builder()
.filePath("openapigenerator/testRestClientApiGeneration/api-test.yml")
.apiPackage("com.sngular.multifileplugin.restclient")
.modelPackage("com.sngular.multifileplugin.restclient.model")
.clientPackage("com.sngular.multifileplugin.restclient.client")
.modelNamePrefix("Api")
.modelNameSuffix("DTO")
.useLombokModelAnnotation(false)
.callMode(true)
.build()
);

static final List<SpecFile> TEST_REST_CLIENT_API_WITH_REQUEST_OBJECTS_GENERATION = List.of(
SpecFile
.builder()
.filePath("openapigenerator/testRestClientApiWithRequestObjectGeneration/api-test.yml")
.apiPackage("com.sngular.multifileplugin.restclientWithRequestObjects")
.modelPackage("com.sngular.multifileplugin.restclientWithRequestObjects.model")
.clientPackage("com.sngular.multifileplugin.restclientWithRequestObjects.client")
.modelNamePrefix("Api")
.modelNameSuffix("DTO")
.useLombokModelAnnotation(false)
.callMode(true)
.build()
SpecFile
.builder()
.filePath("openapigenerator/testRestClientApiWithRequestObjectGeneration/api-test.yml")
.apiPackage("com.sngular.multifileplugin.restclientWithRequestObjects")
.modelPackage("com.sngular.multifileplugin.restclientWithRequestObjects.model")
.clientPackage("com.sngular.multifileplugin.restclientWithRequestObjects.client")
.modelNamePrefix("Api")
.modelNameSuffix("DTO")
.useLombokModelAnnotation(false)
.callMode(true)
.build()
);

static final List<SpecFile> TEST_ENUMS_GENERATION = List.of(
Expand Down Expand Up @@ -1532,11 +1532,11 @@ static Function<Path, Boolean> validateReferenceFile() {


static Function<Path, Boolean> validateReferenceFileNoComponents() {
final String DEFAULT_TARGET_API = "generated/com/sngular/multifileplugin/testReferenceFileNoComponents";
final String DEFAULT_TARGET_API = "generated/com/sngular/multifileplugin/testreferencefilenocomponents";

final String DEFAULT_MODEL_API = "generated/com/sngular/multifileplugin/testReferenceFileNoComponents/model";
final String DEFAULT_MODEL_API = "generated/com/sngular/multifileplugin/testreferencefilenocomponents/model";

final String DEFAULT_EXCEPTION_API = "generated/com/sngular/multifileplugin/testReferenceFileNoComponents/model/exception";
final String DEFAULT_EXCEPTION_API = "generated/com/sngular/multifileplugin/testreferencefilenocomponents/model/exception";

final List<String> expectedTestApiFiles = List.of(
"openapigenerator/testReferenceFileNoComponents/assets/TestApi.java"
Expand Down Expand Up @@ -1580,7 +1580,7 @@ static Function<Path, Boolean> validateApiWithNoComponents() {
final List<String> expectedTestApiModelFiles = List.of(
);

return path -> commonTest(path, expectedTestApiFiles, expectedTestApiModelFiles, DEFAULT_TARGET_API, DEFAULT_MODEL_API, Collections.emptyList(), DEFAULT_EXCEPTION_API);
return path -> commonTest(path, expectedTestApiFiles, expectedTestApiModelFiles, DEFAULT_TARGET_API, null, Collections.emptyList(), null);

}

Expand Down
6 changes: 3 additions & 3 deletions scs-multiapi-gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}

group = 'com.sngular'
version = '6.0.3'
version = '6.0.4'

def SCSMultiApiPluginGroupId = group
def SCSMultiApiPluginVersion = version
Expand All @@ -30,7 +30,7 @@ dependencies {
shadow localGroovy()
shadow gradleApi()

implementation 'com.sngular:multiapi-engine:6.0.3'
implementation 'com.sngular:multiapi-engine:6.0.4'
testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'com.puppycrawl.tools:checkstyle:10.12.3'
}
Expand Down Expand Up @@ -98,7 +98,7 @@ testing {

integrationTest(JvmTestSuite) {
dependencies {
implementation 'com.sngular:scs-multiapi-gradle-plugin:6.0.3'
implementation 'com.sngular:scs-multiapi-gradle-plugin:6.0.4'
implementation 'org.assertj:assertj-core:3.24.2'
}

Expand Down
4 changes: 2 additions & 2 deletions scs-multiapi-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.sngular</groupId>
<artifactId>scs-multiapi-maven-plugin</artifactId>
<version>6.0.3</version>
<version>6.0.4</version>
<packaging>maven-plugin</packaging>

<name>AsyncApi - OpenApi Code Generator Maven Plugin</name>
Expand Down Expand Up @@ -271,7 +271,7 @@
<dependency>
<groupId>com.sngular</groupId>
<artifactId>multiapi-engine</artifactId>
<version>6.0.3</version>
<version>6.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down

0 comments on commit e0f6003

Please sign in to comment.