Skip to content

Commit fe2f129

Browse files
committed
Fix Java code generation tests
1 parent 8166157 commit fe2f129

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaGeneratorTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,11 +947,11 @@ void testGenerateAspectModelWithAbstractEntity() throws IOException {
947947
result.assertClassDeclaration( "AspectWithAbstractEntity", Collections.emptyList(), Collections.emptyList(),
948948
Collections.emptyList(), Collections.emptyList() );
949949
result.assertClassDeclaration( "AbstractTestEntity", Collections.singletonList( Modifier.abstractModifier() ),
950-
Collections.emptyList(), Collections.emptyList(), List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)",
950+
Collections.emptyList(), Collections.emptyList(), List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)",
951951
"@JsonSubTypes({ @JsonSubTypes.Type(value = ExtendingTestEntity.class, name = \"ExtendingTestEntity\") })" ) );
952952
result.assertClassDeclaration( "ExtendingTestEntity", Collections.emptyList(),
953953
Collections.singletonList( "AbstractTestEntity" ), Collections.emptyList(),
954-
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, defaultImpl = ExtendingTestEntity.class)" ) );
954+
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION, defaultImpl = ExtendingTestEntity.class)" ) );
955955
}
956956

957957
@Test
@@ -990,11 +990,11 @@ void testGenerateAspectModelWithCollectionWithAbstractEntity() throws IOExceptio
990990
Collections.emptyList() );
991991
result.assertClassDeclaration( "AbstractTestEntity", Collections.singletonList( Modifier.abstractModifier() ),
992992
Collections.emptyList(), Collections.emptyList(),
993-
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)",
993+
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)",
994994
"@JsonSubTypes({ @JsonSubTypes.Type(value = ExtendingTestEntity.class, name = \"ExtendingTestEntity\") })" ) );
995995
result.assertClassDeclaration( "ExtendingTestEntity", Collections.emptyList(),
996996
Collections.singletonList( "AbstractTestEntity" ), Collections.emptyList(),
997-
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, defaultImpl = ExtendingTestEntity.class)" ) );
997+
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION, defaultImpl = ExtendingTestEntity.class)" ) );
998998
}
999999

10001000
@Test
@@ -1113,13 +1113,13 @@ void testGenerateAspectWithMultipleInheritance() throws IOException {
11131113
final GenerationResult result = TestContext.generateAspectCode().apply( getGenerators( aspect ) );
11141114
result.assertNumberOfFiles( 4 );
11151115
result.assertClassDeclaration( "ParentOfParentEntity", Collections.singletonList( Modifier.abstractModifier() ),
1116-
Collections.emptyList(), Collections.emptyList(), List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)",
1116+
Collections.emptyList(), Collections.emptyList(), List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)",
11171117
"@JsonSubTypes({ @JsonSubTypes.Type(value = ParentTestEntity.class, name = \"ParentTestEntity\"), @JsonSubTypes.Type"
11181118
+ "(value = TestEntity"
11191119
+ ".class, name = \"TestEntity\") })" ) );
11201120
result.assertClassDeclaration( "ParentTestEntity", Collections.singletonList( Modifier.abstractModifier() ),
11211121
Collections.singletonList( "ParentOfParentEntity" ), Collections.emptyList(),
1122-
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME)",
1122+
List.of( "@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)",
11231123
"@JsonSubTypes({ @JsonSubTypes.Type(value = TestEntity.class, name = \"TestEntity\") })" ) );
11241124
}
11251125

0 commit comments

Comments
 (0)