Tests for scope changes for variables and functions

Author: jgwilson42

regression/goto-diff/java-no-change/new/Test.java

@@ -1,14 +1,14 @@
 public class Test {
-  public int foo(int x) {
+
+  private int foo(int x) {
     if (x > 10) {
       return x;
     } else {
-      int y = x * 10;
-      return y;
+      return x * 10;
     }
   }
 
-  public int bar(int x) {
+  protected int bar(int x) {
     if (x < 10) {
       return x;
     } else {

regression/goto-diff/java-scope-change/new.jar

@@ -0,0 +1,18 @@
+public class Test {
+
+  private int foo(int x) {
+    if (x > 10) {
+      return x;
+    } else {
+      return x * 10;
+    }
+  }
+
+  protected int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change/new/Test.java

@@ -0,0 +1,18 @@
+public class Test {
+
+  public int foo(int x) {
+    if (x > 10) {
+      return x;
+    } else {
+      return x * 10;
+    }
+  }
+
+  public int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change/old.jar

@@ -0,0 +1,11 @@
+CORE
+new.jar
+old.jar --json-ui
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "12"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+--
+^warning: ignoring
+--

regression/goto-diff/java-scope-change/old/Test.java

@@ -0,0 +1,20 @@
+public class Test {
+
+  private int y = 5;
+
+  public int foo(int x) {
+    if (x > 10 && y > 5) {
+      return y;
+    } else {
+      return y * 10;
+    }
+  }
+
+  public int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change/test.desc

@@ -0,0 +1,20 @@
+public class Test {
+
+  public int y = 5;
+
+  public int foo(int x) {
+    if (x > 10 && y > 5) {
+      return y;
+    } else {
+      return y * 10;
+    }
+  }
+
+  public int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change2/new.jar

@@ -0,0 +1,11 @@
+CORE
+new.jar
+old.jar --json-ui
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+--
+^warning: ignoring
+--

regression/goto-diff/java-scope-change2/new/Test.java

@@ -0,0 +1,20 @@
+class Test {
+
+  public int y = 5;
+
+  public int foo(int x) {
+    if (x > 10 && y > 5) {
+      return y;
+    } else {
+      return y * 10;
+    }
+  }
+
+  public int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change2/old.jar

@@ -0,0 +1,20 @@
+public class Test {
+
+  public int y = 5;
+
+  public int foo(int x) {
+    if (x > 10 && y > 5) {
+      return y;
+    } else {
+      return y * 10;
+    }
+  }
+
+  public int bar(int x) {
+    if (x < 10) {
+      return x;
+    } else {
+      return x / 10;
+    }
+  }
+}

regression/goto-diff/java-scope-change2/old/Test.java

@@ -0,0 +1,11 @@
+CORE
+new.jar
+old.jar --json-ui
+// Enable multi-line checking
+activate-multi-line-match
+EXIT=0
+SIGNAL=0
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+--
+^warning: ignoring
+--