Merge pull request diffblue#246 from diffblue/owen/tests-for-lvsa

Add LVSA test for a field of a dynamic object

Author: owen-jones-diffblue

regression/LVSA/TestBasic/Test$A.class

@@ -1,13 +1,23 @@
 package LVSA.TestBasic;
 
 public class Test {
-  static Object output;
+  static A output;
 
-  public static void outputs_null() {
+  public class A {
+    public Object instanceObj;
+    public boolean someBoolean;
+  }
+
+  public void outputs_null() {
     output = null;
   }
 
-  public static void outputs_dynamic_object() {
-    output = new Object();
+  public void outputs_dynamic_object() {
+    output = new A();
+  }
+
+  public void outputs_dynamic_object_with_allocated_field() {
+    output = new A();
+    output.instanceObj = new Object();
   }
 }

regression/LVSA/TestBasic/Test.class

@@ -22,3 +22,19 @@ def test_outputs_dynamic_object(tmpdir):
 
     output_value_expectation.check_number_of_values(1)
     output_value_expectation.check_contains_dynamic_object()
+
+
+def test_outputs_dynamic_object_with_allocated_field(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_dynamic_object_with_allocated_field')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(1)
+    output_value_expectation.check_contains_dynamic_object()
+    dynamic_object_id = output_value_expectation.get_dynamic_object_ids()[0]
+
+    output_value_expectation = lvsa_expectation.check_value_set(dynamic_object_id, '.instanceObj', most_recent=True)
+
+    output_value_expectation.check_number_of_values(1)
+    output_value_expectation.check_contains_dynamic_object()

regression/LVSA/TestBasic/Test.java

@@ -75,6 +75,9 @@ def check_contains_external_value_set(self, expected_number=1, is_external_objec
             matches = [x for x in matches if x.has_been_read == has_been_read]
         assert expected_number == len(matches)
 
+    def get_dynamic_object_ids(self):
+        return [dynamic_object.instance['id'] for dynamic_object in self.dynamic_objects]
+
 
 class LvsaExpectation:
     """Encapsulate the output of LvsaDriver"""
@@ -136,6 +139,17 @@ def check_external_value_set(self, inner_class=None, suffix=None):
         assert len(matches) == 1
         return VariableExpectation(matches[0])
 
+    def check_value_set(self, dynamic_object_id, suffix, most_recent=None):
+        target_id = 'value_set::dynamic_object' + dynamic_object_id
+        if most_recent is True:
+            target_id += 'most_recent_allocation'
+        if most_recent is False:
+            target_id += 'any_allocation'
+        matches = [var_state for var_state in self.state if
+                   var_state['id'].startswith(target_id) and var_state['suffix'] == suffix]
+        assert len(matches) == 1
+        return VariableExpectation(matches[0])
+
 
 class LvsaDriver:
     """Run LVSA"""