diff --git a/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerErrorHandlingTest.java b/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerErrorHandlingTest.java index 3abc7a0b..c79d78a4 100644 --- a/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerErrorHandlingTest.java +++ b/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerErrorHandlingTest.java @@ -44,6 +44,7 @@ public class RuneJsonSerializerErrorHandlingTest { public static final String TEST_TYPE = "rune-serializer-error-handling-test"; private ObjectMapper objectMapper; + public static final String NAMESPACE_PREFIX = TEST_MODEL_NAME + ".test.failing."; private static CodeGeneratorTestHelper helper; @@ -142,7 +143,7 @@ private static Path getGroupPath(String groupName) { private Class getRootRosettaModelObjectClass(Path groupPath, String fileName) { Path rosetta = getFile(groupPath, fileName); String groupName = groupPath.getFileName().toString(); - return generateCompileAndGetRootDataType(groupName, Collections.singletonList(rosetta), helper, new DynamicCompiledClassLoader()); + return generateCompileAndGetRootDataType(NAMESPACE_PREFIX, groupName, Collections.singletonList(rosetta), helper, new DynamicCompiledClassLoader()); } private T fromJson(String runeJson, Class type) { diff --git a/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerRoundTripTest.java b/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerRoundTripTest.java index 3d755dc1..8dda4015 100644 --- a/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerRoundTripTest.java +++ b/serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerRoundTripTest.java @@ -42,6 +42,7 @@ public class RuneJsonSerializerRoundTripTest { public static final String TEST_TYPE = "rune-serializer-round-trip-test"; private static DynamicCompiledClassLoader dynamicCompiledClassLoader; + public static final String NAMESPACE_PREFIX = TEST_MODEL_NAME + ".test.passing."; private static CodeGeneratorTestHelper helper; private ObjectMapper objectMapper; @@ -72,7 +73,7 @@ public static Stream testCases() { .flatMap(groupPath -> { List rosettas = listFiles(groupPath, ".rosetta"); String groupName = groupPath.getFileName().toString(); - Class rootDataType = generateCompileAndGetRootDataType(groupName, rosettas, helper, dynamicCompiledClassLoader); + Class rootDataType = generateCompileAndGetRootDataType(NAMESPACE_PREFIX, groupName, rosettas, helper, dynamicCompiledClassLoader); return listFiles(groupPath, ".json").stream() .map(jsonPath -> Arguments.of( diff --git a/serialization/src/test/java/org/finos/rune/serialization/RuneSerializerTestHelper.java b/serialization/src/test/java/org/finos/rune/serialization/RuneSerializerTestHelper.java index 9f9ca7f0..e0679ea2 100644 --- a/serialization/src/test/java/org/finos/rune/serialization/RuneSerializerTestHelper.java +++ b/serialization/src/test/java/org/finos/rune/serialization/RuneSerializerTestHelper.java @@ -47,18 +47,18 @@ import java.util.stream.Stream; public class RuneSerializerTestHelper { - public static final String TEST_MODEL_NAME = "serialization"; @SuppressWarnings("unchecked") - public static Class generateCompileAndGetRootDataType(String groupName, + public static Class generateCompileAndGetRootDataType(String namespacePrefix, String groupName, List rosettaPaths, - CodeGeneratorTestHelper helper, DynamicCompiledClassLoader dynamicCompiledClassLoader) { + CodeGeneratorTestHelper helper, + DynamicCompiledClassLoader dynamicCompiledClassLoader) { String[] rosettaFileContents = rosettaPaths.stream().map(RuneSerializerTestHelper::readAsString).toArray(String[]::new); HashMap generatedCode = helper.generateCode(rosettaFileContents); Map> compiledCode = helper.compileToClasses(generatedCode); dynamicCompiledClassLoader.setCompiledCode(compiledCode); - Class aClass = compiledCode.get(TEST_MODEL_NAME + ".test." + groupName + ".Root"); + Class aClass = compiledCode.get(namespacePrefix + groupName + ".Root"); return (Class) aClass; } diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/cardinality.rosetta b/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/cardinality.rosetta index 8b8378b0..c9d9f6f4 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/cardinality.rosetta +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/cardinality.rosetta @@ -1,4 +1,4 @@ -namespace cardinality +namespace serialization.test.failing.cardinality annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/too-many-elements.json b/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/too-many-elements.json index b2919192..c213443e 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/too-many-elements.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/too-many-elements.json @@ -1,6 +1,6 @@ { - "@model": "test.cardinality", - "@type": "test.cardinality.Root", + "@model": "serialization", + "@type": "serialization.test.failing.cardinality.Root", "@version": "0.0.0", "stringList": ["foo", "bar", "baz"] } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-attribute-ref.json b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-attribute-ref.json similarity index 76% rename from serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-attribute-ref.json rename to serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-attribute-ref.json index 4cfa7b38..d65ec629 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-attribute-ref.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-attribute-ref.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metakey.Root", + "@type" : "serialization.test.failing.metakey.Root", "@version" : "0.0.0", "attributeRef" : { "dateReference" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-node-ref.json b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-node-ref.json similarity index 75% rename from serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-node-ref.json rename to serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-node-ref.json index 724faa75..892f209c 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-node-ref.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-node-ref.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metakey.Root", + "@type" : "serialization.test.failing.metakey.Root", "@version" : "0.0.0", "nodeRef" : { "aReference" : { diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/meta-key.rosetta b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/meta-key.rosetta new file mode 100644 index 00000000..34de6d85 --- /dev/null +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/metakey/meta-key.rosetta @@ -0,0 +1,23 @@ +namespace serialization.test.failing.metakey + +annotation rootType: <"Mark a type as a root of the rosetta model"> + +type A: + [metadata key] + fieldA string (1..1) + +type NodeRef: + typeA A (0..1) + aReference A (0..1) + [metadata reference] + +type AttributeRef: + dateField date (0..1) + [metadata id] + dateReference date (0..1) + [metadata reference] + +type Root: + [rootType] + nodeRef NodeRef (0..1) + attributeRef AttributeRef (0..1) diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/dangling-address.json b/serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/dangling-address.json similarity index 65% rename from serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/dangling-address.json rename to serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/dangling-address.json index c86a090a..b1e0f790 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/dangling-address.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/dangling-address.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metalocation.Root", + "@type" : "serialization.test.failing.metalocation.Root", "@version" : "0.0.0", "bAddress" : { "@ref:scoped" : "someLocation" diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/meta-location.rosetta b/serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/meta-location.rosetta new file mode 100644 index 00000000..d0923151 --- /dev/null +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/meta-location.rosetta @@ -0,0 +1,16 @@ +namespace serialization.failing.metalocation + +annotation rootType: <"Mark a type as a root of the rosetta model"> + +type A: + b B (1..1) + [metadata location] + +type B: + fieldB string (1..1) + +type Root: + [rootType] + typeA A (0..1) + bAddress B (0..1) + [metadata address "pointsTo"=A->b] diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-fraction-too-large.json b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-fraction-too-large.json index 78a65eb5..d4231dfb 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-fraction-too-large.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-fraction-too-large.json @@ -1,6 +1,6 @@ { - "@model": "test.parameterised", - "@type": "test.parameterised.Root", + "@model": "serialization", + "@type": "serialization.test.failing.parameterised.Root", "@version": "0.0.0", "parameterisedNumber": 1.23456789 } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-too-large.json b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-too-large.json index 01ef2321..e2eba011 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-too-large.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-too-large.json @@ -1,6 +1,6 @@ { - "@model": "test.parameterised", - "@type": "test.parameterised.Root", + "@model": "serialization", + "@type": "serialization.test.failing.parameterised.Root", "@version": "0.0.0", "parameterisedNumber": 123456789 } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/parameterised.rosetta b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/parameterised.rosetta index eac8a252..82de581c 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/parameterised.rosetta +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/parameterised.rosetta @@ -1,4 +1,4 @@ -namespace parameterised +namespace serialization.test.failing.parameterised annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-illegal-pattern.json b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-illegal-pattern.json index 26b4020e..e19171ea 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-illegal-pattern.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-illegal-pattern.json @@ -1,6 +1,6 @@ { - "@model": "test.parameterised", - "@type": "test.parameterised.Root", + "@model": "serialization", + "@type": "serialization.test.failing.parameterised.Root", "@version": "0.0.0", "parameterisedString": "$$" } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-too-large.json b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-too-large.json index c432c53e..6f07f90e 100644 --- a/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-too-large.json +++ b/serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-too-large.json @@ -1,6 +1,6 @@ { - "@model": "test.parameterised", - "@type": "test.parameterised.Root", + "@model": "serialization", + "@type": "serialization.test.failing.parameterised.Root", "@version": "0.0.0", "parameterisedString": "abcdefg" } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-list.json b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-list.json index a209b36d..2be46116 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-list.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-list.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.basic.Root", + "@type" : "serialization.test.passing.basic.Root", "@version" : "0.0.0", "basicList" : { "booleanTypes" : [ true, false, true ], diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-single.json b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-single.json index 8edd3fe6..135a0c30 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-single.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-single.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.basic.Root", + "@type" : "serialization.test.passing.basic.Root", "@version" : "0.0.0", "basicSingle" : { "booleanType" : true, diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic.rosetta index ce1c47c9..d081b0d4 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.basic +namespace serialization.test.passing.basic annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-basic.json b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-basic.json index 629720b4..eaa58de6 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-basic.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-basic.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.choicetype.Root", + "@type" : "serialization.test.passing.choicetype.Root", "@version" : "0.0.0", "choiceBasic" : { "string" : "foo" diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-data.json b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-data.json index 63c32f17..07294369 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-data.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-data.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.choicetype.Root", + "@type" : "serialization.test.passing.choicetype.Root", "@version" : "0.0.0", "choiceData" : { "A" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-1.json b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-1.json index 9447c2f7..8fdb465f 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-1.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-1.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.choicetype.Root", + "@type" : "serialization.test.passing.choicetype.Root", "@version" : "0.0.0", "choiceMixed" : { "B" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-2.json b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-2.json index 972ed019..106f3f65 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-2.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-2.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.choicetype.Root", + "@type" : "serialization.test.passing.choicetype.Root", "@version" : "0.0.0", "choiceMixed" : { "string" : "foo" diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice.rosetta index 6c3ceb81..75f62393 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.choicetype +namespace serialization.test.passing.choicetype annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/data/data-types.json b/serialization/src/test/resources/rune-serializer-round-trip-test/data/data-types.json index 2885f02c..6e4c2f89 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/data/data-types.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/data/data-types.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.data.Root", + "@type" : "serialization.test.passing.data.Root", "@version" : "0.0.0", "a" : { "b" : [ { }, { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/data/data.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/data/data.rosetta index 5dbdac8a..45ed4fe6 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/data/data.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/data/data.rosetta @@ -1,5 +1,4 @@ -namespace serialization.test.data - +namespace serialization.test.passing.data annotation rootType: <"Mark a type as a root of the rosetta model"> type A: diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-list.json b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-list.json index 4138fccc..7dee7f33 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-list.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-list.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.enumtypes.Root", + "@type" : "serialization.test.passing.enumtypes.Root", "@version" : "0.0.0", "enumList" : { "enumType" : [ "A", "B", "C", "B" ] diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-single.json b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-single.json index 62c4da7f..159b130e 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-single.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-single.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.enumtypes.Root", + "@type" : "serialization.test.passing.enumtypes.Root", "@version" : "0.0.0", "enumSingle" : { "enumType" : "A" diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum.rosetta index d6e35fc9..a99268fb 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.enumtypes +namespace serialization.test.passing.enumtypes annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/base-type.json b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/base-type.json index 1cf7cf1f..c853a56b 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/base-type.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/base-type.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.extension.Root", + "@type" : "serialization.test.passing.extension.Root", "@version" : "0.0.0", "typeA" : { "fieldA" : "foo" diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-concrete.json b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-concrete.json index bc84b3b4..53ebf4e4 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-concrete.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-concrete.json @@ -1,9 +1,10 @@ { "@model" : "serialization", - "@type" : "serialization.test.extension.Root", + "@type" : "serialization.test.passing.extension.Root", "@version" : "0.0.0", "typeB" : { + "fieldA" : "bar", "fieldB" : "foo", - "@type" : "serialization.test.extension.B" + "@type" : "serialization.test.passing.extension.B" } } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-polymorphic.json b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-polymorphic.json index 9a26157d..76971910 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-polymorphic.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-polymorphic.json @@ -1,10 +1,10 @@ { "@model" : "serialization", - "@type" : "serialization.test.extension.Root", + "@type" : "serialization.test.passing.extension.Root", "@version" : "0.0.0", "typeA" : { "fieldA" : "bar", "fieldB" : "foo", - "@type" : "serialization.test.extension.B" + "@type" : "serialization.test.passing.extension.B" } } \ No newline at end of file diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extension.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extension.rosetta index 17b875b5..18b90d4a 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extension.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/extension/extension.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.extension +namespace serialization.test.passing.extension annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/attribute-ref.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/attribute-ref.json index 9a53ad09..ed60a8ca 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/attribute-ref.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/attribute-ref.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metakey.Root", + "@type" : "serialization.test.passing.metakey.Root", "@version" : "0.0.0", "attributeRef" : { "dateField" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/meta-key.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/meta-key.rosetta index b2a223f8..adfe3d42 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/meta-key.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/meta-key.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.metakey +namespace serialization.test.passing.metakey annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/node-ref.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/node-ref.json index 7b7fcd63..372cde11 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/node-ref.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metakey/node-ref.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metakey.Root", + "@type" : "serialization.test.passing.metakey.Root", "@version" : "0.0.0", "nodeRef" : { "typeA" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/address.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/address.json index a0de0b86..2185c2b7 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/address.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/address.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metalocation.Root", + "@type" : "serialization.test.passing.metalocation.Root", "@version" : "0.0.0", "typeA" : { "b" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/meta-location.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/meta-location.rosetta index 323d199e..d05ea423 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/meta-location.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/meta-location.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.metalocation +namespace serialization.test.passing.metalocation annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-list.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-list.json index 0ae28a02..d313d147 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-list.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-list.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metascheme.Root", + "@type" : "serialization.test.passing.metascheme.Root", "@version" : "0.0.0", "enumTypeList" : [ { "@data" : "A", diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-single.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-single.json index 83ffb1cb..93631d2d 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-single.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-single.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metascheme.Root", + "@type" : "serialization.test.passing.metascheme.Root", "@version" : "0.0.0", "enumType" : { "@data" : "A", diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/meta-scheme.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/meta-scheme.rosetta index 18728dfe..bb0d0c49 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/meta-scheme.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/meta-scheme.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.metascheme +namespace serialization.test.passing.metascheme annotation rootType: <"Mark a type as a root of the rosetta model"> diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-list.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-list.json index 63af4247..d150b413 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-list.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-list.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metascheme.Root", + "@type" : "serialization.test.passing.metascheme.Root", "@version" : "0.0.0", "typeAList" : [ { "fieldA" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-single.json b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-single.json index 64c45ea1..23367e39 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-single.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-single.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.metascheme.Root", + "@type" : "serialization.test.passing.metascheme.Root", "@version" : "0.0.0", "typeA" : { "fieldA" : { diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-list.json b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-list.json index 195be6ff..6ecf4029 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-list.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-list.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.record.Root", + "@type" : "serialization.test.passing.record.Root", "@version" : "0.0.0", "recordList" : { "dateType" : [ "2024-12-10", "2024-11-10", "2024-10-20" ], diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-single.json b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-single.json index d348ba57..afee30d9 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-single.json +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record-types-single.json @@ -1,6 +1,6 @@ { "@model" : "serialization", - "@type" : "serialization.test.record.Root", + "@type" : "serialization.test.passing.record.Root", "@version" : "0.0.0", "recordSingle" : { "dateType" : "2024-12-10", diff --git a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record.rosetta b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record.rosetta index f3c437f4..2f6eb858 100644 --- a/serialization/src/test/resources/rune-serializer-round-trip-test/record/record.rosetta +++ b/serialization/src/test/resources/rune-serializer-round-trip-test/record/record.rosetta @@ -1,4 +1,4 @@ -namespace serialization.test.record +namespace serialization.test.passing.record annotation rootType: <"Mark a type as a root of the rosetta model">