Mercurial > hg > ucx / changeset

     1.1 --- a/test/test_string.cpp	Sun Oct 23 16:57:10 2022 +0200
     1.2 +++ b/test/test_string.cpp	Sun Oct 23 17:02:07 2022 +0200
     1.3 @@ -542,6 +542,7 @@
     1.4  }
     1.5  
     1.6  TEST(String, strreplace) {
     1.7 +    CxTestingAllocator alloc;
     1.8      cxstring str = CX_STR("test ababab string aba");
     1.9      cxstring longstr = CX_STR(
    1.10              "xyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacd");
    1.11 @@ -584,11 +585,11 @@
    1.12      cxmutstr replan10 = cx_strreplacen(astr, cx_str("a"), cx_str("x"), 10);
    1.13      auto an10expected = "xxxxxxxxxx";
    1.14  
    1.15 -    cxmutstr replcs1 = cx_strreplace(csstr, cx_str("AB"), cx_str("*"));
    1.16 -    auto cs1expected = "test * ab TEST xyz";
    1.17 +    cxmutstr repl1_a = cx_strreplace_a(&alloc, csstr, cx_str("AB"), cx_str("*"));
    1.18 +    auto expeced1_a = "test * ab TEST xyz";
    1.19  
    1.20 -    cxmutstr replcs2 = cx_strreplace(csstr, cx_str("test"), cx_str("TEST"));
    1.21 -    auto cs2expected = "TEST AB ab TEST xyz";
    1.22 +    cxmutstr repl2_a = cx_strreplace_a(&alloc, csstr, cx_str("test"), cx_str("TEST"));
    1.23 +    auto expected2_a = "TEST AB ab TEST xyz";
    1.24  
    1.25  
    1.26      EXPECT_NE(repl.ptr, str.ptr);
    1.27 @@ -616,10 +617,10 @@
    1.28      EXPECT_STREQ(replan9.ptr, an9expected);
    1.29      EXPECT_ZERO_TERMINATED(replan10);
    1.30      EXPECT_STREQ(replan10.ptr, an10expected);
    1.31 -    EXPECT_ZERO_TERMINATED(replcs1);
    1.32 -    EXPECT_STREQ(replcs1.ptr, cs1expected);
    1.33 -    EXPECT_ZERO_TERMINATED(replcs2);
    1.34 -    EXPECT_STREQ(replcs2.ptr, cs2expected);
    1.35 +    EXPECT_ZERO_TERMINATED(repl1_a);
    1.36 +    EXPECT_STREQ(repl1_a.ptr, expeced1_a);
    1.37 +    EXPECT_ZERO_TERMINATED(repl2_a);
    1.38 +    EXPECT_STREQ(repl2_a.ptr, expected2_a);
    1.39  
    1.40      cx_strfree(&repl);
    1.41      cx_strfree(&repln);
    1.42 @@ -633,8 +634,10 @@
    1.43      cx_strfree(&replan4);
    1.44      cx_strfree(&replan9);
    1.45      cx_strfree(&replan10);
    1.46 -    cx_strfree(&replcs1);
    1.47 -    cx_strfree(&replcs2);
    1.48 +
    1.49 +    cx_strfree_a(&alloc, &repl1_a);
    1.50 +    cx_strfree_a(&alloc, &repl2_a);
    1.51 +    EXPECT_TRUE(alloc.verify());
    1.52  }
    1.53  
    1.54  TEST(String, strupper) {