loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Wrote method to remove newline characters (Windows or Unix style) from both strings before comparing them. (#2927)

Browse Source
This commit is contained in:
drl-max
2019-05-20 00:53:19 -07:00
committed by William Cheng
parent 10ac54f1b3
commit 1ad6701f02
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsBaseTest.java
View File

@@ -54,10 +54,14 @@ public abstract class JavaJaxrsBaseTest {
}
private void checkFileContains(MockDefaultGenerator generator, String path, String... lines) {
String file = generator.getFiles().get(path);
String file = linearize(generator.getFiles().get(path));
assertNotNull(file);
for (String line : lines)
assertTrue(file.contains(line));
assertTrue(file.contains(linearize(line)));
}
private String linearize(String target) {
return target.replaceAll("\r?\n", "").replaceAll("\\s+", "\\s");
}
@Test
@@ -92,10 +96,10 @@ public abstract class JavaJaxrsBaseTest {
}
private void checkFileNotContains(MockDefaultGenerator generator, String path, String... lines) {
String file = generator.getFiles().get(path);
String file = linearize(generator.getFiles().get(path));
assertNotNull(file);
for (String line : lines)
assertFalse(file.contains(line));
assertFalse(file.contains(linearize(line)));
}
@Test