From 939fb876622b320ef4ae2d6a0239912fee4ecc96 Mon Sep 17 00:00:00 2001 From: Jesse Sigal Date: Mon, 3 Jul 2017 11:44:12 +0100 Subject: [PATCH] Added regression tests based on originating test-gen tests The relevant tests implemented in diffblue/test-gen/pull/479 (StringContains3 and StringContains4) for test-gen have been adapted and added as StringContains01 and StringContains02 resp. They have been marked as future in accordance to the standard for other tests. A contains smoke test already exists and is active, which was extended. --- .../strings-smoke-tests/java_contains/test.desc | 6 +++++- .../java_contains/test_contains.class | Bin 689 -> 825 bytes .../java_contains/test_contains.java | 9 ++++++--- regression/strings/StringContains01/test.class | Bin 0 -> 618 bytes regression/strings/StringContains01/test.desc | 6 ++++++ regression/strings/StringContains01/test.java | 8 ++++++++ regression/strings/StringContains02/test.class | Bin 0 -> 606 bytes regression/strings/StringContains02/test.desc | 6 ++++++ regression/strings/StringContains02/test.java | 7 +++++++ 9 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 regression/strings/StringContains01/test.class create mode 100644 regression/strings/StringContains01/test.desc create mode 100644 regression/strings/StringContains01/test.java create mode 100644 regression/strings/StringContains02/test.class create mode 100644 regression/strings/StringContains02/test.desc create mode 100644 regression/strings/StringContains02/test.java diff --git a/regression/strings-smoke-tests/java_contains/test.desc b/regression/strings-smoke-tests/java_contains/test.desc index 0c10fd4de9..e0ca4731a4 100644 --- a/regression/strings-smoke-tests/java_contains/test.desc +++ b/regression/strings-smoke-tests/java_contains/test.desc @@ -1,8 +1,12 @@ CORE test_contains.class --refine-strings -^EXIT=0$ +^EXIT=10$ ^SIGNAL=0$ ^\[.*assertion.1\].* line 8.* SUCCESS$ +^\[.*assertion.2\].* line 9.* SUCCESS$ +^\[.*assertion.3\].* line 12.* FAILURE$ +^\[.*assertion.4\].* line 13.* FAILURE$ +^VERIFICATION FAILED$ -- Issue: diffblue/test-gen#201 diff --git a/regression/strings-smoke-tests/java_contains/test_contains.class b/regression/strings-smoke-tests/java_contains/test_contains.class index 989f5f04279074c7c827f6aec6cb3100ff201b36..078a8565a353a343b0fb50fbfaac5235f1df0516 100644 GIT binary patch literal 825 zcmZ8eU2hUW6g>kAyDUpfm$E`Xto;z7l%h$WEHO4{6BAk=FedFwv%8FRE8W%I#W(#Q z@@(R>nm}R`efQDdV;b+QrAU*>%-lQo+>>iWpWD+)=Qa zf`&B_uglm_k;0M)?#d{sxQDWg3PWzg3KJT`b{giOGh}bJCRTfvEnW?Vm}S#uS{i1N z)v$>wLt%p08w-5u`<}013pJuOHA}{}hC1#~O?qyfaXTcsV@3>%|BGy%ntq$V?Q_@W zyA|PBkGtLQG;-`2Sv8^1?2*e1Mu!KE&pX$Q$eXZF4`lH%R_VKD=s#JuAcW8@4kq-| zo}*})PDW>9a|HH96k?wCWRzs|y?GdP7p1=mnxON;1!6~fd<3bbCl2)F;aA85ak zCF2@GKo_lat)-hPqJT8_C1NeMO6l*OO#|3{;m8UROn_9qIhk^PNW%_)3qTo1IW^6 YNbzrwCnLwUh?WV&w8z4{g^1DOU(~gs!~g&Q delta 454 zcmY*VO-lk%6g_Xo@s0CQGh>-)_MN5{LfA5>wk9oX<0{?^BAQs_(4tL0pq03D)3UV% zN(r^^M@e_Agy3=R=Q;P@_ZA)~M_-fo4**5%YcP@ENUB)TAR(nvu#Fv#boaDmn-yPpS7mW?A>3At_}yXQ(1OiiHN~AMv_!jJsQ9;ycAY^!aXkYT zG7OUI5eV179Oez|BHK%_WS+tFYaRd6yKeiU(e7~M4CJx*Pww1p);z!anCR76w)eyi z9&}nBU{*X(BTohqU=unNrN}a}N^S%;2pSP33{R7cj#`+tdPJ3}mKj5;I`RmilB1kC z;qnW3AJJTX2(=G=j7W6^?K2RQ5WOc8gF>i4BV7}m#;Zuv?=4bx4s3!nN9^ZOWob6C lINbuU9eoI+4<33(NPY$X)h7DiqJfkG$v6(qiBlk9`5ST;KIs4e diff --git a/regression/strings-smoke-tests/java_contains/test_contains.java b/regression/strings-smoke-tests/java_contains/test_contains.java index fb585a2f0e..f385c0593d 100644 --- a/regression/strings-smoke-tests/java_contains/test_contains.java +++ b/regression/strings-smoke-tests/java_contains/test_contains.java @@ -1,12 +1,15 @@ public class test_contains { - public static void main(/*String[] argv*/) + public static void main(String x) { String s = new String("Abc"); String u = "bc"; String t = "ab"; assert(s.contains(u)); - // Long version: - // assert(s.contains(t)); + assert(!s.contains(t)); + + String z = new String(x); + if (z.length() > 3) assert(t.contains(z)); + else assert(z.contains(u)); } } diff --git a/regression/strings/StringContains01/test.class b/regression/strings/StringContains01/test.class new file mode 100644 index 0000000000000000000000000000000000000000..ce12a0ee4702ada48f472f2a0f9293bb9faf9f38 GIT binary patch literal 618 zcmY*WOHUgy5dJ2c#L2RdkQ7Lu(9+WKs6;N@KnRqAdPv(ts!HYNY%FRTcERiLWAX=j zE=VAOMDP7g2r*tBDY7&k+cV!|{O|Vi8o(MBeH1ZOK&=RYx{qnh2)y)>!<4|Rk2$;& zculA-$Rtt5>NrY1>O^*Ws!O0fLViO>+HMlOrRDF0Y%}gELaC)A^`(Ep-5!Mo&ijjkYy9+Fy5lqirk0U!UbsS}rh8C~Sni2W-C`_f4pFwL>aemDp8> z5+J}RGs{jGz{d!;1$cwEgxZi~`%(CgF|lDGu3cauz&pGrl!ujHI|nMX&#vwjvX(H8 zEE`A&Gygki{*W7tcWCs|z zLhi=}@_$`_ChZ?%8V2QiD!ENIQ#i2f!t8_}lRw~D zt%548(z`#(vS$T?m+qeK*RNmq{QmR(CxC6NhNz-hg+MDnJH!lT1?EEdXbLE?h{R z5~kM<&g8Y+N@RMv)wM>ar#r51ylZ8A{$5_*!Gqm6xg!p{*}%kVUptzrRk_`C6cHkf zM+h-S@ZYH<$pjW6EaC;BJ(}_6UiVvLGQ&C?fxuFPWvmeDBjjQ4OvU!U)IWiQAkI?D z`g6kE;{`gOr0J@wfl6bwv(DG3jp#ZFpN!D#t6Uq^f6&2;+5s2%UMH+p@CN`?Z@W!6 zDuLW$Y@hIJo;|VmH*P^+91u0Ol_JU4KphhtJLpSzMYjDF-Vjq8jnWOuLyY}^|M3=; zU#{CLx