FieldLinkDefinition refactoring

LukasMolzberger · LukasMolzberger · commit dac78710468b · 2025-01-10T14:24:53.000+01:00
diff --git a/fields/src/test/java/network/aika/fields/manyobjects/OneToManyRelationTest.java b/fields/src/test/java/network/aika/fields/manyobjects/OneToManyRelationTest.java
@@ -15,13 +15,14 @@
 
 public class OneToManyRelationTest {
 
+    protected TypeRegistry registry;
     protected TestTypeOne typeA;
     protected TestTypeMany typeB;
 
 
     @BeforeEach
     public void init() {
-        TypeRegistry registry = new TypeRegistryImpl();
+        registry = new TypeRegistryImpl();
 
         typeA = new TestTypeOne(registry, "A")
                 .setClazz(TestObjectOne.class);
@@ -40,6 +41,7 @@ public void testInitFields() {
                 .in(TEST_RELATION_FROM, fieldA)
                 .in(TEST_RELATION_FROM, fieldB);
 
+        registry.flattenTypeHierarchy();
 
         // Object and Field initialization
 
diff --git a/fields/src/test/java/network/aika/fields/oneobject/FieldInstantiationTest.java b/fields/src/test/java/network/aika/fields/oneobject/FieldInstantiationTest.java
@@ -108,7 +108,7 @@ public void testMultiplication() {
         Obj o = new ObjImpl(type);
 
         o.setFieldValue(a, 5.0);
-        Assertions.assertNull(o.getField(c));
+        Assertions.assertEquals(0.0, o.getField(c).getValue());
 
         o.setFieldValue(b, 5.0);
 
diff --git a/fields/src/test/java/network/aika/fields/oneobject/ObjectInstantiationTest.java b/fields/src/test/java/network/aika/fields/oneobject/ObjectInstantiationTest.java
@@ -14,6 +14,8 @@ public void init() {
 
     @Test
     public void testObjectInstantiation() {
+        registry.flattenTypeHierarchy();
+
         TestObject oa = typeA.instantiate();
 
         Assertions.assertNotNull(oa);
