Changeset 4102 for trunk/test/utility.cc

Timestamp:

Sep 22, 2021, 9:50:18 AM (2 years ago)

Author:

Peter

Message:

add wrapper function that calls std::string::contains, ::starts_with, and ::ends_with, if available; otherwise use home-brewed code. Add autoconf tests that check if these functions are available in CXX.

File:

• trunk/test/utility.cc (modified) (4 diffs)

trunk/test/utility.cc

@@ -56 +56 @@
 void test_inverse(test::Suite&);
 
+void test_contains(test::Suite& suite);
 void test_dirname(test::Suite& suite);
+void test_ends_with(test::Suite& suite);
 void test_basename(test::Suite& suite);
 void test_fnmatch(test::Suite& suite);
@@ -64 +66 @@
 void test_rename(test::Suite& suite);
 void test_replace(test::Suite& suite);
+void test_starts_with(test::Suite& suite);
 void test_symlink(test::Suite& suite);
 
@@ -243 +246 @@
   test_symlink(suite);
   test_ticket842(suite);
+  test_starts_with(suite);
+  test_contains(suite);
+  test_ends_with(suite);
 
   return suite.return_value();
@@ -828 +834 @@
     suite.err() << "incorrect data[1].second: " << data[1].second << "\n";
 }
+
+
+void test_starts_with(test::Suite& suite)
+{
+  std::string name("Jane Doe");
+  if (!utility::starts_with(name, "Jane")) {
+    suite.add(false);
+    suite.err() << "error: 'Jane Doe' does not start with 'Jane'\n";
+  }
+  if (!utility::starts_with(name, 'J')) {
+    suite.add(false);
+    suite.err() << "error: starts_with(x,x) failed\n";
+  }
+  if (!utility::starts_with(name, name)) {
+    suite.add(false);
+    suite.err() << "error: starts_with(x,x) failed\n";
+  }
+}
+
+
+void test_contains(test::Suite& suite)
+{
+  std::string name("Jane Doe");
+  if (!utility::contains(name, "ne")) {
+    suite.add(false);
+    suite.err() << "error: " << name << " does not contain \"ne\"\n";
+  }
+  if (!utility::contains(name, name)) {
+    suite.add(false);
+    suite.err() << "error: contains(x,x) failed\n";
+  }
+  if (!utility::contains(name, 'D')) {
+    suite.add(false);
+    suite.err() << "error: contains(string,char) failed\n";
+  }
+}
+
+
+void test_ends_with(test::Suite& suite)
+{
+  std::string name("Jane Doe");
+  if (!utility::ends_with(name, name)) {
+    suite.add(false);
+    suite.err() << "error: ends_with(x,x) failed\n";
+  }
+  if (!utility::ends_with(name, 'e')) {
+    suite.add(false);
+    suite.err() << "error: ends_with(x,x) failed\n";
+  }
+  if (!utility::ends_with(name, "Doe")) {
+    suite.add(false);
+    suite.err() << "error: 'Jane Doe' does not end with 'Doe'\n";
+  }
+}