test fixes

Author: sigpwned

src/test/java/tools/jackson/databind/jsontype/SealedTypesWithJsonTypeInfoSimpleClassName4061Test.java

@@ -134,7 +134,7 @@ public void testInnerClass() throws Exception {
   @Test
   public void testMinimalInnerClass() throws Exception {
     String jsonStr =
-        a2q("{'@c':'.JsonTypeInfoSimpleClassName4061WithSealedTypesTest$MinimalInnerSub4061A'}");
+        a2q("{'@c':'.SealedTypesWithJsonTypeInfoSimpleClassName4061Test$MinimalInnerSub4061A'}");
 
     // ser
     assertEquals(jsonStr, MAPPER.writeValueAsString(new MinimalInnerSub4061A()));

src/test/java/tools/jackson/databind/jsontype/SealedTypesWithSubtypesTest.java

@@ -239,7 +239,7 @@ public void testSerialization() throws Exception
         assertEquals("{\"@type\":\"typeB\",\"b\":1}", mapper.writeValueAsString(bean));
 
         // and default name ought to be simple class name; with context
-        assertEquals("{\"@type\":\"TestSubtypesWithSealedTypes$SubD\",\"d\":0}", mapper.writeValueAsString(new SubD()));
+        assertEquals("{\"@type\":\"SealedTypesWithSubtypesTest$SubD\",\"d\":0}", mapper.writeValueAsString(new SubD()));
     }
 
     @Test
@@ -249,7 +249,7 @@ public void testDeserializationNonNamed() throws Exception
                 // .registerSubtypes(SubC.class)
                 .build();
         // default name should be unqualified class name
-        SuperType bean = mapper.readValue("{\"@type\":\"TestSubtypesWithSealedTypes$SubC\", \"c\":1}", SuperType.class);
+        SuperType bean = mapper.readValue("{\"@type\":\"SealedTypesWithSubtypesTest$SubC\", \"c\":1}", SuperType.class);
         assertSame(SubC.class, bean.getClass());
         assertEquals(1, ((SubC) bean).c);
     }
@@ -280,21 +280,21 @@ public void testEmptyBean() throws Exception
                 .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, true)
                 .build();
         String json = mapper.writeValueAsString(new EmptyBean());
-        assertEquals("{\"@type\":\"TestSubtypesWithSealedTypes$EmptyBean\"}", json);
+        assertEquals("{\"@type\":\"SealedTypesWithSubtypesTest$EmptyBean\"}", json);
 
         mapper = jsonMapperBuilder()
                 .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
                 .build();
         json = mapper.writeValueAsString(new EmptyBean());
-        assertEquals("{\"@type\":\"TestSubtypesWithSealedTypes$EmptyBean\"}", json);
+        assertEquals("{\"@type\":\"SealedTypesWithSubtypesTest$EmptyBean\"}", json);
 
         // and then with defaults
         mapper = jsonMapperBuilder()
             .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
             .activateDefaultTyping(NoCheckSubTypeValidator.instance, DefaultTyping.NON_FINAL)
             .build();
         json = mapper.writeValueAsString(new EmptyNonFinal());
-        assertEquals("[\"tools.jackson.databind.jsontype.TestSubtypesWithSealedTypes$EmptyNonFinal\",{}]", json);
+        assertEquals("[\"tools.jackson.databind.jsontype.SealedTypesWithSubtypesTest$EmptyNonFinal\",{}]", json);
     }
 
     @Test

src/test/java/tools/jackson/databind/jsontype/SealedTypesWithTypedDeserializationTest.java

@@ -177,7 +177,7 @@ public void testTypeAsWrapper() throws Exception
         ObjectMapper m = jsonMapperBuilder()
                 .addMixIn(Animal.class, TypeWithWrapper.class)
                 .build();
-        String JSON = "{\".TestTypedDeserializationWithSealedTypes$Dog\" : "
+        String JSON = "{\".SealedTypesWithTypedDeserializationTest$Dog\" : "
             +asJSONObjectValueString(m, "name", "Scooby", "boneCount", "6")+" }";
         Animal a = m.readValue(JSON, Animal.class);
         assertTrue(a instanceof Animal);

src/test/java/tools/jackson/databind/jsontype/SealedTypesWithTypedSerializationTest.java

@@ -115,7 +115,7 @@ public void testTypeAsWrapper() throws Exception
         // should get a wrapper; keyed by minimal class name ("Cat" here)
         assertEquals(1, result.size());
         // minimal class name is prefixed by dot, and for inner classes it's bit longer
-        Map<?,?> cat = (Map<?,?>) result.get(".TestTypedSerializationWithSealedTypes$Cat");
+        Map<?,?> cat = (Map<?,?>) result.get(".SealedTypesWithTypedSerializationTest$Cat");
         assertNotNull(cat);
         assertEquals(2, cat.size());
         assertEquals("Venla", cat.get("name"));