Skip to content

Commit ef610b3

Browse files
Use CProverString functions in strings-smoke-tests
We replace calls to charAt/substring by corresponding CProverString functions.
1 parent 5c716c1 commit ef610b3

File tree

14 files changed

+12
-12
lines changed

14 files changed

+12
-12
lines changed
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void check(StringBuilder sb, String str)
2020
sb.append(str, 2, 4);
2121
String res = sb.toString();
2222
assert(res.startsWith(init));
23-
assert(res.endsWith(str.substring(2, 4)));
23+
assert(res.endsWith(org.cprover.CProverString.substring(str, 2, 4)));
2424
assert(res.length() == init.length() + 2);
2525
assert(!res.equals("foobarfuz"));
2626
}
Binary file not shown.

regression/strings-smoke-tests/java_char_array/test_char_array.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public static char[] toCharArray(String s)
88
char arr[] = new char[s.length()];
99
// We limit arbitrarly the loop unfolding to 5
1010
for(int i = 0; i < length && i < 5; i++)
11-
arr[i] = s.charAt(i);
11+
arr[i] = org.cprover.CProverString.charAt(s, i);
1212
return arr;
1313
}
1414

@@ -17,7 +17,7 @@ public static void main(int i)
1717
String s = "abc";
1818
char [] str = toCharArray(s);
1919
char c = str[2];
20-
char a = s.charAt(0);
20+
char a = org.cprover.CProverString.charAt(s, 0);
2121
assert(str.length == 3);
2222
assert(a == 'a');
2323
assert(c == 'c');
Binary file not shown.

regression/strings-smoke-tests/java_char_at/test_char_at.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ public class test_char_at {
22

33
public static void main(/*String[] argv*/) {
44
String s = new String("abc");
5-
assert(s.charAt(2)=='c');
5+
assert(org.cprover.CProverString.charAt(s, 2)=='c');
66
}
77
}
Binary file not shown.

regression/strings-smoke-tests/java_code_point/test_code_point.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public static void main(/*String[] argv*/)
99
assert(s.offsetByCodePoints(1,2) >= 3);
1010
StringBuilder sb = new StringBuilder();
1111
sb.appendCodePoint(0x10907);
12-
assert(s.charAt(1) == sb.charAt(0));
12+
assert(org.cprover.CProverString.charAt(s, 1) == org.cprover.CProverString.charAt(sb.toString(), 0));
1313
}
1414
}
Binary file not shown.

regression/strings-smoke-tests/java_concat/test_concat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public static void main(/*String[] argv*/)
66
int i = s.length();
77
String t = new String("ppo");
88
String u = s.concat(t);
9-
char c = u.charAt(i);
9+
char c = org.cprover.CProverString.charAt(u, i);
1010
assert(c == 'p');
1111
assert(c == 'o');
1212
}
Binary file not shown.

regression/strings-smoke-tests/java_set_char_at/test_set_char_at.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ public class test_set_char_at
33
public static void main(/*String[] argv*/)
44
{
55
String s = new String("Abc");
6-
char c = s.charAt(1);
6+
char c = org.cprover.CProverString.charAt(s, 1);
77
StringBuilder sb = new StringBuilder(s);
88
sb.setCharAt(1,'w');
99
s = sb.toString();
1010
assert(s.equals("Awc"));
11-
assert(s.charAt(2)=='c');
11+
assert(org.cprover.CProverString.charAt(s, 2)=='c');
1212
}
1313
}
Binary file not shown.

regression/strings-smoke-tests/java_substring/test_substring.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ public class test_substring
33
public static void main(/*String[] argv*/)
44
{
55
String abcdef = "AbcDef";
6-
String cde = abcdef.substring(2,5);
7-
char c = cde.charAt(0);
8-
char d = cde.charAt(1);
9-
char e = cde.charAt(2);
6+
String cde = org.cprover.CProverString.substring(abcdef, 2,5);
7+
char c = org.cprover.CProverString.charAt(cde, 0);
8+
char d = org.cprover.CProverString.charAt(cde, 1);
9+
char e = org.cprover.CProverString.charAt(cde, 2);
1010
assert(c == 'c');
1111
assert(d == 'D');
1212
assert(e == 'e');

0 commit comments

Comments
 (0)