[[ cpptest ]] Expand lextable test to cover all the tables

livecodestephen · livecodestephen · commit 518e2406d757 · 2015-10-14T09:54:02.000+01:00
diff --git a/engine/src/lextable.cpp b/engine/src/lextable.cpp
@@ -2202,7 +2202,7 @@ static LT unit_table[] =
         {"codepoint", TT_UNDEFINED, FU_CODEPOINT},
         {"codepoints", TT_UNDEFINED, FU_CODEPOINT},
         {"codeunit", TT_UNDEFINED, FU_CODEUNIT},
-        {"codeunit", TT_UNDEFINED, FU_CODEUNIT},
+        {"codeunits", TT_UNDEFINED, FU_CODEUNIT},
         {"element", TT_UNDEFINED, FU_ELEMENT},
         {"int1", TT_UNDEFINED, FU_INT1},
         {"int1s", TT_UNDEFINED, FU_INT1},
@@ -2361,6 +2361,7 @@ LT *table_pointers[] =
     visual_table,
 	server_table
 };
+extern const uint4 table_pointers_size = ELEMENTS(table_pointers);
 
 uint2 table_sizes[] =
 {
@@ -2399,3 +2400,4 @@ uint2 table_sizes[] =
     ELEMENTS(visual_table),
 	ELEMENTS(server_table),
 };
+extern const uint4 table_sizes_size = ELEMENTS(table_sizes);
diff --git a/engine/test/test_lextable.cpp b/engine/test/test_lextable.cpp
@@ -20,21 +20,50 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "parsedef.h"
 #include "scriptpt.h"
 
+TEST(lextable, constant_table)
+//
+// Checks that the entries of constant_table are in alphabetical order.
+//
+{
+	extern Cvalue constant_table[];
+	extern const uint4 constant_table_size;
+
+	ASSERT_GE(constant_table_size, 1);
+
+	for(uint4 i = 0; i < constant_table_size - 1; i++) {
+		EXPECT_LT(strcmp(constant_table[i].token, constant_table[i+1].token), 0)
+			<< "\"" << constant_table[i+1].token << "\""
+			<< " comes before "
+			<< "\"" << constant_table[i].token << "\"";
+	}
+}
+
 
-TEST(lextable, factor_table)
+TEST(lextable, table_pointer)
 //
 // Checks that the entries of factor_table are in alphabetical order.
 //
 {
-	extern LT factor_table[];
-	extern const uint4 factor_table_size;
+	extern LT *table_pointers[];
+	extern const uint4 table_pointers_size;
 
-	ASSERT_GE(factor_table_size, 1);
+	extern uint2 table_sizes[];
+	extern const uint4 table_sizes_size;
 
-	for(uint4 i = 0; i < factor_table_size - 1; i++) {
-		EXPECT_LT(strcmp(factor_table[i].token, factor_table[i+1].token), 0)
-			<< "\"" << factor_table[i+1].token << "\""
-			<< " comes before "
-			<< "\"" << factor_table[i].token << "\"";
+	ASSERT_EQ(table_pointers_size, table_sizes_size);
+
+	for (uint4 i = 0; i < table_pointers_size; i++) {
+
+		LT* table = table_pointers[i];
+		const uint4 table_size = table_sizes[i];
+
+		ASSERT_GE(table_size, 1);
+
+		for (uint4 j = 0; j < table_size - 1; j++) {
+			EXPECT_LT(strcmp(table[j].token, table[j+1].token), 0)
+				<< "\"" << table[j+1].token << "\""
+				<< " comes before "
+				<< "\"" << table[j].token << "\"";
+		}
 	}
 }
