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

SEC-86: Tests for arrays in LVSA

Author: owen-jones-diffblue

regression/LVSA/Test/Test.class

@@ -0,0 +1,35 @@
+package LVSA.TestArray;
+
+public class Test {
+  static Object output;
+
+  public static void null_initialized_array() {
+    Object[] array = new Object[3];
+    output = array[1];
+  }
+
+  public static void manually_filled_array_1() {
+    Object[] array = new Object[3];
+    Object local = new Object();
+    for (int i = 0; i < array.length; ++i) {
+        array[i] = local;
+    }
+    output = array[1];
+  }
+
+  public static void manually_filled_array_2() {
+    Object[] array = new Object[3];
+    for (int i = 0; i < array.length; ++i) {
+        array[i] = new Object();
+    }
+    output = array[1];
+  }
+
+  public static void initialize_array() {
+    Object[] array = new Object[3];
+    array[0] = new Object();
+    array[0] = new Object();
+    array[2] = new Object();
+    output = array[1];
+  }
+}

regression/LVSA/Test/Test.java

@@ -0,0 +1,52 @@
+from regression.LVSA.lvsa_driver import LvsaDriver
+
+
+folder_name = 'TestArray'
+
+
+def test_lvsa_null_initialized_array(tmpdir):
+    """Arrays are automatically null-initialized"""
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('null_initialized_array')
+    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_null_object()
+
+
+def test_lvsa_manually_filled_array_1(tmpdir):
+    """We cannot tell that the whole array has been given a non-null value"""
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('manually_filled_array_1')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(2)
+    output_value_expectation.check_contains_null_object()
+    output_value_expectation.check_contains_most_recent_allocation_dynamic_object()
+
+
+def test_lvsa_manually_filled_array_2(tmpdir):
+    """We cannot tell that the whole array has been given a non-null value"""
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('manually_filled_array_2')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(3)
+    output_value_expectation.check_contains_null_object()
+    output_value_expectation.check_contains_non_recent_allocation_dynamic_object()
+    output_value_expectation.check_contains_most_recent_allocation_dynamic_object()
+
+
+def test_lvsa_initialize_array(tmpdir):
+    """We use one value set for all indices"""
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('initialize_array')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(4)
+    output_value_expectation.check_contains_null_object()
+    output_value_expectation.check_contains_most_recent_allocation_dynamic_object(3)

regression/LVSA/Test/test_basic.py

@@ -0,0 +1,13 @@
+package LVSA.TestBasic;
+
+public class Test {
+  static Object output;
+
+  public static void outputs_null() {
+    output = null;
+  }
+
+  public static void outputs_dynamic_object() {
+    output = new Object();
+  }
+}

regression/LVSA/TestArray/Test.class

@@ -0,0 +1,24 @@
+from regression.LVSA.lvsa_driver import LvsaDriver
+
+
+folder_name = 'TestBasic'
+
+
+def test_outputs_null(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_null')
+    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_null_object()
+
+
+def test_outputs_dynamic_object(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_dynamic_object')
+    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()

regression/LVSA/TestArray/Test.java

@@ -3,19 +3,19 @@
 public class Test {
   static Object output;
 
-  public static void returns_most_recent() {
+  public static void outputs_most_recent() {
     output = null;
     output = new Object();
   }
 
-  public static void returns_most_recent_or_null() {
+  public static void outputs_most_recent_or_null() {
     output = null;
     for (int i = 0; i < 5; i++) {
       output = new Object();
     }
   }
 
-  public static void returns_most_recent_non_recent_or_null(int unknown) {
+  public static void outputs_most_recent_non_recent_or_null(int unknown) {
     output = null;
     for (int i = 0; i < 5; i++) {
       Object local = new Object();
@@ -25,12 +25,42 @@ public static void returns_most_recent_non_recent_or_null(int unknown) {
     }
   }
 
-  public static void returns_non_recent_or_null() {
+  public static void outputs_non_recent_or_null() {
     output = null;
     Object local = null;
     for (int i = 0; i < 5; i++) {
       output = local;
       local = new Object();
     }
   }
+
+  public class A {
+    Object b;
+  }
+
+  public void most_recent_gets_strong_update() {
+    A a = new A();
+    a.b = null;
+    a.b = new Object();
+    output = a.b;
+  }
+
+  public void non_recent_gets_weak_update() {
+    A a1 = null;
+    A a2 = null;
+
+    for (int i = 0; i < 2; ++i) {
+      A aInLoop = new A();
+      if (i == 0) {
+        a1 = aInLoop;
+      }
+      else {
+        a2 = aInLoop;
+      }
+    }
+
+    a1.b = null;
+    a1.b = new Object();
+    output = a1.b;
+  }
 }

regression/LVSA/Test/__init__.py renamed to regression/LVSA/TestArray/__init__.py

@@ -4,8 +4,8 @@
 folder_name = 'TestRecency'
 
 
-def test_lvsa_returns_most_recent(tmpdir):
-    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('returns_most_recent')
+def test_outputs_most_recent(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_most_recent')
     lvsa_expectation = lvsa_driver.run()
 
     output_value_expectation = lvsa_expectation.check_output()
@@ -14,8 +14,8 @@ def test_lvsa_returns_most_recent(tmpdir):
     output_value_expectation.check_contains_most_recent_allocation_dynamic_object()
 
 
-def test_lvsa_returns_most_recent_or_null(tmpdir):
-    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('returns_most_recent_or_null')
+def test_outputs_most_recent_or_null(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_most_recent_or_null')
     lvsa_expectation = lvsa_driver.run()
 
     output_value_expectation = lvsa_expectation.check_output()
@@ -25,8 +25,8 @@ def test_lvsa_returns_most_recent_or_null(tmpdir):
     output_value_expectation.check_contains_most_recent_allocation_dynamic_object()
 
 
-def test_lvsa_returns_most_recent_non_recent_or_null(tmpdir):
-    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('returns_most_recent_non_recent_or_null')
+def test_outputs_most_recent_non_recent_or_null(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_most_recent_non_recent_or_null')
     lvsa_expectation = lvsa_driver.run()
 
     output_value_expectation = lvsa_expectation.check_output()
@@ -37,12 +37,33 @@ def test_lvsa_returns_most_recent_non_recent_or_null(tmpdir):
     output_value_expectation.check_contains_non_recent_allocation_dynamic_object()
 
 
-def test_lvsa_returns_non_recent_or_null(tmpdir):
-    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('returns_non_recent_or_null')
+def test_outputs_non_recent_or_null(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('outputs_non_recent_or_null')
     lvsa_expectation = lvsa_driver.run()
 
     output_value_expectation = lvsa_expectation.check_output()
 
     output_value_expectation.check_number_of_values(2)
     output_value_expectation.check_contains_null_object()
     output_value_expectation.check_contains_non_recent_allocation_dynamic_object()
+
+
+def test_most_recent_gets_strong_update(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('most_recent_gets_strong_update')
+    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()
+
+
+def test_non_recent_gets_weak_update(tmpdir):
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('non_recent_gets_weak_update')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(2)
+    output_value_expectation.check_contains_null_object()
+    output_value_expectation.check_contains_dynamic_object()

regression/LVSA/TestArray/test_array.py

@@ -1,6 +1,5 @@
 import json
 import os
-import re
 
 from regression.executable_runner import ExecutableRunner