Skip to content

Commit e35372a

Browse files
peterschrammelpeterschrammel
authored
Merge pull request #1539 from romainbrenguier/bugfix/char-array-in-java-strings#TG-58#newpr
TG-58 New PR for Complete rework of string solver to avoid using infinite arrays
2 parents 4d011b5 + aa94fe8 commit e35372a

File tree

70 files changed

+3448
-2832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3448
-2832
lines changed

‎regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.class

188 Bytes
Binary file not shown.

‎regression/jbmc-strings/StringMiscellaneous04/StringMiscellaneous04.java

+49-37
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,52 @@
11
public class StringMiscellaneous04
22
{
3-
public static void main(String[] args)
4-
{
5-
String s1 = "diffblue";
6-
String s2 = "TESTGENERATION";
7-
String s3 = " automated ";
8-
9-
assert s1.equals("diffblue");
10-
assert s2.equals("TESTGENERATION");
11-
assert s3.equals(" automated ");
12-
13-
System.out.printf(
14-
"Replace 'f' with 'F' in s1: %s\n\n", s1.replace('f', 'F'));
15-
String tmp=s1.replace('f', 'F');
16-
assert tmp.equals("diFFblue");
17-
18-
tmp=s1.toUpperCase();
19-
assert tmp.equals("DIFFBLUE");
20-
21-
tmp=s2.toLowerCase();
22-
assert tmp.equals("testgeneration");
23-
24-
tmp=s3.trim();
25-
assert tmp.equals("automated");
26-
27-
// test toCharArray method
28-
char[] charArray = s1.toCharArray();
29-
System.out.print("s1 as a character array = ");
30-
31-
int i=0;
32-
for (char character : charArray)
33-
{
34-
assert character=="diffblue".charAt(i);
35-
++i;
36-
}
37-
38-
System.out.println();
39-
}
3+
// This is a model of the String.toCharArray method
4+
public static char[] toCharArray(String s)
5+
{
6+
int length=s.length();
7+
assert(length<10);
8+
char arr[]=new char[s.length()];
9+
// We limit arbitrarly the loop unfolding to 10
10+
for(int i=0; i<length && i<10; i++)
11+
arr[i]=s.charAt(i);
12+
return arr;
13+
}
14+
15+
public static void main(String[] args)
16+
{
17+
String s1 = "diffblue";
18+
String s2 = "TESTGENERATION";
19+
String s3 = " automated ";
20+
21+
assert s1.equals("diffblue");
22+
assert s2.equals("TESTGENERATION");
23+
assert s3.equals(" automated ");
24+
25+
System.out.printf(
26+
"Replace 'f' with 'F' in s1: %s\n\n", s1.replace('f', 'F'));
27+
String tmp=s1.replace('f', 'F');
28+
assert tmp.equals("diFFblue");
29+
30+
tmp=s1.toUpperCase();
31+
assert tmp.equals("DIFFBLUE");
32+
33+
tmp=s2.toLowerCase();
34+
assert tmp.equals("testgeneration");
35+
36+
tmp=s3.trim();
37+
assert tmp.equals("automated");
38+
39+
// test toCharArray method
40+
char[] charArray = toCharArray(s1);
41+
System.out.print("s1 as a character array = ");
42+
43+
int i=0;
44+
for (char character : charArray)
45+
{
46+
assert character=="diffblue".charAt(i);
47+
++i;
48+
}
49+
50+
System.out.println();
51+
}
4052
}

‎regression/jbmc-strings/java_append_char/test.desc

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ test_append_char.class
44
^EXIT=10$
55
^SIGNAL=0$
66
^VERIFICATION FAILED$
7-
^\[.*assertion\.1\].* line 15.* FAILURE$
7+
^\[.*assertion\.1\].* line 16.* SUCCESS$
8+
^\[.*assertion\.2\].* line 18.* FAILURE$
89
--

‎regression/jbmc-strings/java_append_char/test_append_char.class

48 Bytes
Binary file not shown.

‎regression/jbmc-strings/java_append_char/test_append_char.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public class test_append_char
22
{
3-
public static void main(/*String[] args*/)
3+
public static void main(boolean b)
44
{
55
char[] diff = {'d', 'i', 'f', 'f'};
66
char[] blue = {'b', 'l', 'u', 'e'};
@@ -12,6 +12,9 @@ public static void main(/*String[] args*/)
1212

1313
String tmp=buffer.toString();
1414
System.out.println(tmp);
15-
assert(!tmp.equals("diffblue"));
15+
if(b)
16+
assert(tmp.equals("diffblue"));
17+
else
18+
assert(!tmp.equals("diffblue"));
1619
}
1720
}

‎regression/jbmc-strings/java_char_array_init/test.desc

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ test_init.class
33
--refine-strings --string-max-length 1000
44
^EXIT=10$
55
^SIGNAL=0$
6-
^\[.*assertion.1\].* line 14.* FAILURE$
6+
assertion.* file test_init.java line 31 .* SUCCESS$
7+
assertion.* file test_init.java line 33 .* SUCCESS$
8+
assertion.* file test_init.java line 35 .* FAILURE$
9+
assertion.* file test_init.java line 37 .* FAILURE$
710
--

‎regression/jbmc-strings/java_char_array_init/test_init.class

512 Bytes
Binary file not shown.

‎regression/jbmc-strings/java_char_array_init/test_init.java

+36-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,39 @@
1-
public class test_init {
1+
public class test_init
2+
{
3+
// These are models for the constructors of strings from char arrays
4+
public static String stringOfCharArray(char arr[])
5+
{
6+
// We give an arbitrary limit on the size of arrays
7+
assert(arr.length<11);
8+
StringBuilder sb=new StringBuilder("");
9+
for(int i=0; i<arr.length && i<11; i++)
10+
sb.append(arr[i]);
11+
return sb.toString();
12+
}
213

3-
public static void main(/*String[] argv*/)
4-
{
5-
char [] str = new char[10];
6-
str[0] = 'H';
7-
str[1] = 'e';
8-
str[2] = 'l';
9-
str[3] = 'l';
10-
str[4] = 'o';
11-
String s = new String(str);
12-
String t = new String(str,1,2);
14+
public static String stringOfCharArray(char arr[], int i, int j)
15+
{
16+
return stringOfCharArray(arr).substring(i, i+j);
17+
}
1318

14-
assert(s.length() != 10 ||
15-
!t.equals("el") ||
16-
!s.startsWith("Hello"));
17-
}
19+
public static void main(int i)
20+
{
21+
char [] str = new char[10];
22+
str[0] = 'H';
23+
str[1] = 'e';
24+
str[2] = 'l';
25+
str[3] = 'l';
26+
str[4] = 'o';
27+
String s = stringOfCharArray(str);
28+
String t = stringOfCharArray(str,1,2);
29+
30+
if(i==0)
31+
assert(s.startsWith("Hello"));
32+
else if(i==1)
33+
assert(t.equals("el"));
34+
else if(i==2)
35+
assert(!s.startsWith("Hello"));
36+
else
37+
assert(!t.equals("el"));
38+
}
1839
}

‎regression/jbmc-strings/java_insert_char_array/test.desc

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ test_insert_char_array.class
33
--refine-strings --string-max-length 1000
44
^EXIT=10$
55
^SIGNAL=0$
6-
^\[.*assertion\.1\].* line 12.* FAILURE$
6+
assertion.* line 28.* SUCCESS$
7+
assertion.* line 30.* FAILURE$
78
--

‎regression/jbmc-strings/java_insert_char_array/test_insert_char_array.class

381 Bytes
Binary file not shown.

‎regression/jbmc-strings/java_insert_char_array/test_insert_char_array.java

+27-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
public class test_insert_char_array
22
{
3-
public static void main(/*String[] argv*/)
4-
{
5-
StringBuilder sb = new StringBuilder("ad");
6-
char[] array = new char[2];
7-
array[0] = 'b';
8-
array[1] = 'c';
9-
sb.insert(1, array);
10-
String s = sb.toString();
11-
System.out.println(s);
12-
assert(!s.equals("abcd"));
13-
}
3+
// These are models of the String methods manipulating char arrays
4+
public static String stringOfCharArray(char arr[])
5+
{
6+
StringBuilder sb=new StringBuilder("");
7+
for(int i=0; i<arr.length; i++)
8+
sb.append(arr[i]);
9+
return sb.toString();
10+
}
11+
public static void insert(StringBuilder sb, int pos, char arr[])
12+
{
13+
String s=stringOfCharArray(arr);
14+
sb.insert(pos, s);
15+
}
16+
public static void main(int i)
17+
{
18+
StringBuilder sb = new StringBuilder("ad");
19+
char[] array = new char[2];
20+
array[0] = 'b';
21+
array[1] = 'c';
22+
insert(sb, 1, array);
23+
String s = sb.toString();
24+
System.out.println(s);
25+
if(i==0)
26+
assert(s.equals("abcd"));
27+
else
28+
assert(!s.equals("abcd"));
29+
}
1430
}

‎regression/strings-smoke-tests/java_append_char/test.desc

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
CORE
22
test_append_char.class
33
--refine-strings --string-max-length 1000
4-
^EXIT=0$
4+
^EXIT=10$
55
^SIGNAL=0$
6-
^VERIFICATION SUCCESSFUL$
6+
assertion.* file test_append_char.java line 23 .* SUCCESS
7+
assertion.* file test_append_char.java line 25 .* FAILURE
78
--

‎regression/strings-smoke-tests/java_append_char/test_append_char.class

331 Bytes
Binary file not shown.

‎regression/strings-smoke-tests/java_append_char/test_append_char.java

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
public class test_append_char
22
{
3-
public static void main(/*String[] args*/)
4-
{
5-
char[] diff = {'d', 'i', 'f', 'f'};
6-
char[] blue = {'b', 'l', 'u', 'e'};
3+
public static String ofCharArray(char arr[])
4+
{
5+
StringBuilder sb = new StringBuilder("");
6+
for(int i = 0; i < arr.length; i++)
7+
sb.append(arr[i]);
8+
return sb.toString();
9+
}
10+
public static void main(String[] args)
11+
{
12+
char[] diff = {'d', 'i', 'f', 'f'};
13+
char[] blue = {'b', 'l', 'u', 'e'};
714

8-
StringBuilder buffer = new StringBuilder();
15+
StringBuilder buffer = new StringBuilder();
916

10-
buffer.append(diff)
11-
.append(blue);
17+
buffer.append(ofCharArray(diff))
18+
.append(ofCharArray(blue));
1219

13-
String tmp=buffer.toString();
14-
System.out.println(tmp);
15-
assert tmp.equals("diffblue");
16-
}
20+
String tmp=buffer.toString();
21+
System.out.println(tmp);
22+
if(args.length == 0)
23+
assert tmp.equals("diffblue");
24+
else
25+
assert !tmp.equals("diffblue");
26+
}
1727
}

‎regression/strings-smoke-tests/java_append_string/test_append_string.class

496 Bytes
Binary file not shown.

‎regression/strings-smoke-tests/java_append_string/test_append_string.java

+26-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
public class test_append_string
22
{
3-
public static void main(/*String[] args*/)
4-
{
5-
String di = new String("di");
6-
StringBuilder diff = new StringBuilder();
7-
diff.append(di);
8-
diff.append("ff");
9-
System.out.println(diff);
10-
String s = diff.toString();
11-
System.out.println(s);
12-
assert s.equals("diff");
13-
}
3+
public static void main()
4+
{
5+
String di = new String("di");
6+
StringBuilder diff = new StringBuilder();
7+
diff.append(di);
8+
diff.append("ff");
9+
System.out.println(diff);
10+
String s = diff.toString();
11+
System.out.println(s);
12+
assert s.equals("diff");
13+
}
14+
15+
public static void check(StringBuilder sb, String str)
16+
{
17+
String init = sb.toString();
18+
if(str.length() >= 4)
19+
{
20+
sb.append(str, 2, 4);
21+
String res = sb.toString();
22+
assert(res.startsWith(init));
23+
assert(res.endsWith(str.substring(2, 4)));
24+
assert(res.length() == init.length() + 2);
25+
assert(!res.equals("foobarfuz"));
26+
}
27+
}
28+
1429
}

‎regression/strings-smoke-tests/java_append_string/test_substring.desc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CORE
2+
test_append_string.class
3+
--refine-strings --string-max-length 10 --function test_append_string.check --java-assume-inputs-non-null
4+
^EXIT=10$
5+
^SIGNAL=0$
6+
^\[.*assertion.*\].* line 22.* SUCCESS$
7+
^\[.*assertion.*\].* line 23.* SUCCESS$
8+
^\[.*assertion.*\].* line 24.* SUCCESS$
9+
^\[.*assertion.*\].* line 25.* FAILURE$
10+
--

‎regression/strings-smoke-tests/java_char_array/test.desc

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ test_char_array.class
33
--refine-strings --string-max-length 1000
44
^EXIT=10$
55
^SIGNAL=0$
6-
.*assertion.* test_char_array.java line 9 .* SUCCESS$
7-
.*assertion.* test_char_array.java line 10 .* SUCCESS$
8-
.*assertion.* test_char_array.java line 11 .* SUCCESS$
9-
.*assertion.* test_char_array.java line 13 .* FAILURE$
10-
.*assertion.* test_char_array.java line 15 .* FAILURE$
11-
.*assertion.* test_char_array.java line 17 .* FAILURE$
6+
.*assertion.* test_char_array.java line 7 .* SUCCESS$
7+
.*assertion.* test_char_array.java line 21 .* SUCCESS$
8+
.*assertion.* test_char_array.java line 22 .* SUCCESS$
9+
.*assertion.* test_char_array.java line 23 .* SUCCESS$
10+
.*assertion.* test_char_array.java line 25 .* FAILURE$
11+
.*assertion.* test_char_array.java line 27 .* FAILURE$
12+
.*assertion.* test_char_array.java line 29 .* FAILURE$
1213
^VERIFICATION FAILED$
1314
--

‎regression/strings-smoke-tests/java_char_array/test_char_array.class

186 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)