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

[Java] Fix Potential Flaky Tests (#10485)

Browse Source 
* fixed flaky test

* fix flaky test

* update import to the original

* recover indent

* fix format

* finalize
This commit is contained in:
xiedaxia1hao
2021-09-27 22:55:35 -05:00
committed by GitHub
parent 5dcd76d9cb
commit c09c6261eb
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@@ -35,6 +35,7 @@ import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Collections;
public class AbstractJavaCodegenTest {
@@ -211,12 +212,17 @@ public class AbstractJavaCodegenTest {
codegen.processOpts();
codegen.preprocessOpenAPI(openAPI);
final List<String> additionalModelTypeAnnotations = new ArrayList<String>();
additionalModelTypeAnnotations.add("@Foo");
additionalModelTypeAnnotations.add("@Bar");
Assert.assertEquals(codegen.getAdditionalModelTypeAnnotations(), additionalModelTypeAnnotations);
final List<String> sortedCodegenAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
final List<String> sortedAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
Collections.sort(sortedCodegenAdditionalModelTypeAnnotations);
Collections.sort(sortedAdditionalModelTypeAnnotations);
Assert.assertEquals(sortedCodegenAdditionalModelTypeAnnotations, sortedAdditionalModelTypeAnnotations);
}
@Test
@@ -228,12 +234,17 @@ public class AbstractJavaCodegenTest {
codegen.processOpts();
codegen.preprocessOpenAPI(openAPI);
final List<String> additionalModelTypeAnnotations = new ArrayList<String>();
additionalModelTypeAnnotations.add("@Foo");
additionalModelTypeAnnotations.add("@Bar");
Assert.assertEquals(codegen.getAdditionalModelTypeAnnotations(), additionalModelTypeAnnotations);
final List<String> sortedCodegenAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
final List<String> sortedAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
Collections.sort(sortedCodegenAdditionalModelTypeAnnotations);
Collections.sort(sortedAdditionalModelTypeAnnotations);
Assert.assertEquals(sortedCodegenAdditionalModelTypeAnnotations, sortedAdditionalModelTypeAnnotations);
}
@Test
@@ -245,12 +256,17 @@ public class AbstractJavaCodegenTest {
codegen.processOpts();
codegen.preprocessOpenAPI(openAPI);
final List<String> additionalModelTypeAnnotations = new ArrayList<String>();
additionalModelTypeAnnotations.add("@Foo");
additionalModelTypeAnnotations.add("@Bar");
Assert.assertEquals(codegen.getAdditionalModelTypeAnnotations(), additionalModelTypeAnnotations);
final List<String> sortedCodegenAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
final List<String> sortedAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
Collections.sort(sortedCodegenAdditionalModelTypeAnnotations);
Collections.sort(sortedAdditionalModelTypeAnnotations);
Assert.assertEquals(sortedCodegenAdditionalModelTypeAnnotations, sortedAdditionalModelTypeAnnotations);
}
@Test
@@ -268,7 +284,12 @@ public class AbstractJavaCodegenTest {
additionalModelTypeAnnotations.add("@Bar");
additionalModelTypeAnnotations.add("@Foobar");
Assert.assertEquals(codegen.getAdditionalModelTypeAnnotations(), additionalModelTypeAnnotations);
final List<String> sortedCodegenAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
final List<String> sortedAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
Collections.sort(sortedCodegenAdditionalModelTypeAnnotations);
Collections.sort(sortedAdditionalModelTypeAnnotations);
Assert.assertEquals(sortedCodegenAdditionalModelTypeAnnotations, sortedAdditionalModelTypeAnnotations);
}
@Test
@@ -285,7 +306,12 @@ public class AbstractJavaCodegenTest {
additionalModelTypeAnnotations.add("@Foo");
additionalModelTypeAnnotations.add("@Bar");
Assert.assertEquals(codegen.getAdditionalModelTypeAnnotations(), additionalModelTypeAnnotations);
final List<String> sortedCodegenAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
final List<String> sortedAdditionalModelTypeAnnotations = new ArrayList<>(codegen.getAdditionalModelTypeAnnotations());
Collections.sort(sortedCodegenAdditionalModelTypeAnnotations);
Collections.sort(sortedAdditionalModelTypeAnnotations);
Assert.assertEquals(sortedCodegenAdditionalModelTypeAnnotations, sortedAdditionalModelTypeAnnotations);
}
@Test