From e4a2763b0672980d0fc3f78410534722301f3594 Mon Sep 17 00:00:00 2001
From: jgwilson42 <james.wilson@diffblue.com>
Date: Sun, 7 Jan 2018 23:00:44 +0000
Subject: [PATCH] Tests for scope changes for variables and functions

---
 .../goto-diff/java-no-change/new/Test.java    |   8 +++----
 .../goto-diff/java-scope-change/new.jar       | Bin 0 -> 698 bytes
 .../goto-diff/java-scope-change/new/Test.java |  18 ++++++++++++++++
 .../goto-diff/java-scope-change/old.jar       | Bin 0 -> 697 bytes
 .../goto-diff/java-scope-change/old/Test.java |  18 ++++++++++++++++
 .../goto-diff/java-scope-change/test.desc     |  11 ++++++++++
 .../goto-diff/java-scope-change2/new.jar      | Bin 0 -> 738 bytes
 .../java-scope-change2/new/Test.java          |  20 ++++++++++++++++++
 .../goto-diff/java-scope-change2/old.jar      | Bin 0 -> 738 bytes
 .../java-scope-change2/old/Test.java          |  20 ++++++++++++++++++
 .../goto-diff/java-scope-change2/test.desc    |  11 ++++++++++
 .../goto-diff/java-scope-change3/new.jar      | Bin 0 -> 455 bytes
 .../java-scope-change3/new/Test.java          |  20 ++++++++++++++++++
 .../goto-diff/java-scope-change3/old.jar      | Bin 0 -> 738 bytes
 .../java-scope-change3/old/Test.java          |  20 ++++++++++++++++++
 .../goto-diff/java-scope-change3/test.desc    |  11 ++++++++++
 16 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 regression/goto-diff/java-scope-change/new.jar
 create mode 100644 regression/goto-diff/java-scope-change/new/Test.java
 create mode 100644 regression/goto-diff/java-scope-change/old.jar
 create mode 100644 regression/goto-diff/java-scope-change/old/Test.java
 create mode 100644 regression/goto-diff/java-scope-change/test.desc
 create mode 100644 regression/goto-diff/java-scope-change2/new.jar
 create mode 100644 regression/goto-diff/java-scope-change2/new/Test.java
 create mode 100644 regression/goto-diff/java-scope-change2/old.jar
 create mode 100644 regression/goto-diff/java-scope-change2/old/Test.java
 create mode 100644 regression/goto-diff/java-scope-change2/test.desc
 create mode 100644 regression/goto-diff/java-scope-change3/new.jar
 create mode 100644 regression/goto-diff/java-scope-change3/new/Test.java
 create mode 100644 regression/goto-diff/java-scope-change3/old.jar
 create mode 100644 regression/goto-diff/java-scope-change3/old/Test.java
 create mode 100644 regression/goto-diff/java-scope-change3/test.desc

diff --git a/regression/goto-diff/java-no-change/new/Test.java b/regression/goto-diff/java-no-change/new/Test.java
index 76b66845e26..c9a99f3ec43 100644
--- a/regression/goto-diff/java-no-change/new/Test.java
+++ b/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 {
diff --git a/regression/goto-diff/java-scope-change/new.jar b/regression/goto-diff/java-scope-change/new.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b9661c2be16a4bc304d32ee6c01f271269ae3a86
GIT binary patch
literal 698
zcmWIWW@Zs#;Nak3;Oo%vVL$?$3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`TA
zUPvC1mXgxS_#v*U_I!z!#dC4dC*rEp7_Mf2D*9N&2zJF~8>5LXKs#K47~u*YG%s)g
zWkXVnOZ1X+5{rv-`}X=Bb`WSu|2unzg;}YK<Me<DY=MeWDoZ?6G=(nCKg-B>%<b62
zMuF5>As!+&4E&<0=U5aK*WK9rw=C`5J~R3G41OEr54c@-f1)f_ksdkm>T{;u_B+HZ
z#Gm$xxr9e9R6l*(CA@g*6P0hdkwtgqdEJ@{!d8DtTr;n3TIVX3gKJ{KR_;5)lXd=U
zaqXS}{Z-8DdTZG@lA7CgYQ1Z_oU-t;RQrY>ip4n{7dKVS;k(g#*S4yCO{L(EHF3<X
z%fxP3ztmLkwtaK-p!A)4U4QFb6HKS&O@1Hn>e3VCA9br;w|vh(_F7N*|LltkO;X&x
z%vNl16Uk!)#Td_8rHfyHA(6-k3M)n?5eC!<hs7o+!chS{20_t}t`#{7K+%l=wm>Fa
oD^lbmn*fR`WQT#G3IPrSnTUuB@MdKL$uR@rRv`Tz=n)160K`?slmGw#

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change/new/Test.java b/regression/goto-diff/java-scope-change/new/Test.java
new file mode 100644
index 00000000000..c9a99f3ec43
--- /dev/null
+++ b/regression/goto-diff/java-scope-change/new/Test.java
@@ -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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change/old.jar b/regression/goto-diff/java-scope-change/old.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6779e5abd544233a1bf2ba8adc05784b1fe82805
GIT binary patch
literal 697
zcmWIWW@Zs#;Nak3ShZNqhXDz2GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T1rYQ<A=Da+Vdq^7SF{+pNOkYW4N0Aspw-7BiI#}ZHy+m0PS!EVuUM}qj`Y~
zC>xSmT%wnplUQ7w+h^;4*g&G?{n_-{YQ8hH*|u$CjujA2a&%gC<oJcIyPR#ymT+=u
z+H)9|B|0TNVE?dK;CX;b%ZCS>-|ww{(|>+@IRpC*&V<G9mA_5o*t2-gnc2yWwlcAt
zb0)uv;(oMw&lU04p{ri+^y0Sq<{MgQGpBD^Q^vIwZ{Ee+{m&B|%H0&Xb)9kTEa}zO
z*ZI%>3$k4$z!wwNtLV{Vsu@ygz0+s9RrUt<Zh52AZ8LPr`?trg3b^}G`$;Q%<N3SU
zzQ(T>?CzBlN(@}=C}eY3HfKdQFYoHLU!wONUU7O-|AXIa`EKv6m-LTz`#4?DNNS?s
z|Fo7|jbBWl2)o_y==m8K5Q&VSpkibaVL**<SY(3Y8x_DK5ET39T9IP_6x#@33uMBz
oBE>zj380ulb{Ht85a2M7iHNrVZ&o&t95WDZ1=8<;9${br0Jh7^hX4Qo

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change/old/Test.java b/regression/goto-diff/java-scope-change/old/Test.java
new file mode 100644
index 00000000000..4bba83c5011
--- /dev/null
+++ b/regression/goto-diff/java-scope-change/old/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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change/test.desc b/regression/goto-diff/java-scope-change/test.desc
new file mode 100644
index 00000000000..cfe9d962b83
--- /dev/null
+++ b/regression/goto-diff/java-scope-change/test.desc
@@ -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
+--
diff --git a/regression/goto-diff/java-scope-change2/new.jar b/regression/goto-diff/java-scope-change2/new.jar
new file mode 100644
index 0000000000000000000000000000000000000000..231eccfd0493711ddaa71dd93274b13d8b3230e5
GIT binary patch
literal 738
zcmWIWW@Zs#;Nak3xVBB*hXDz2GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T1rYQ<A=Da+Vdq^7SF{+pNOkYW4N0Aspw-7BiI#}ZHy+m0PS!EVuUNMpm~7{
zC>xSmT%wnplUQ6F>%ZIYu!F#y&2x_!*0DN2?P62a^k`loz{{a2)UPD?_omE)gd`Ce
zl{)sNCCw~Oiykol&^R*3Q$yojS$<l2*}K=j9}6GQGn0*Yu_ZBSZ|jOyUdE3{j72iu
zrC(lSBVe$5FE``s4Ld@Z4tkn}rhne;a`u?f$<7(!u8zB`-vmDC^_qEa-l^ZBGf&KH
zFxGmuIYc&HDy#ph^G@T5{g+(1w{^44x{@8DaOH=>^vkagRvHCncIu{Wo)LQB!sItT
z-$Xv;ectLDv%%_bdB?uLY>$`DD>HHP`yRG7vU&Fv8Nus5GVSM>690>~?QK|_y>$JB
zohv=0w|4p)?zr*%Qb*Byb0-)5|K|(yU%t5bQL=YO(%JvjKT0?y_H6!ip`PQ_!Vm1A
znBBD{B1?vmfngF52Y53wi7=oh3|Op#5(X-O$22IJpld~rDp0aO09zmvt`#YfAe#V+
fQe=mLq7(rR1DS{j4)A7W1IaN1;Z`6m4t6mBQ?}+3

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change2/new/Test.java b/regression/goto-diff/java-scope-change2/new/Test.java
new file mode 100644
index 00000000000..2224243f158
--- /dev/null
+++ b/regression/goto-diff/java-scope-change2/new/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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change2/old.jar b/regression/goto-diff/java-scope-change2/old.jar
new file mode 100644
index 0000000000000000000000000000000000000000..80caa8915a367e4a4e810dff831028bb47765ac2
GIT binary patch
literal 738
zcmWIWW@Zs#;Nak3IKNHZhXDz2GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T1rYQ<A=Da+Vdq^7SF{+pNOkYW4N0Aspw-7BiI#}ZHy+m0PS!EVuUNsp?QG|
zC>xSmT%wnplUQ6F>%ZIYu!F#y&2x_!*0DN2?P62a^k`loz{{a2)UPD?_omE)gd`Ce
zl{)sNCCw~Oiykol&^R*3Q$r&!KR+$K?A`0%kA)BDnaM`H*pisEw{=A;FXP7}#v&Q-
z(l4*E5ir=jmz(kRh8-bH2R+R~(?9QaIeX0LWao@<SI1q}Zvvn6dd<8y@6>P6nI~p8
z7;8P-93q=8mDPXMd8hHj{!6ah+q&6iUC9nnxbj0``sLRLD~$p(J9X1G&zQRKi;DGR
z+153=`?e)+V4m~O+U0&-^T!~6YboXB)vK?qIT)MO*O9H(=bYZS;Xl{mxC7V9mwLar
z6SAcD){*5BF>i`9U3Pw#R$Mgw|MMN&OTN7L(c>2L@!bFFA0?a;dp3W%P|xvd;Rkk5
z%&LF<t1ZLGz%U7j1H2iTL>N#L1}xS=2?G_tV;Yo9(6u5*6)0ICfGv;-*NT)#kWBzZ
fDYC;rQHlVEflNdM2Y9oxf#jHha4V1&2fG*ma4O|5

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change2/old/Test.java b/regression/goto-diff/java-scope-change2/old/Test.java
new file mode 100644
index 00000000000..319613627d3
--- /dev/null
+++ b/regression/goto-diff/java-scope-change2/old/Test.java
@@ -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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change2/test.desc b/regression/goto-diff/java-scope-change2/test.desc
new file mode 100644
index 00000000000..cc58141505e
--- /dev/null
+++ b/regression/goto-diff/java-scope-change2/test.desc
@@ -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
+--
diff --git a/regression/goto-diff/java-scope-change3/new.jar b/regression/goto-diff/java-scope-change3/new.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8f3148c0491f02457bc9c77979c11015eac1850b
GIT binary patch
literal 455
zcmWIWW@Zs#U|`^2;N79)Q+#TloGc>)!z3W)Vvu17Ni8nXOU_9wE)EUhWMJmBi;M!{
z(h6<{MwYKYMPR+L0ek%p8%WrwXHITg;;HEqIU`_pquvVPBu2&1N9h?y-?1=jE_76M
zeN-B7T+c&6g-x!Z-D%F^X^jW}+1;-#xBLD3`Dg9}cH3ejUTjH7y6krS*tCX<XHuLd
z{F@@fWVvSS{kOECG$cl|@qx+gm7jmsE;`leQ>65)G;qSZ-d`d=AA2n;PydwYtF}p`
z;P}x!K36@LExhJp8&)0sQ^od1fsM(9C2@<H79L~YIp;2q-lUaY+HVYIA6>(<RQ=}6
z7?DqRlD2a<%RV?JFR<}5-{Y<G%1qt-zKfYMNq-2NmHcQ{=b{U-3O)A|EVwOp>3tR3
zwcY!YTkfTG`Z=3EwQGET&9TUP{kQp#3!c8X{E@Xc<K(RW-!m?&CVV(|%Xz=ziuObC
u0p5&Ea?H4bSOOUI5U`{XL?Z_{D<r_t0z1H)l?|kl5eNf-bRsYo7#IK)d#f`5

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change3/new/Test.java b/regression/goto-diff/java-scope-change3/new/Test.java
new file mode 100644
index 00000000000..9cfabf3825d
--- /dev/null
+++ b/regression/goto-diff/java-scope-change3/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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change3/old.jar b/regression/goto-diff/java-scope-change3/old.jar
new file mode 100644
index 0000000000000000000000000000000000000000..80caa8915a367e4a4e810dff831028bb47765ac2
GIT binary patch
literal 738
zcmWIWW@Zs#;Nak3IKNHZhXDz2GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T1rYQ<A=Da+Vdq^7SF{+pNOkYW4N0Aspw-7BiI#}ZHy+m0PS!EVuUNsp?QG|
zC>xSmT%wnplUQ6F>%ZIYu!F#y&2x_!*0DN2?P62a^k`loz{{a2)UPD?_omE)gd`Ce
zl{)sNCCw~Oiykol&^R*3Q$r&!KR+$K?A`0%kA)BDnaM`H*pisEw{=A;FXP7}#v&Q-
z(l4*E5ir=jmz(kRh8-bH2R+R~(?9QaIeX0LWao@<SI1q}Zvvn6dd<8y@6>P6nI~p8
z7;8P-93q=8mDPXMd8hHj{!6ah+q&6iUC9nnxbj0``sLRLD~$p(J9X1G&zQRKi;DGR
z+153=`?e)+V4m~O+U0&-^T!~6YboXB)vK?qIT)MO*O9H(=bYZS;Xl{mxC7V9mwLar
z6SAcD){*5BF>i`9U3Pw#R$Mgw|MMN&OTN7L(c>2L@!bFFA0?a;dp3W%P|xvd;Rkk5
z%&LF<t1ZLGz%U7j1H2iTL>N#L1}xS=2?G_tV;Yo9(6u5*6)0ICfGv;-*NT)#kWBzZ
fDYC;rQHlVEflNdM2Y9oxf#jHha4V1&2fG*ma4O|5

literal 0
HcmV?d00001

diff --git a/regression/goto-diff/java-scope-change3/old/Test.java b/regression/goto-diff/java-scope-change3/old/Test.java
new file mode 100644
index 00000000000..319613627d3
--- /dev/null
+++ b/regression/goto-diff/java-scope-change3/old/Test.java
@@ -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;
+    }
+  }
+}
diff --git a/regression/goto-diff/java-scope-change3/test.desc b/regression/goto-diff/java-scope-change3/test.desc
new file mode 100644
index 00000000000..cc58141505e
--- /dev/null
+++ b/regression/goto-diff/java-scope-change3/test.desc
@@ -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
+--