Fix tests, which were too sensitive to particular naming choices.

Author: smowton

regression/test_gen/java1/TestGenTest.class

@@ -35,6 +35,10 @@ public class TestGenTest
 {
   public static void f(B param0, C param1, int param2)
   {
+
+    if(param0 == null || param1 == null || param1.c_field_1 == null)
+      return;
+
     int a_field_0=param0.a_field_0;
     int a_field_1=param0.a_field_1;
     int b_field_0=param0.b_field_0;

regression/test_gen/java1/TestGenTest.java

@@ -3,19 +3,19 @@ TestGenTest.class
 --gen-java-test-case --stop-on-fail --function TestGenTest.f
 ^EXIT=0$
 ^SIGNAL=0$
-^ *B tmp_object_factory[$]5=[(]B[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"B"[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]5,"a_field_0",495[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]5,"a_field_1",494[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]5,"b_field_0",493[)];$
-^ *C tmp_object_factory[$]4=[(]C[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"C"[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]4,"c_field_0",496[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory$4,"c_field_1",tmp_object_factory[$]5[)];$
-^ *B tmp_object_factory[$]3=[(]B[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"B"[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]3,"a_field_0",499[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]3,"a_field_1",498[)];$
-^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$]3,"b_field_0",497[)];$
-^ *B arg0a=tmp_object_factory[$]3;$
-^ *C arg1a=tmp_object_factory[$]4;$
+^ *B tmp_object_factory[$].*=[(]B[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"B"[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"a_field_0",495[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"a_field_1",494[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"b_field_0",493[)];$
+^ *C tmp_object_factory[$].*=[(]C[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"C"[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"c_field_0",496[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"c_field_1",tmp_object_factory[$].*[)];$
+^ *B tmp_object_factory[$].*=[(]B[)] com.diffblue.java_testcase.Reflector.forceInstance[(]"B"[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"a_field_0",499[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"a_field_1",498[)];$
+^ *com.diffblue.java_testcase.Reflector.setInstanceField[(]tmp_object_factory[$].*,"b_field_0",497[)];$
+^ *B arg0a=tmp_object_factory[$].*;$
+^ *C arg1a=tmp_object_factory[$].*;$
 ^ *int arg2i=492;$
 ^ *TestGenTest.f[(]arg0a, arg1a, arg2i[)];$
 --

regression/test_gen/java1/test.desc

@@ -3,5 +3,5 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector.setInstanceField(to_construct$1,"x",1).*$
-^.*Reflector.setInstanceField(to_construct$1,"y",2).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",1).*$
+^.*Reflector.setInstanceField(dynamic_object.,"y",2).*$

regression/test_gen/opaque_direct_constructor_fields/test.desc

@@ -3,5 +3,5 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector.setInstanceField(to_return\$2,"x",1).*$
-^.*Reflector.setInstanceField(to_return\$2,"x",2).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",1).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",2).*$

regression/test_gen/opaque_instance_object/test.desc

@@ -3,6 +3,6 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector.setInstanceField(dynamic_object2,"x",2).*$
-^.*Reflector.setInstanceField(to_construct$2,"y",dynamic_object2).*$
-^.*Reflector.setInstanceField(to_construct$2,"x",1).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",2).*$
+^.*Reflector.setInstanceField(dynamic_object.,"y",dynamic_object.).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",1).*$

regression/test_gen/opaque_object_tree/test.desc

@@ -3,7 +3,7 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector.setInstanceField(dynamic_object2,"x",2).*$
-^.*Reflector.setInstanceField(to_construct$2,"y",dynamic_object2).*$
-^.*Reflector.setInstanceField(to_construct$2,"x",1).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",2).*$
+^.*Reflector.setInstanceField(dynamic_object.,"y",dynamic_object.).*$
+^.*Reflector.setInstanceField(dynamic_object.,"x",1).*$
 ^.*Opaque2_get_answer_list.add(3).*$

regression/test_gen/opaque_object_tree_methods/test.desc

@@ -3,5 +3,5 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector\.setInstanceField(to_return$1,"x",2).*$
+^.*Reflector\.setInstanceField(dynamic_object.,"x",2).*$
 ^.*to_return$1=null.*$

regression/test_gen/opaque_returns_null_object/test.desc

@@ -3,5 +3,5 @@ TestGenTest.class
 --stop-on-fail --gen-java-test-case --function TestGenTest.test
 ^EXIT=0$
 ^SIGNAL=0$
-^.*Reflector\.setInstanceField(to_return\$3,"x",1).*$
-^.*Reflector\.setInstanceField(to_return\$3,"x",2);.*$
+^.*Reflector\.setInstanceField(dynamic_object.,"x",1).*$
+^.*Reflector\.setInstanceField(dynamic_object.,"x",2).*$