Skip to content

Commit

Permalink
Merge pull request diffblue#1794 from smowton/smowton/fix/goto-diff-t…
Browse files Browse the repository at this point in the history 
…est-escapes

Escape curly braces in regexes
  • Loading branch information
@smowton
smowton authored Feb 5, 2018
2 parents a619e48 + 93dab4c commit 6f6fda7
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions regression/goto-diff/java-add-package/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ old.jar --json-ui
activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[\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": "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
"deletedFunctions": \[\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": "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
"modifiedFunctions": \[ \],
"newFunctions": \[\n {\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n }\n },\n {\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n }\n },\n {\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n }\n }\n \],
"newFunctions": \[\n \{\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],
--
^warning: ignoring
4 changes: 2 additions & 2 deletions regression/goto-diff/java-del-package/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ old.jar --json-ui
activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[\n {\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n }\n },\n {\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n }\n },\n {\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n }\n }\n \],
"deletedFunctions": \[\n \{\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],
"modifiedFunctions": \[ \],
"newFunctions": \[\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": "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": \[\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": "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
--
^warning: ignoring
2 changes: 1 addition & 1 deletion regression/goto-diff/java-deleted-function/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ old.jar --json-ui
activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[\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 \],
"deletedFunctions": \[\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 \],
"modifiedFunctions": \[ \],
"newFunctions": \[ \],
--
Expand Down
2 changes: 1 addition & 1 deletion regression/goto-diff/java-mod-identifier2/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[ \],
"modifiedFunctions": \[\n {\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": {\n "file": "Test\.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n }\n }\n \],\n
"modifiedFunctions": \[\n \{\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": \{\n "file": "Test\.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n \}\n \}\n \],\n
"newFunctions": \[ \],
--
^warning: ignoring
4 changes: 2 additions & 2 deletions regression/goto-diff/java-mod-package/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ old.jar --json-ui
activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[\n {\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n }\n },\n {\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n }\n },\n {\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": {\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n }\n }\n \],
"deletedFunctions": \[\n \{\n "name": "java::foo\.Test\.<init>:\(\)V",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.<init>:\(\)V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.foo:\(I\)I",\n "line": "5"\n \}\n \},\n \{\n "name": "java::foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "foo/Test\.java",\n "function": "java::foo\.Test\.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],
"modifiedFunctions": \[ \],
"newFunctions": \[\n {\n "name": "java::com\.diffblue\.foo\.Test\.<init>:\(\)V",\n "sourceLocation": {\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.<init>:\(\)\V",\n "line": "3"\n }\n },\n {\n "name": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "sourceLocation": {\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "line": "6"\n }\n },\n {\n "name": "java::com\.diffblue\.foo\.Test\.bar:\(I\)I",\n "sourceLocation": {\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test.bar:\(I\)I",\n "line": "14"\n }\n }\n \],\n
"newFunctions": \[\n \{\n "name": "java::com\.diffblue\.foo\.Test\.<init>:\(\)V",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.<init>:\(\)\V",\n "line": "3"\n \}\n \},\n \{\n "name": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n "line": "6"\n \}\n \},\n \{\n "name": "java::com\.diffblue\.foo\.Test\.bar:\(I\)I",\n "sourceLocation": \{\n "file": "com/diffblue/foo/Test\.java",\n "function": "java::com\.diffblue\.foo\.Test.bar:\(I\)I",\n "line": "14"\n \}\n \}\n \],\n
--
^warning: ignoring
2 changes: 1 addition & 1 deletion regression/goto-diff/java-new-function/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ EXIT=0
SIGNAL=0
"deletedFunctions": \[ \],
"modifiedFunctions": \[ \],
"newFunctions": \[\n {\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": {\n "file": "Test.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n }\n }\n \],
"newFunctions": \[\n \{\n "name": "java::Test\.foo:\(II\)I",\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test\.foo:\(II\)I",\n "line": "4"\n \}\n \}\n \],
--
^warning: ignoring
2 changes: 1 addition & 1 deletion regression/goto-diff/java-scope-change/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ old.jar --json-ui
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": \[ \],
"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
--
2 changes: 1 addition & 1 deletion regression/goto-diff/java-scope-change2/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ old.jar --json-ui
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": \[ \],
"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
--
2 changes: 1 addition & 1 deletion regression/goto-diff/java-scope-change3/test.desc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ old.jar --json-ui
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": \[ \],
"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
--

0 comments on commit 6f6fda7

Please sign in to comment.