Browse Source

Updated outdated regression tests for explicit origin paths.

David Piuva 2 years ago
parent
commit
006df89f18
2 changed files with 11 additions and 9 deletions
  1. 3 1
      Source/test/tests/FlexTest.cpp
  2. 8 8
      Source/test/tests/PersistentTest.cpp

+ 3 - 1
Source/test/tests/FlexTest.cpp

@@ -8,7 +8,9 @@ START_TEST(Flex)
 	ASSERT_EQUAL(FlexValue(346, -54), FlexValue(100, -54)); // Limited to 100%
 	ASSERT_EQUAL(FlexValue(346, -54), FlexValue(100, -54)); // Limited to 100%
 	ASSERT_NOT_EQUAL(FlexValue(67, 34), FlexValue(57, 34));
 	ASSERT_NOT_EQUAL(FlexValue(67, 34), FlexValue(57, 34));
 	ASSERT_NOT_EQUAL(FlexValue(14, 24), FlexValue(14, 84));
 	ASSERT_NOT_EQUAL(FlexValue(14, 24), FlexValue(14, 84));
-	ASSERT_EQUAL(FlexValue(U"67%+34"), FlexValue(67, 34));
+	FlexValue a;
+	a.assignValue(U"67%+34", U"");
+	ASSERT_EQUAL(a, FlexValue(67, 34));
 	ASSERT_MATCH(FlexValue(67, 34).toString(), U"67%+34");
 	ASSERT_MATCH(FlexValue(67, 34).toString(), U"67%+34");
 END_TEST
 END_TEST
 
 

+ 8 - 8
Source/test/tests/PersistentTest.cpp

@@ -134,7 +134,7 @@ START_TEST(Persistent)
 	ASSERT_MATCH(myText, exampleOne);
 	ASSERT_MATCH(myText, exampleOne);
 
 
 	// MyClass from text
 	// MyClass from text
-	std::shared_ptr<Persistent> myObjectCopy = createPersistentClassFromText(myText);
+	std::shared_ptr<Persistent> myObjectCopy = createPersistentClassFromText(myText, U"");
 	ASSERT_MATCH(myObjectCopy->toString(), myText);
 	ASSERT_MATCH(myObjectCopy->toString(), myText);
 
 
 	// MySubClass to text
 	// MySubClass to text
@@ -143,7 +143,7 @@ START_TEST(Persistent)
 	ASSERT_MATCH(MySubText, exampleTwo);
 	ASSERT_MATCH(MySubText, exampleTwo);
 
 
 	// MySubClass from text
 	// MySubClass from text
-	std::shared_ptr<Persistent> mySubObjectCopy = createPersistentClassFromText(MySubText);
+	std::shared_ptr<Persistent> mySubObjectCopy = createPersistentClassFromText(MySubText, U"");
 	ASSERT_MATCH(mySubObjectCopy->toString(), MySubText);
 	ASSERT_MATCH(mySubObjectCopy->toString(), MySubText);
 
 
 	// Tree structure to text
 	// Tree structure to text
@@ -156,7 +156,7 @@ START_TEST(Persistent)
 	ASSERT_MATCH(tree.toString(), exampleThree);
 	ASSERT_MATCH(tree.toString(), exampleThree);
 
 
 	// Tree structure from text
 	// Tree structure from text
-	std::shared_ptr<Persistent> treeCopy = createPersistentClassFromText(exampleThree);
+	std::shared_ptr<Persistent> treeCopy = createPersistentClassFromText(exampleThree, U"");
 	ASSERT_MATCH(treeCopy->toString(), exampleThree);
 	ASSERT_MATCH(treeCopy->toString(), exampleThree);
 
 
 	// Persistent string lists
 	// Persistent string lists
@@ -164,27 +164,27 @@ START_TEST(Persistent)
 	ASSERT_EQUAL(myList.value.length(), 0);
 	ASSERT_EQUAL(myList.value.length(), 0);
 	ASSERT_MATCH(myList.toString(), U"");
 	ASSERT_MATCH(myList.toString(), U"");
 
 
-	myList = PersistentStringList(U"\"\"");
+	myList = PersistentStringList(U"\"\"", U"");
 	ASSERT_EQUAL(myList.value.length(), 1);
 	ASSERT_EQUAL(myList.value.length(), 1);
 	ASSERT_MATCH(myList.value[0], U"");
 	ASSERT_MATCH(myList.value[0], U"");
 	ASSERT_MATCH(myList.toString(), U"\"\"");
 	ASSERT_MATCH(myList.toString(), U"\"\"");
 
 
-	myList = PersistentStringList(U"\"A\", \"B\"");
+	myList = PersistentStringList(U"\"A\", \"B\"", U"");
 	ASSERT_EQUAL(myList.value.length(), 2);
 	ASSERT_EQUAL(myList.value.length(), 2);
 	ASSERT_MATCH(myList.value[0], U"A");
 	ASSERT_MATCH(myList.value[0], U"A");
 	ASSERT_MATCH(myList.value[1], U"B");
 	ASSERT_MATCH(myList.value[1], U"B");
 	ASSERT_MATCH(myList.toString(), U"\"A\", \"B\"");
 	ASSERT_MATCH(myList.toString(), U"\"A\", \"B\"");
 
 
-	myList.assignValue(U"\"Only element\"");
+	myList.assignValue(U"\"Only element\"", U"");
 	ASSERT_EQUAL(myList.value.length(), 1);
 	ASSERT_EQUAL(myList.value.length(), 1);
 	ASSERT_MATCH(myList.value[0], U"Only element");
 	ASSERT_MATCH(myList.value[0], U"Only element");
 	ASSERT_MATCH(myList.toString(), U"\"Only element\"");
 	ASSERT_MATCH(myList.toString(), U"\"Only element\"");
 
 
-	myList = PersistentStringList(U"");
+	myList = PersistentStringList(U"", U"");
 	ASSERT_EQUAL(myList.value.length(), 0);
 	ASSERT_EQUAL(myList.value.length(), 0);
 	ASSERT_MATCH(myList.toString(), U"");
 	ASSERT_MATCH(myList.toString(), U"");
 
 
-	myList.assignValue(U"\"Zero 0\", \"One 1\", \"Two 2\", \"Three 3\"");
+	myList.assignValue(U"\"Zero 0\", \"One 1\", \"Two 2\", \"Three 3\"", U"");
 	ASSERT_EQUAL(myList.value.length(), 4);
 	ASSERT_EQUAL(myList.value.length(), 4);
 	ASSERT_MATCH(myList.value[0], U"Zero 0");
 	ASSERT_MATCH(myList.value[0], U"Zero 0");
 	ASSERT_MATCH(myList.value[1], U"One 1");
 	ASSERT_MATCH(myList.value[1], U"One 1");