Require components be lower case and non-empty

Author: thk123

src/util/structured_data.cpp

@@ -11,27 +11,23 @@ Author: Thomas Kiley
 #include "string_utils.h"
 #include <algorithm>
 
-labelt::labelt(std::vector<std::string> components)
-{
-  auto to_lower_string = [](const std::string &s) -> std::string {
-    std::string lower_case = s;
-    std::for_each(
-      lower_case.begin(), lower_case.end(), [](char &c) { c = ::tolower(c); });
-    return lower_case;
-  };
-  this->components = make_range(components)
-                       .map(to_lower_string)
-                       .collect<std::vector<std::string>>();
+labelt::labelt(std::vector<std::string> components) : components(components)
+{
+  PRECONDITION(!components.empty());
+  PRECONDITION(std::all_of(
+    components.begin(), components.end(), [](const std::string &component) {
+      return !component.empty() &&
+             std::all_of(component.begin(), component.end(), [](const char &c) {
+               return !(::isalpha(c)) || ::islower(c);
+             });
+    }));
 }
 std::string labelt::camel_case() const
 {
   std::ostringstream output;
-  if(!components.empty())
-  {
-    output << *components.begin();
-    join_strings(
-      output, std::next(components.begin()), components.end(), "", capitalize);
-  }
+  output << *components.begin();
+  join_strings(
+    output, std::next(components.begin()), components.end(), "", capitalize);
   return output.str();
 }
 std::string labelt::snake_case() const
@@ -49,15 +45,12 @@ std::string labelt::kebab_case() const
 std::string labelt::pretty() const
 {
   std::ostringstream output;
-  if(!components.empty())
-  {
-    const auto range =
-      make_range(components.begin(), std::next(components.begin()))
-        .map(capitalize)
-        .concat(make_range(std::next(components.begin()), components.end()));
+  const auto range =
+    make_range(components.begin(), std::next(components.begin()))
+      .map(capitalize)
+      .concat(make_range(std::next(components.begin()), components.end()));
 
-    join_strings(output, range.begin(), range.end(), ' ');
-  }
+  join_strings(output, range.begin(), range.end(), ' ');
   return output.str();
 }
 bool labelt::operator<(const labelt &other) const

unit/util/structured_data.cpp

@@ -11,14 +11,8 @@ Author: Thomas Kiley
 
 TEST_CASE("label", "[core][util][structured_data][label]")
 {
-  SECTION("Empty label")
-  {
-    labelt empty_label({});
-    REQUIRE(empty_label.camel_case() == "");
-    REQUIRE(empty_label.kebab_case() == "");
-    REQUIRE(empty_label.snake_case() == "");
-    REQUIRE(empty_label.pretty() == "");
-  }
+  const cbmc_invariants_should_throwt invariant_throw_during_tests{};
+
   SECTION("Single element")
   {
     labelt empty_label({"hello"});
@@ -35,42 +29,36 @@ TEST_CASE("label", "[core][util][structured_data][label]")
     REQUIRE(empty_label.snake_case() == "hello_goodbye");
     REQUIRE(empty_label.pretty() == "Hello goodbye");
   }
-  SECTION("Odd casing elements")
+  SECTION("Valid labels")
   {
-    labelt empty_label({"HelLo", "Goodbye"});
-    REQUIRE(empty_label.camel_case() == "helloGoodbye");
-    REQUIRE(empty_label.kebab_case() == "hello-goodbye");
-    REQUIRE(empty_label.snake_case() == "hello_goodbye");
-    REQUIRE(empty_label.pretty() == "Hello goodbye");
+    labelt numbered_label({"hello", "1"});
+    REQUIRE(numbered_label.camel_case() == "hello1");
+    REQUIRE(numbered_label.kebab_case() == "hello-1");
+    REQUIRE(numbered_label.snake_case() == "hello_1");
+    REQUIRE(numbered_label.pretty() == "Hello 1");
+  }
+  SECTION("Invalid components")
+  {
+    REQUIRE_THROWS_AS(labelt{{}}, invariant_failedt);
+    std::vector<std::string> starts_with_upper{"Hello"};
+    REQUIRE_THROWS_AS(labelt{starts_with_upper}, invariant_failedt);
+    std::vector<std::string> contains_upper{"Hello"};
+    REQUIRE_THROWS_AS(labelt{contains_upper}, invariant_failedt);
+    REQUIRE_THROWS_AS(labelt{{""}}, invariant_failedt);
   }
 }
 
 TEST_CASE("Label equality", "[core][util][structured_data][label]")
 {
-  labelt empty_label({});
   labelt single_label({"a"});
-  labelt capital_label({"A"});
   labelt b_label({"b"});
   labelt multi_label({"b", "c", "d"});
   labelt multi_label2({"b", "d", "d"});
 
-  REQUIRE(empty_label < single_label);
-  REQUIRE(empty_label < capital_label);
-  REQUIRE(empty_label < b_label);
-  REQUIRE(empty_label < multi_label);
-  REQUIRE(empty_label < multi_label2);
-
-  REQUIRE_FALSE(single_label < capital_label);
-  REQUIRE_FALSE(capital_label < single_label);
-
   REQUIRE(single_label < b_label);
   REQUIRE(single_label < multi_label);
   REQUIRE(single_label < multi_label2);
 
-  REQUIRE(capital_label < b_label);
-  REQUIRE(capital_label < multi_label);
-  REQUIRE(capital_label < multi_label2);
-
   REQUIRE(b_label < multi_label);
   REQUIRE(b_label < multi_label2);