Skip to content

Commit 6e3bc79

Browse files
jemacineirasjemacineiras
committed
Improve test
1 parent e44a9b5 commit 6e3bc79

File tree

5 files changed

+37
-38
lines changed

5 files changed

+37
-38
lines changed

‎multiapi-engine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.sngular</groupId>
66
<artifactId>multiapi-engine</artifactId>
7-
<version>6.0.0</version>
7+
<version>6.0.0</version>
88
<packaging>jar</packaging>
99

1010
<properties>

‎multiapi-engine/src/main/resources/templates/model/templateContentEnum.ftlh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,28 @@ import com.fasterxml.jackson.annotation.JsonValue;
6060

6161
public enum ${schema.className} {
6262
<#list schema.fieldObjectList as field>
63-
<#list field.enumValues as key, value>
64-
<#if key?matches("[0-9].*")>
65-
${"_"+key}(${value})<#sep>,
66-
<#else>
67-
${key}(${value})<#sep>,
68-
</#if>
69-
</#list>;
63+
<#list field.enumValues as key, value>
64+
<#if key?matches("[0-9].*")>
65+
${"_"+key}(${value})<#sep>,
66+
<#else>
67+
${key}(${value})<#sep>,
68+
</#if>
69+
</#list>;
7070

7171
private ${field.dataType.innerType?cap_first} value;
7272

73-
${schema.className?cap_first}(${field.dataType.innerType?cap_first} value) {
74-
this.value = value;
73+
${schema.className?cap_first}(${field.dataType.innerType?cap_first} value) {
74+
this.value = value;
7575
}
7676

7777
@JsonValue
7878
public ${field.dataType.innerType?cap_first} getValue() {
79-
return value;
79+
return value;
8080
}
8181

8282
@Override
8383
public String toString() {
84-
return String.valueOf(value);
84+
return String.valueOf(value);
8585
}
8686
</#list>
8787
}

‎multiapi-engine/src/test/java/com/sngular/api/generator/plugin/asyncapi/AsyncApiGeneratorFixtures.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.assertj.core.api.Assertions;
1414

1515
import java.io.File;
16-
import java.io.IOException;
16+
import java.net.URISyntaxException;
1717
import java.nio.file.Path;
1818
import java.util.Collections;
1919
import java.util.List;
@@ -492,7 +492,7 @@ private static Boolean commonTest(
492492
Assertions.assertThat(targetModelException).isNotEmptyDirectory();
493493
TestUtils.validateFiles(expectedExceptionFiles, targetModelException);
494494
}
495-
} catch (final IOException e) {
495+
} catch (final URISyntaxException e) {
496496
result = Boolean.FALSE;
497497
}
498498
return result;
@@ -509,7 +509,7 @@ private static boolean modelTest(final Path resultPath, final List<String> expec
509509
Assertions.assertThat(targetModelFolder).isNotEmptyDirectory();
510510
TestUtils.validateFiles(expectedModelFiles, targetModelFolder);
511511
}
512-
} catch (final IOException e) {
512+
} catch (final URISyntaxException e) {
513513
result = Boolean.FALSE;
514514
}
515515
return result;
@@ -526,7 +526,7 @@ private static boolean customValidatorTest(final Path resultPath, final List<Str
526526
Assertions.assertThat(targetCustomValidatorFolder).isNotEmptyDirectory();
527527
TestUtils.validateFiles(expectedValidatorFiles, targetCustomValidatorFolder);
528528
}
529-
} catch (final IOException e) {
529+
} catch (final URISyntaxException e) {
530530
result = Boolean.FALSE;
531531
}
532532
return result;

‎multiapi-engine/src/test/java/com/sngular/api/generator/plugin/openapi/OpenApiGeneratorFixtures.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66

77
package com.sngular.api.generator.plugin.openapi;
88

9-
import static org.assertj.core.api.Assertions.assertThat;
9+
import com.sngular.api.generator.plugin.common.model.TypeConstants.TimeType;
10+
import com.sngular.api.generator.plugin.openapi.parameter.SpecFile;
11+
import com.sngular.api.generator.test.utils.TestUtils;
12+
import lombok.extern.slf4j.Slf4j;
13+
import org.apache.commons.collections4.CollectionUtils;
1014

1115
import java.io.File;
12-
import java.io.IOException;
16+
import java.net.URISyntaxException;
1317
import java.nio.file.Path;
1418
import java.util.Collections;
1519
import java.util.List;
1620
import java.util.function.Function;
1721

18-
import com.sngular.api.generator.plugin.common.model.TypeConstants.TimeType;
19-
import com.sngular.api.generator.plugin.openapi.parameter.SpecFile;
20-
import com.sngular.api.generator.test.utils.TestUtils;
21-
import lombok.extern.slf4j.Slf4j;
22-
import org.apache.commons.collections4.CollectionUtils;
22+
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
@Slf4j
2525
public final class OpenApiGeneratorFixtures {
@@ -1550,7 +1550,7 @@ private static Boolean commonTest(
15501550
assertThat(targetModelException).isNotEmptyDirectory();
15511551
TestUtils.validateFiles(expectedExceptionFiles, targetModelException);
15521552
}
1553-
} catch (IOException | NullPointerException e) {
1553+
} catch (URISyntaxException | NullPointerException e) {
15541554
result = Boolean.FALSE;
15551555
log.error(e.getLocalizedMessage());
15561556
}
@@ -1568,7 +1568,7 @@ private static Boolean customValidatorTest(final Path resultPath, final List<Str
15681568
assertThat(targetCustomValidatorFolder).isNotEmptyDirectory();
15691569
TestUtils.validateFiles(expectedValidatorFiles, targetCustomValidatorFolder);
15701570
}
1571-
} catch (IOException | NullPointerException e) {
1571+
} catch (URISyntaxException | NullPointerException e) {
15721572
result = Boolean.FALSE;
15731573
log.error(e.getLocalizedMessage());
15741574
}

‎multiapi-engine/src/test/java/com/sngular/api/generator/test/utils/TestUtils.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@
66

77
package com.sngular.api.generator.test.utils;
88

9-
import static org.assertj.core.api.Assertions.assertThat;
10-
119
import java.io.File;
12-
import java.io.FileInputStream;
13-
import java.io.IOException;
14-
import java.io.InputStream;
10+
import java.net.URISyntaxException;
11+
import java.nio.file.Paths;
1512
import java.util.ArrayList;
1613
import java.util.Comparator;
1714
import java.util.List;
1815
import java.util.Objects;
1916

17+
import static org.assertj.core.api.Assertions.assertThat;
18+
2019
public class TestUtils {
2120

22-
public static void validateFiles(final List<String> expectedFiles, final File targetDirectory) throws IOException {
23-
InputStream reader1;
24-
InputStream reader2;
21+
public static void validateFiles(final List<String> expectedFiles, final File targetDirectory) throws URISyntaxException {
22+
File reader1;
23+
File reader2;
2524

2625
List<File> outputFiles = new ArrayList<>(List.of(Objects.requireNonNull(targetDirectory.listFiles())));
2726
outputFiles.removeIf(File::isDirectory);
@@ -30,17 +29,17 @@ public static void validateFiles(final List<String> expectedFiles, final File ta
3029
.overridingErrorMessage("Wrong Number of files %d vs %d: %s", outputFiles.size(), expectedFiles.size(), outputFiles)
3130
.hasSize(expectedFiles.size());
3231
for (int i = 0; i < outputFiles.size(); i++) {
33-
reader1 = new FileInputStream(outputFiles.get(i));
32+
reader1 = outputFiles.get(i);
3433
assertThat(reader1).overridingErrorMessage("Generated file %s should not be null", outputFiles.get(i)).isNotNull();
3534
final String sourceName = expectedFiles.get(i);
3635
reader2 = TestUtils.resourceAsFile(sourceName);
3736
assertThat(reader2).overridingErrorMessage("Expected file %s should not be null", sourceName).isNotNull();
38-
int finalI = i;
39-
assertThat(reader1).as(() -> "Unexpected content for file " + outputFiles.get(finalI)).hasSameContentAs(reader2);
37+
assertThat(reader1)
38+
.hasSameTextualContentAs(reader2);
4039
}
4140
}
4241

43-
public static InputStream resourceAsFile(String resourceName) {
44-
return TestUtils.class.getClassLoader().getResourceAsStream(resourceName);
42+
public static File resourceAsFile(String resourceName) throws URISyntaxException {
43+
return Paths.get(TestUtils.class.getClassLoader().getResource(resourceName).toURI()).toFile();
4544
}
4645
}

0 commit comments

Comments
 (0)