symbol_text refactored

test/unit_test/static/CMakeLists.txt

@@ -28,12 +28,12 @@ add_library(unit_tests_static
     dimension_op_test.cpp
     dimensions_concepts_test.cpp
     fixed_string_test.cpp
-    fixed_symbol_test.cpp
     math_test.cpp
     quantity_test.cpp
     ratio_test.cpp
     si_test.cpp
     si_cgs_test.cpp
+    symbol_text_test.cpp
     type_list_test.cpp
     unit_test.cpp
     us_test.cpp

test/unit_test/static/cgs_test.cpp

@@ -62,7 +62,7 @@ static_assert(std::is_same_v<ratio_divide<centimetre::ratio, dimension_unit<dim_
 static_assert(1q_cm * 1q_cm == 1q_cm2);
 static_assert(100q_cm2 / 10q_cm == 10q_cm);
 
-static_assert(detail::unit_text<dim_area, square_centimetre>() == "cm²");
+static_assert(detail::unit_text<dim_area, square_centimetre>() == basic_symbol_text("cm²", "cm^2"));
 
 /* ************** DERIVED DIMENSIONS WITH NAMED UNITS **************** */
 

test/unit_test/static/si_test.cpp

@@ -86,7 +86,7 @@ static_assert(1q_d == 24q_h);
 static_assert(1q_d == 86'400q_s);
 
 static_assert(nanosecond::symbol == "ns");
-static_assert(microsecond::symbol == "µs");
+static_assert(microsecond::symbol == basic_symbol_text("µs", "us"));
 static_assert(millisecond::symbol == "ms");
 
 // current
@@ -219,7 +219,7 @@ static_assert(10q_m_per_s / 10q_s == 1q_m_per_s2);
 static_assert(10q_m_per_s / 1q_m_per_s2 == 10q_s);
 static_assert(1q_m_per_s2 * 10q_s == 10q_m_per_s);
 
-static_assert(detail::unit_text<dim_acceleration, metre_per_second_sq>() == "m/s²");
+static_assert(detail::unit_text<dim_acceleration, metre_per_second_sq>() == basic_symbol_text("m/s²", "m/s^2"));
 
 // area
 
@@ -229,7 +229,7 @@ static_assert(10q_km * 10q_km == 100q_km2);
 static_assert(1q_m2 == 10'000q_cm2);
 static_assert(1q_ha == 10'000q_m2);
 
-static_assert(detail::unit_text<dim_area, square_metre>() == "m²");
+static_assert(detail::unit_text<dim_area, square_metre>() == basic_symbol_text("m²", "m^2"));
 
 // volume
 
@@ -240,7 +240,7 @@ static_assert(1q_m3 == 1'000'000q_cm3);
 static_assert(1q_dm * 1q_dm * 1q_dm == 1q_l);
 static_assert(1000q_l == 1q_m3);
 
-static_assert(detail::unit_text<dim_volume, cubic_metre>() == "m³");
+static_assert(detail::unit_text<dim_volume, cubic_metre>() == basic_symbol_text("m³", "m^3"));
 
 /* ************** DERIVED DIMENSIONS IN TERMS OF OTHER UNITS **************** */
 

test/unit_test/static/symbol_text_test.cpp

@@ -1,3 +1,25 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Mateusz Pusz
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 #include "units/symbol_text.h"
 
 using namespace units;
@@ -7,7 +29,7 @@ namespace {
 constexpr basic_symbol_text sym1('b');
 static_assert(sym1 == 'b');
 static_assert(sym1 != 'a');
-static_assert(sym1 != "ab");
+static_assert(sym1 != basic_symbol_text("ab"));
 static_assert(sym1 < 'c');
 static_assert(sym1 > 'a');
 static_assert(sym1 <= 'b');
@@ -18,7 +40,7 @@ static_assert(sym1.standard() == 'b');
 static_assert(sym1.ascii() == 'b');
 
 constexpr basic_symbol_text sym2('a', 'b');
-static_assert(sym2 == 'a');
+static_assert(sym2 == basic_symbol_text('a', 'b'));
 static_assert(sym2 != 'b');
 static_assert(sym2.standard() == 'a');
 static_assert(sym2.ascii() == 'b');
@@ -45,29 +67,12 @@ static_assert(sym6 == basic_symbol_text("bc", "de"));
 static_assert(sym6 != basic_symbol_text("fg", "hi"));
 static_assert(sym6 != basic_symbol_text("bcd", "ef"));
 
-static_assert(sym6 == basic_fixed_string("bc"));
-static_assert(sym6 != basic_fixed_string("de"));
-static_assert(sym6 != basic_fixed_string("fg"));
-static_assert(sym6 != basic_fixed_string("bcd"));
-
-static_assert(sym6 == "bc");
-static_assert(sym6 != "de");
-static_assert(sym6 != "fg");
-static_assert(sym6 != "bcd");
-
-static_assert(sym6 < basic_fixed_string("c"));
-static_assert(sym6 > basic_fixed_string("a"));
-static_assert(sym6 <= basic_fixed_string("c"));
-static_assert(sym6 <= basic_fixed_string("bcd"));
-static_assert(sym6 >= basic_fixed_string("a"));
-static_assert(sym6 >= basic_fixed_string("bc"));
-
-static_assert(sym6 < "c");
-static_assert(sym6 > "a");
-static_assert(sym6 <= "c");
-static_assert(sym6 <= "bcd");
-static_assert(sym6 >= "a");
-static_assert(sym6 >= "bc");
+static_assert(sym6 < basic_symbol_text("c"));
+static_assert(sym6 > basic_symbol_text("a"));
+static_assert(sym6 <= basic_symbol_text("c"));
+static_assert(sym6 <= basic_symbol_text("bcd"));
+static_assert(sym6 >= basic_symbol_text("a"));
+static_assert(sym6 >= basic_symbol_text("bc"));
 
 static_assert(basic_symbol_text("a") + sym4 == basic_symbol_text("abc"));
 static_assert(sym4 + basic_symbol_text("f") == basic_symbol_text("bcf"));
@@ -86,4 +91,5 @@ static_assert(sym6 + basic_fixed_string("f") == basic_symbol_text("bcf", "def"))
 
 static_assert("a" + sym6 == basic_symbol_text("abc", "ade"));
 static_assert(sym6 + "f" == basic_symbol_text("bcf", "def"));
+
 }