Fix a number of flaky tests

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationConfig;
@@ -113,7 +114,8 @@ public JaxbParserFactory() {
 
     }
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper()
+                        .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
 
     public Jackson2Parser(Settings settings, TypeProcessor typeProcessor) {
         this(settings, typeProcessor, Collections.emptyList(), false);

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ClassesTest.java

@@ -302,8 +302,8 @@ public void testUnsortedConstructor() {
         settings.sortDeclarations = false;
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(FooBar.class));
         String unsortedPropertyAssignments = "" +
-                "        this.foo = data.foo;" + settings.newline +
-                "        this.bar = data.bar;";
+                "        this.bar = data.bar;" + settings.newline +
+                "        this.foo = data.foo;";
         Assert.assertTrue(output.contains(unsortedPropertyAssignments));
     }
 

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java

@@ -58,7 +58,7 @@ public void test() {
         final BeanModel beanModel = model.getBeans().get(0);
         Assert.assertEquals("DummyBean", beanModel.getOrigin().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
-        Assert.assertEquals("firstProperty", beanModel.getProperties().get(0).getName());
+        Assert.assertEquals("booleanProperty", beanModel.getProperties().get(0).getName());
     }
 
     @Test

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JavadocTest.java

@@ -26,9 +26,9 @@ public void testJavadoc() {
             Assert.assertEquals("Documentation for ClassWithJavadoc. First line.", bean.getComments().get(0));
             Assert.assertEquals("Second line.", bean.getComments().get(1));
             final PropertyModel property1 = bean.getProperties().get(0);
-            Assert.assertEquals("Documentation for documentedField.", property1.getComments().get(0));
+            Assert.assertEquals("Documentation for documentedEnumField.", property1.getComments().get(0));
             final PropertyModel property2 = bean.getProperties().get(1);
-            Assert.assertEquals("Documentation for documentedEnumField.", property2.getComments().get(0));
+            Assert.assertEquals("Documentation for documentedField.", property2.getComments().get(0));
             final EnumModel enumModel = model.getEnums().get(0);
             Assert.assertEquals("Documentation for DummyEnum.", enumModel.getComments().get(0));
         }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/OptionalTest.java

@@ -19,9 +19,9 @@ public void test() {
         final String output = new TypeScriptGenerator(TestUtils.settings()).generateTypeScript(Input.from(Person.class));
         Assert.assertEquals(
                 "interface Person {\n" +
-                "    name: string;\n" +
-                "    email?: string;\n" +
                 "    age?: number;\n" +
+                "    email?: string;\n" +
+                "    name: string;\n" +
                 "}",
                 output.trim());
     }
@@ -53,9 +53,9 @@ public void testJackson2OptionalSupport() throws Exception {
     public void testDeclarationQuestionMark() {
         testDeclaration(OptionalPropertiesDeclaration.questionMark,
                 "interface Person {\n" +
-                "    name: string;\n" +
-                "    email?: string;\n" +
                 "    age?: number;\n" +
+                "    email?: string;\n" +
+                "    name: string;\n" +
                 "}"
         );
     }
@@ -64,9 +64,9 @@ public void testDeclarationQuestionMark() {
     public void testDeclarationNullableType() {
         testDeclaration(OptionalPropertiesDeclaration.nullableType,
                 "interface Person {\n" +
-                "    name: string;\n" +
-                "    email: string | null;\n" +
                 "    age: number | null;\n" +
+                "    email: string | null;\n" +
+                "    name: string;\n" +
                 "}"
         );
     }
@@ -75,9 +75,9 @@ public void testDeclarationNullableType() {
     public void testDeclarationQuestionMarkAndNullableType() {
         testDeclaration(OptionalPropertiesDeclaration.questionMarkAndNullableType,
                 "interface Person {\n" +
-                "    name: string;\n" +
-                "    email?: string | null;\n" +
                 "    age?: number | null;\n" +
+                "    email?: string | null;\n" +
+                "    name: string;\n" +
                 "}"
         );
     }
@@ -86,9 +86,9 @@ public void testDeclarationQuestionMarkAndNullableType() {
     public void testDeclarationNullableAndUndefinableType() {
         testDeclaration(OptionalPropertiesDeclaration.nullableAndUndefinableType,
                 "interface Person {\n" +
-                        "    name: string;\n" +
-                        "    email: string | null | undefined;\n" +
                         "    age: number | null | undefined;\n" +
+                        "    email: string | null | undefined;\n" +
+                        "    name: string;\n" +
                         "}"
         );
     }
@@ -97,9 +97,9 @@ public void testDeclarationNullableAndUndefinableType() {
     public void testDeclarationUndefinableType() {
         testDeclaration(OptionalPropertiesDeclaration.undefinableType,
                 "interface Person {\n" +
-                        "    name: string;\n" +
-                        "    email: string | undefined;\n" +
                         "    age: number | undefined;\n" +
+                        "    email: string | undefined;\n" +
+                        "    name: string;\n" +
                         "}"
         );
     }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ReadOnlyWriteOnlyTest.java

@@ -75,19 +75,19 @@ public void test() {
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(ReadOnlyWriteOnlyUser.class));
         final String expected = "\n"
                 + "interface ReadOnlyWriteOnlyUser {\n"
-                + "    name: string;\n"
                 + "    /**\n"
                 + "     * @readonly\n"
                 + "     */\n"
                 + "    id1: string;\n"
                 + "    /**\n"
-                + "     * @writeonly\n"
-                + "     */\n"
-                + "    password1: string;\n"
-                + "    /**\n"
                 + "     * @readonly\n"
                 + "     */\n"
                 + "    id2: string;\n"
+                + "    name: string;\n"
+                + "    /**\n"
+                + "     * @writeonly\n"
+                + "     */\n"
+                + "    password1: string;\n"
                 + "    /**\n"
                 + "     * @writeonly\n"
                 + "     */\n"

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java

@@ -206,8 +206,8 @@ public void testTaggedUnions() {
                 "\n" +
                 "interface Rectangle extends Shape {\n" +
                 "    kind: 'rectangle';\n" +
-                "    width: number;\n" +
                 "    height: number;\n" +
+                "    width: number;\n" +
                 "}\n" +
                 "\n" +
                 "interface Circle extends Shape {\n" +
@@ -238,8 +238,8 @@ public void testTaggedUnionsWithInterfaces() {
                 "\n" +
                 "interface CRectangle2 extends IQuadrilateral2 {\n" +
                 "    kind: 'rectangle';\n" +
-                "    width: number;\n" +
                 "    height: number;\n" +
+                "    width: number;\n" +
                 "}\n" +
                 "\n" +
                 "interface CCircle2 extends IShape2 {\n" +
@@ -315,8 +315,8 @@ public void testTaggedUnionsDisabled() {
                 "\n" +
                 "interface Rectangle extends Shape {\n" +
                 "    kind: 'rectangle';\n" +
-                "    width: number;\n" +
                 "    height: number;\n" +
+                "    width: number;\n" +
                 "}\n" +
                 "\n" +
                 "interface Circle extends Shape {\n" +
@@ -518,8 +518,8 @@ public void testTaggedUnionsWithExistingProperty() {
                 "\n" +
                 "interface Rectangle2 extends Shape2 {\n" +
                 "    kind: 'rectangle';\n" +
-                "    width: number;\n" +
                 "    height: number;\n" +
+                "    width: number;\n" +
                 "}\n" +
                 "\n" +
                 "interface Circle2 extends Shape2 {\n" +
@@ -553,8 +553,8 @@ public void testTaggedUnionDisabledUsingAnnotation() {
                 "}\n" +
                 "\n" +
                 "interface Rectangle2 extends Shape2 {\n" +
-                "    width: number;\n" +
                 "    height: number;\n" +
+                "    width: number;\n" +
                 "}\n" +
                 "\n" +
                 "interface Circle2 extends Shape2 {\n" +
@@ -647,13 +647,9 @@ public void testIntermediateUnions() {
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(RecordUsage.class));
         final String expected = ""
                 + "interface RecordUsage {\n"
-                + "    records: RecordUnion[];\n"
                 + "    formRecords: FormRecordUnion[];\n"
                 + "    listRecords: ListRecordUnion[];\n"
-                + "}\n"
-                + "\n"
-                + "interface Record {\n"
-                + "    '@type': 'order.form' | 'product.form' | 'order.list' | 'product.list';\n"
+                + "    records: RecordUnion[];\n"
                 + "}\n"
                 + "\n"
                 + "interface FormRecord extends Record {\n"
@@ -664,6 +660,10 @@ public void testIntermediateUnions() {
                 + "    '@type': 'order.list' | 'product.list';\n"
                 + "}\n"
                 + "\n"
+                + "interface Record {\n"
+                + "    '@type': 'order.form' | 'product.form' | 'order.list' | 'product.list';\n"
+                + "}\n"
+                + "\n"
                 + "interface OrderFormRecord extends FormRecord {\n"
                 + "    '@type': 'order.form';\n"
                 + "}\n"
@@ -680,11 +680,11 @@ public void testIntermediateUnions() {
                 + "    '@type': 'product.list';\n"
                 + "}\n"
                 + "\n"
-                + "type RecordUnion = FormRecord | ListRecord;\n"
-                + "\n"
                 + "type FormRecordUnion = OrderFormRecord | ProductFormRecord;\n"
                 + "\n"
                 + "type ListRecordUnion = OrderListRecord | ProductListRecord;\n"
+                + "\n"
+                + "type RecordUnion = FormRecord | ListRecord;\n"
                 + "";
         Assert.assertEquals(expected.trim(), output.trim());
     }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/parser/Jackson2ParserPropertiesTest.java

@@ -76,12 +76,12 @@ public static class User4 {
 
     @Test
     public void testPropertyOrder() {
-        Assert.assertEquals(Arrays.asList("password1", "id2", "name", "id1", "password2"), getProperties(UserOrdered.class));
+        Assert.assertEquals(Arrays.asList("password1", "id2", "id1", "name", "password2"), getProperties(UserOrdered.class));
         Assert.assertEquals(Arrays.asList("id1", "id2", "name", "password1", "password2"), getProperties(UserAlphabetic.class));
         Assert.assertEquals(Arrays.asList("password2", "password1", "id2", "id1", "name"), getProperties(UserIndexed.class));
-        Assert.assertEquals(Arrays.asList("name", "id1", "id2", "password1", "password2"), getProperties(User1.class));
-        Assert.assertEquals(Arrays.asList("name", "id1", "id2", "password1", "password2"), getProperties(User2.class));
-        Assert.assertEquals(Arrays.asList("name", "password1", "password2", "id1", "id2"), getProperties(User3.class));
+        Assert.assertEquals(Arrays.asList("id1", "id2", "name", "password1", "password2"), getProperties(User1.class));
+        Assert.assertEquals(Arrays.asList("id1", "id2", "name", "password1", "password2"), getProperties(User2.class));
+        Assert.assertEquals(Arrays.asList("id1", "id2", "name", "password1", "password2"), getProperties(User3.class));
         Assert.assertEquals(Arrays.asList("password1", "id1", "password2", "id2", "name"), getProperties(User4.class));
     }