Skip to content

Commit

Permalink
fix Unit tests configuration issues (rely on relative path and mix te…
Browse files Browse the repository at this point in the history 
…stng and junit) swagger-api#446
  • Loading branch information
@boillodmanuel
boillodmanuel committed Apr 9, 2018
1 parent 81c3efd commit fd23963
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 123 deletions.
32 changes: 18 additions & 14 deletions modules/swagger-parser/src/test/java/io/swagger/parser/FileReferenceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.swagger.models.properties.RefProperty;
import io.swagger.models.refs.RefFormat;
import io.swagger.parser.util.SwaggerDeserializationResult;
import io.swagger.util.Yaml;
import io.swagger.parser.util.TestUtils;
import org.testng.annotations.Test;

import java.util.List;
Expand All @@ -23,12 +23,16 @@
public class FileReferenceTest {
@Test
public void testIssue306() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-306.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-306.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();

assertTrue(swagger.getDefinitions().size() == 5);
assertEquals(swagger.getDefinitions().size(), 5);

assertNotNull(swagger.getDefinitions().get("Animal"));
assertNotNull(swagger.getDefinitions().get("Category"));

// resolved from `$ref: './book.yaml'`
assertNotNull(swagger.getDefinitions().get("Inventory"));
// resolved from `$ref: 'book.yaml'`
Expand All @@ -40,7 +44,7 @@ public void testIssue306() {

@Test
public void testIssue308() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-308.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-308.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -51,7 +55,7 @@ public void testIssue308() {

@Test
public void testIssue310() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-310.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-310.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -62,7 +66,7 @@ public void testIssue310() {

@Test
public void testIssue312() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-312.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-312.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -78,7 +82,7 @@ public void testIssue312() {

@Test
public void testIssue314() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-314.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-314.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -96,7 +100,7 @@ public void testIssue314() {

@Test
public void testIssue316() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-316.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-316.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -119,7 +123,7 @@ public void testIssue316() {

@Test
public void testIssue323() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-323.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-323.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -132,7 +136,7 @@ public void testIssue323() {

@Test
public void testIssue289() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/issue-289.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/issue-289.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -141,7 +145,7 @@ public void testIssue289() {

@Test
public void testIssue336() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-336.json", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-336.json"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -150,7 +154,7 @@ public void testIssue336() {

@Test
public void testIssue340() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-340.json", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-340.json"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand All @@ -159,7 +163,7 @@ public void testIssue340() {

@Test
public void testIssue304() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-304.json", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-304.json"), null, true);
assertNotNull(result.getSwagger().getDefinitions());
}

Expand All @@ -179,7 +183,7 @@ public void testAllOfFlatAndNested() {

@Test
public void testIssue421() {
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo("./src/test/resources/nested-file-references/issue-421.yaml", null, true);
SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(TestUtils.getResourceAbsolutePath("/nested-file-references/issue-421.yaml"), null, true);
assertNotNull(result.getSwagger());

Swagger swagger = result.getSwagger();
Expand Down
41 changes: 21 additions & 20 deletions modules/swagger-parser/src/test/java/io/swagger/parser/NetworkReferenceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import io.swagger.models.properties.StringProperty;
import io.swagger.parser.util.RemoteUrl;
import io.swagger.parser.util.SwaggerDeserializationResult;
import io.swagger.parser.util.TestUtils;
import io.swagger.util.Json;
import mockit.Expectations;
import mockit.Mocked;
import org.junit.Assert;
import org.testng.annotations.Test;

import java.io.File;
Expand All @@ -40,28 +40,28 @@ public class NetworkReferenceTest {

static {
try {
issue_323_yaml = readFile("src/test/resources/nested-file-references/issue-323.yaml");
issue_323_events_yaml = readFile("src/test/resources/nested-file-references/eventsCase9.yaml");
issue_323_paging_yaml = readFile("src/test/resources/nested-file-references/common/pagingWithFolderRef.yaml");
issue_323_bar_yaml = readFile("src/test/resources/nested-file-references/common/common2/bar.yaml");
issue_323_yaml = readFile("/nested-file-references/issue-323.yaml");
issue_323_events_yaml = readFile("/nested-file-references/eventsCase9.yaml");
issue_323_paging_yaml = readFile("/nested-file-references/common/pagingWithFolderRef.yaml");
issue_323_bar_yaml = readFile("/nested-file-references/common/common2/bar.yaml");

issue_328_yaml = readFile("src/test/resources/nested-file-references/issue-328.yaml");
issue_328_events_yaml = readFile("src/test/resources/nested-file-references/issue-328-events.yaml");
issue_328_paging_yaml = readFile("src/test/resources/nested-file-references/common/issue-328-paging.yaml");
issue_328_bar_yaml = readFile("src/test/resources/nested-file-references/common/common2/issue-328-bar.yaml");
issue_328_yaml = readFile("/nested-file-references/issue-328.yaml");
issue_328_events_yaml = readFile("/nested-file-references/issue-328-events.yaml");
issue_328_paging_yaml = readFile("/nested-file-references/common/issue-328-paging.yaml");
issue_328_bar_yaml = readFile("/nested-file-references/common/common2/issue-328-bar.yaml");

issue_330_yaml = readFile("src/test/resources/nested-network-references/issue-330.yaml");
issue_330_paging_yaml = readFile("src/test/resources/nested-network-references/common/issue-330-paging.yaml");
issue_330_users_yaml = readFile("src/test/resources/nested-network-references/common/issue-330-users.yaml");
issue_330_entities_yaml = readFile("src/test/resources/nested-network-references/common/issue-330-entities.yaml");
issue_330_yaml = readFile("/nested-network-references/issue-330.yaml");
issue_330_paging_yaml = readFile("/nested-network-references/common/issue-330-paging.yaml");
issue_330_users_yaml = readFile("/nested-network-references/common/issue-330-users.yaml");
issue_330_entities_yaml = readFile("/nested-network-references/common/issue-330-entities.yaml");

issue_335_json = readFile("src/test/resources/nested-file-references/issue-335.json");
issue_335_bar_json = readFile("src/test/resources/nested-file-references/issue-335-bar.json");
issue_335_json = readFile("/nested-file-references/issue-335.json");
issue_335_bar_json = readFile("/nested-file-references/issue-335-bar.json");

issue_407_json = readFile("src/test/resources/petstore.json");
issue_407_json = readFile("/petstore.json");

issue_411_server = readFile("src/test/resources/nested-network-references/issue-411-server.yaml");
issue_411_components = readFile("src/test/resources/nested-network-references/issue-411-remote2.yaml");
issue_411_server = readFile("/nested-network-references/issue-411-server.yaml");
issue_411_components = readFile("/nested-network-references/issue-411-remote2.yaml");
}
catch(Exception e) {
e.printStackTrace();
Expand Down Expand Up @@ -192,7 +192,7 @@ public void testPathReference() throws Exception {
" - https\n" +
" - http";
final SwaggerDeserializationResult result = parser.readWithInfo(yaml);
Assert.assertNotNull(result.getSwagger());
assertNotNull(result.getSwagger());
assertTrue(result.getMessages().size() == 0);
assertTrue(result.getSwagger().getDefinitions().size() == 3);
}
Expand Down Expand Up @@ -246,6 +246,7 @@ public void testIssue411() throws Exception {
}

static String readFile(String name) throws Exception {
return new String(Files.readAllBytes(new File(name).toPath()), Charset.forName("UTF-8"));
String path = TestUtils.getResourceAbsolutePath(name);
return new String(Files.readAllBytes(new File(path).toPath()), Charset.forName("UTF-8"));
}
}
Loading

0 comments on commit fd23963

Please sign in to comment.