OP_1.1.0, test apache#4 completed, spy removed, MyOptionsMethodTracker implemented

gmarseglia · gmarseglia · commit 3682517d45f2 · 2025-02-03T19:30:14.000+01:00
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsConfigurer.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsConfigurer.java
@@ -5,10 +5,9 @@
 import org.apache.openjpa.lib.util.MyOptionsTest.PropertyState;
 import org.apache.openjpa.lib.util.MyOptionsTest.TestState;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
-import static org.mockito.Mockito.spy;
-
 public class MyOptionsConfigurer {
 
     public static final String PRIMITIVE_VALUE = "1";
@@ -100,8 +99,8 @@ private void createObj() {
         Class deepestClass = getDeepestClass();
         DeepestInterface deepest;
         try {
-            deepest = spy((DeepestInterface) deepestClass.newInstance());
-        } catch (InstantiationException | IllegalAccessException e) {
+            deepest = (DeepestInterface) deepestClass.getConstructor(boolean.class).newInstance(false);
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
 
@@ -118,16 +117,19 @@ private void createObj() {
         if (intermediateClass == null)
             throw new IllegalStateException("#TODO: not implemented combination of B1, B2, B3, B4");
 
+        IntermediateInterface top;
+        IntermediateInterface middle;
         try {
-            IntermediateInterface top = spy((IntermediateInterface) intermediateClass.newInstance());
-            IntermediateInterface middle = spy((IntermediateInterface) intermediateClass.newInstance());
+            top = (IntermediateInterface) intermediateClass.getConstructor(boolean.class).newInstance(false);
+            middle = (IntermediateInterface) intermediateClass.getConstructor(boolean.class).newInstance(false);
             testState.obj = top;
             if (testState.c1 == C1_intermediate_instances_are_null.NON_NULL_INTERMEDIATE_INSTANCES) {
                 top.intermediateSetDeeper(middle);
                 if (testState.c2 == C2_last_instance_is_null.NON_NULL_LAST_INSTANCE)
-                    top.intermediateSetDeepest(deepest);
+                    middle.intermediateSetDeepest(deepest);
             }
-        } catch (InstantiationException | IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException |
+                 InvocationTargetException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsMethodTracker.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsMethodTracker.java
@@ -0,0 +1,16 @@
+package org.apache.openjpa.lib.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyOptionsMethodTracker {
+    public static List<String> methodCallList = new ArrayList<>();
+
+    public static void addMethod(String newString) {
+        methodCallList.add(newString);
+    }
+
+    public static boolean verify(String methodName) {
+        return methodCallList.contains(methodName);
+    }
+}
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsObjects.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsObjects.java
@@ -1,13 +1,14 @@
 package org.apache.openjpa.lib.util;
 
+import static org.apache.openjpa.lib.util.MyOptionsMethodTracker.addMethod;
+
 public class MyOptionsObjects {
 
     public interface AnyDeepInterface {
         DeepestInterface intermediateGetDeepest();
     }
 
     public interface DeepestInterface {
-
         int deepestPrimitiveAttribute(String id);
 
         String deepestStringAttribute(String id);
@@ -20,8 +21,6 @@ public interface IntermediateInterface {
 
         void intermediateSetDeeper(IntermediateInterface lower);
 
-        DeepestInterface intermediateGetDeepest();
-
         void intermediateSetDeepest(DeepestInterface deepest);
     }
 
@@ -30,21 +29,31 @@ public static class ObjectWithYYNNType1 implements IntermediateInterface, AnyDee
         private DeepestObjectType1 deepest;
 
         private ObjectWithYYNNType1() {
+            addMethod("new IntermediateInterface");
+        }
+
+        public ObjectWithYYNNType1(boolean track) {
+            if (track)
+                addMethod("new IntermediateInterface");
         }
 
         public ObjectWithYYNNType1 getDeeper() {
+            addMethod("getDeeper");
             return deeper;
         }
 
         public void setDeeper(ObjectWithYYNNType1 deeper) {
+            addMethod("setDeeper");
             this.deeper = deeper;
         }
 
         public DeepestObjectType1 getDeepest() {
+            addMethod("getDeepest");
             return deepest;
         }
 
         public void setDeepest(DeepestObjectType1 deepest) {
+            addMethod("setDeepest");
             this.deepest = deepest;
         }
 
@@ -65,7 +74,7 @@ public DeepestInterface intermediateGetDeepest() {
 
         @Override
         public void intermediateSetDeepest(DeepestInterface deepest) {
-            this.deeper.setDeepest((DeepestObjectType1) deepest);
+            this.deepest = (DeepestObjectType1) deepest;
         }
     }
 
@@ -74,21 +83,31 @@ public static class ObjectWithYYNYType1 implements IntermediateInterface, AnyDee
         private DeepestObjectType1 deepest;
 
         public ObjectWithYYNYType1() {
+            addMethod("new IntermediateInterface");
+        }
+
+        public ObjectWithYYNYType1(boolean track) {
+            if (track)
+                addMethod("new IntermediateInterface");
         }
 
         public ObjectWithYYNYType1 getDeeper() {
+            addMethod("getDeeper");
             return deeper;
         }
 
         public void setDeeper(ObjectWithYYNYType1 deeper) {
+            addMethod("setDeeper");
             this.deeper = deeper;
         }
 
         public DeepestObjectType1 getDeepest() {
+            addMethod("getDeepest");
             return deepest;
         }
 
         public void setDeepest(DeepestObjectType1 deepest) {
+            addMethod("setDeepest");
             this.deepest = deepest;
         }
 
@@ -109,7 +128,7 @@ public DeepestInterface intermediateGetDeepest() {
 
         @Override
         public void intermediateSetDeepest(DeepestInterface deepest) {
-            this.deeper.setDeepest((DeepestObjectType1) deepest);
+            this.deepest = (DeepestObjectType1) deepest;
         }
     }
 
@@ -122,17 +141,26 @@ public static class DeepestObjectType1 implements DeepestInterface, AnyDeepInter
         private int PrimitiveAttribute1;
 
         public DeepestObjectType1() {
+            addMethod("new DeepestInterface");
+        }
+
+        public DeepestObjectType1(boolean track){
+            if (track)
+                addMethod("new DeepestInterface");
         }
 
         public void setPrimitiveAttribute1(int primitiveAttribute1) {
+            addMethod("setPrimitiveAttribute1");
             PrimitiveAttribute1 = primitiveAttribute1;
         }
 
         public void setStringAttribute1(String stringAttribute1) {
+            addMethod("setStringAttribute1");
             StringAttribute1 = stringAttribute1;
         }
 
         public void setSpecialClassAttribute1(SpecialClass specialClassAttribute1) {
+            addMethod("setSpecialClassAttribute1");
             SpecialClassAttribute1 = specialClassAttribute1;
         }
 
diff --git a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsTest.java b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/MyOptionsTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`package org.apache.openjpa.lib.util;`
`2`	`2`
	`3`	`+import static org.apache.openjpa.lib.util.MyOptionsMethodTracker.addMethod;`
	`4`	`+`
`3`	`5`	`public class MyOptionsObjects {`
`4`	`6`
`5`	`7`	`public interface AnyDeepInterface {`
`6`	`8`	`DeepestInterface intermediateGetDeepest();`
`7`	`9`	`}`
`8`	`10`
`9`	`11`	`public interface DeepestInterface {`
`10`		`-`
`11`	`12`	`int deepestPrimitiveAttribute(String id);`
`12`	`13`
`13`	`14`	`String deepestStringAttribute(String id);`
`@@ -20,8 +21,6 @@ public interface IntermediateInterface {`
`20`	`21`
`21`	`22`	`void intermediateSetDeeper(IntermediateInterface lower);`
`22`	`23`
`23`		`- DeepestInterface intermediateGetDeepest();`
`24`		`-`
`25`	`24`	`void intermediateSetDeepest(DeepestInterface deepest);`
`26`	`25`	`}`
`27`	`26`
`@@ -30,21 +29,31 @@ public static class ObjectWithYYNNType1 implements IntermediateInterface, AnyDee`
`30`	`29`	`private DeepestObjectType1 deepest;`
`31`	`30`
`32`	`31`	`private ObjectWithYYNNType1() {`
	`32`	`+ addMethod("new IntermediateInterface");`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ public ObjectWithYYNNType1(boolean track) {`
	`36`	`+ if (track)`
	`37`	`+ addMethod("new IntermediateInterface");`
`33`	`38`	`}`
`34`	`39`
`35`	`40`	`public ObjectWithYYNNType1 getDeeper() {`
	`41`	`+ addMethod("getDeeper");`
`36`	`42`	`return deeper;`
`37`	`43`	`}`
`38`	`44`
`39`	`45`	`public void setDeeper(ObjectWithYYNNType1 deeper) {`
	`46`	`+ addMethod("setDeeper");`
`40`	`47`	`this.deeper = deeper;`
`41`	`48`	`}`
`42`	`49`
`43`	`50`	`public DeepestObjectType1 getDeepest() {`
	`51`	`+ addMethod("getDeepest");`
`44`	`52`	`return deepest;`
`45`	`53`	`}`
`46`	`54`
`47`	`55`	`public void setDeepest(DeepestObjectType1 deepest) {`
	`56`	`+ addMethod("setDeepest");`
`48`	`57`	`this.deepest = deepest;`
`49`	`58`	`}`
`50`	`59`
`@@ -65,7 +74,7 @@ public DeepestInterface intermediateGetDeepest() {`
`65`	`74`
`66`	`75`	`@Override`
`67`	`76`	`public void intermediateSetDeepest(DeepestInterface deepest) {`
`68`		`- this.deeper.setDeepest((DeepestObjectType1) deepest);`
	`77`	`+ this.deepest = (DeepestObjectType1) deepest;`
`69`	`78`	`}`
`70`	`79`	`}`
`71`	`80`
`@@ -74,21 +83,31 @@ public static class ObjectWithYYNYType1 implements IntermediateInterface, AnyDee`
`74`	`83`	`private DeepestObjectType1 deepest;`
`75`	`84`
`76`	`85`	`public ObjectWithYYNYType1() {`
	`86`	`+ addMethod("new IntermediateInterface");`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ public ObjectWithYYNYType1(boolean track) {`
	`90`	`+ if (track)`
	`91`	`+ addMethod("new IntermediateInterface");`
`77`	`92`	`}`
`78`	`93`
`79`	`94`	`public ObjectWithYYNYType1 getDeeper() {`
	`95`	`+ addMethod("getDeeper");`
`80`	`96`	`return deeper;`
`81`	`97`	`}`
`82`	`98`
`83`	`99`	`public void setDeeper(ObjectWithYYNYType1 deeper) {`
	`100`	`+ addMethod("setDeeper");`
`84`	`101`	`this.deeper = deeper;`
`85`	`102`	`}`
`86`	`103`
`87`	`104`	`public DeepestObjectType1 getDeepest() {`
	`105`	`+ addMethod("getDeepest");`
`88`	`106`	`return deepest;`
`89`	`107`	`}`
`90`	`108`
`91`	`109`	`public void setDeepest(DeepestObjectType1 deepest) {`
	`110`	`+ addMethod("setDeepest");`
`92`	`111`	`this.deepest = deepest;`
`93`	`112`	`}`
`94`	`113`
`@@ -109,7 +128,7 @@ public DeepestInterface intermediateGetDeepest() {`
`109`	`128`
`110`	`129`	`@Override`
`111`	`130`	`public void intermediateSetDeepest(DeepestInterface deepest) {`
`112`		`- this.deeper.setDeepest((DeepestObjectType1) deepest);`
	`131`	`+ this.deepest = (DeepestObjectType1) deepest;`
`113`	`132`	`}`
`114`	`133`	`}`
`115`	`134`
`@@ -122,17 +141,26 @@ public static class DeepestObjectType1 implements DeepestInterface, AnyDeepInter`
`122`	`141`	`private int PrimitiveAttribute1;`
`123`	`142`
`124`	`143`	`public DeepestObjectType1() {`
	`144`	`+ addMethod("new DeepestInterface");`
	`145`	`+ }`
	`146`	`+`
	`147`	`+ public DeepestObjectType1(boolean track){`
	`148`	`+ if (track)`
	`149`	`+ addMethod("new DeepestInterface");`
`125`	`150`	`}`
`126`	`151`
`127`	`152`	`public void setPrimitiveAttribute1(int primitiveAttribute1) {`
	`153`	`+ addMethod("setPrimitiveAttribute1");`
`128`	`154`	`PrimitiveAttribute1 = primitiveAttribute1;`
`129`	`155`	`}`
`130`	`156`
`131`	`157`	`public void setStringAttribute1(String stringAttribute1) {`
	`158`	`+ addMethod("setStringAttribute1");`
`132`	`159`	`StringAttribute1 = stringAttribute1;`
`133`	`160`	`}`
`134`	`161`
`135`	`162`	`public void setSpecialClassAttribute1(SpecialClass specialClassAttribute1) {`
	`163`	`+ addMethod("setSpecialClassAttribute1");`
`136`	`164`	`SpecialClassAttribute1 = specialClassAttribute1;`
`137`	`165`	`}`
`138`	`166`