Mark test classes that should not be deserializable as abstract.

vojtechhabarta · Jun 29, 2020 · dcba663 · dcba663
1 parent eb5ad7a
commit dcba663
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/...or-core/src/test/java/cz/habarta/typescript/generator/Jackson2DeserializableRootType.java b/...or-core/src/test/java/cz/habarta/typescript/generator/Jackson2DeserializableRootType.java
@@ -1,7 +1,6 @@
 
 package cz.habarta.typescript.generator;
 
-import static org.junit.Assert.assertSame;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -24,8 +23,8 @@ public void testHowJacksonDeserializes() throws JsonProcessingException {
                         .readValue("{\"type\": \"subType\"}",
                                         NonAbstractRoot.class);
 
-        assertSame(NonAbstractRoot.class, nar.getClass());
-        assertSame(NonAbstractRootSub.class, nars.getClass());
+        Assert.assertSame(NonAbstractRoot.class, nar.getClass());
+        Assert.assertSame(NonAbstractRootSub.class, nars.getClass());
     }
 
     @Test

diff --git a/...generator-core/src/test/java/cz/habarta/typescript/generator/JsonDeserializationTest.java b/...generator-core/src/test/java/cz/habarta/typescript/generator/JsonDeserializationTest.java
@@ -148,7 +148,7 @@ public static class Order {
         @JsonSubTypes.Type(Rectangle.class),
         @JsonSubTypes.Type(Circle.class),
     })
-    private static class Shape {
+    private abstract static class Shape {
         public ShapeMetadata metadata;
     }
 

diff --git a/...script-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java b/...script-generator-core/src/test/java/cz/habarta/typescript/generator/TaggedUnionsTest.java
@@ -23,7 +23,7 @@ private static class Geometry {
         @JsonSubTypes.Type(Rectangle.class),
         @JsonSubTypes.Type(Circle.class),
     })
-    private static class Shape {
+    private abstract static class Shape {
     }
 
     @JsonTypeName("square")
@@ -127,7 +127,7 @@ private static interface DiamondC extends DiamondB1, DiamondB2 {
         @JsonSubTypes.Type(DieselCar.class),
         @JsonSubTypes.Type(ElectricCar.class),
     })
-    private static class Car {
+    private abstract static class Car {
         public String name;
     }
 

diff --git a/...a/cz/habarta/typescript/generator/ext/OnePossiblePropertyValueAssigningExtensionTest.java b/...a/cz/habarta/typescript/generator/ext/OnePossiblePropertyValueAssigningExtensionTest.java
@@ -18,7 +18,7 @@ public class OnePossiblePropertyValueAssigningExtensionTest {
     private static final String BASE_PATH = "/ext/OnePossiblePropertyValueAssigningExtensionTest-";
 
     @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "discriminator")
-    static class BaseClass {
+    abstract static class BaseClass {
 
         @JsonProperty
         private Long field1;
@@ -87,4 +87,4 @@ private String readResource(String suffix) {
         return Utils.readString(getClass().getResourceAsStream(BASE_PATH + suffix), "\n");
     }
 
-}
+}