Skip to content

[#4966] Fixing flaky test UnitTestSwaggerUtils#testSwagger without adding dependencies #4984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

[#4966] Fixing flaky test UnitTestSwaggerUtils#testSwagger without adding dependencies #4984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions ...ain/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
import java.io.IOException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Objects;

import org.apache.commons.io.IOUtils;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.junit.jupiter.api.Assertions;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;

import io.swagger.v3.core.util.Yaml;
import io.swagger.v3.oas.models.OpenAPI;
Expand Down Expand Up @@ -81,8 +83,19 @@ public static SwaggerGenerator testSwagger(String resPath, Class<?> cls, String.
expectSchema = expectSchema.substring(offset + 4);
}

if (!Objects.equals(expectSchema, schema)) {
Assertions.assertEquals(expectSchema, schema);
try {
ObjectMapper yaml = new ObjectMapper(new YAMLFactory());
JsonNode expected = yaml.readTree(expectSchema);
JsonNode actual = yaml.readTree(schema);

if (!actual.equals(expected)) {
ObjectMapper json = new ObjectMapper();
String expectedPretty = json.writerWithDefaultPrettyPrinter().writeValueAsString(expected);
String actualPretty = json.writerWithDefaultPrettyPrinter().writeValueAsString(actual);
Assertions.fail("OpenAPI mismatch.\n=== EXPECTED ===\n" + expectedPretty + "\n=== ACTUAL ===\n" + actualPretty);
}
} catch (Exception e) {
Assertions.fail("Failed to parse/compare OpenAPI YAML: " + e.getMessage(), e);
}

return generator;
Expand Down
Loading