Improve visual tests suite.

Tests/Data/visual_tests_help.rml

@@ -19,7 +19,7 @@
 		font-size: 17px;
 		width: 700px;
 		margin: 0 auto;
-		padding-top: 50px;
+		padding-top: 30px;
 	}
 	p {
 		clear: both;
@@ -34,14 +34,15 @@
 	key, value {
 		display: block;
 		line-height: 1.5;
-		width: 46%;
 	}
 	key {
+		width: 40%;
 		float: left;
 		clear: both;
 		text-align: right;
 	}
 	value {
+		width: 52%;
 		float: right;
 		clear: right;
 	}
@@ -60,12 +61,13 @@
 <key>F8</key> <value>Open debugger</value>
 <key>Ctrl+G</key> <value>Go To test (followed by number, enter)</value>
 <key>Ctrl+F</key> <value>Filter tests</value>
+<key>Ctrl+R</key> <value>Reload test</value>
 <key>Ctrl+S</key> <value>View source of test</value>
 <key>Ctrl+Shift+S</key> <value>View source of reference</value>
-<key>Left Mouse Button on Link</key> <value>Copy link to clipboard</value>
+<key>Left Mouse Button on Link</key> <value>Copy link to clipboard (on supported platforms)</value>
 <key>F1</key> <value>Show / hide help</value>
 
-<p>Make sure to check the log output after comparisons and captures.</p>
+<p>Results of comparisons and captures are written to the log output.</p>
 
 <h1>Directories</h1>
 <key>Test suite(s)</key> <span id="test_directories"><value>C:\</value> <value>E:\</value> <value>D:\</value></span>

Tests/Source/VisualTests/CaptureScreen.cpp

@@ -159,12 +159,15 @@ ComparisonResult CompareScreenToPreviousCapture(ShellRenderInterfaceOpenGL* shel
 		for (int xb = 0; xb < wb_ref; xb++)
 		{
 			const int i_ref = yb_ref + xb;
-			diff.data[i_ref] = (Rml::byte)std::abs((int)data_ref[i_ref] - (int)screen.data[yb_screen + xb]);
+			Rml::byte pix_ref = data_ref[i_ref];
+			Rml::byte pix_screen = screen.data[yb_screen + xb];
+			diff.data[i_ref] = (Rml::byte)std::abs((int)pix_ref - (int)pix_screen);
 			sum_diff += (size_t)diff.data[i_ref];
 		}
 	}
 
 	ComparisonResult result;
+	result.skipped = false;
 	result.success = true;
 	result.is_equal = (sum_diff == 0);
 	result.absolute_difference_sum = sum_diff;
@@ -175,7 +178,13 @@ ComparisonResult CompareScreenToPreviousCapture(ShellRenderInterfaceOpenGL* shel
 	// Write the diff image to file if they are not equal.
 	if (!result.is_equal)
 	{
-		const Rml::String output_path = GetCaptureOutputDirectory() + "/diff-" + filename;
+		Rml::String out_filename = filename;
+		size_t offset = filename.rfind('.');
+		if (offset == Rml::String::npos)
+			offset = filename.size();
+		out_filename.insert(offset, "-diff");
+
+		const Rml::String output_path = GetCaptureOutputDirectory() + '/' + out_filename;
 		lodepng_result = lodepng_encode24_file(output_path.c_str(), diff.data.get(), diff.width, diff.height);
 		if (lodepng_result)
 		{

Tests/Source/VisualTests/CaptureScreen.h

@@ -34,6 +34,7 @@
 class ShellRenderInterfaceOpenGL;
 
 struct ComparisonResult {
+	bool skipped = true;
 	bool success = false;
 	bool is_equal = false;
 	double similarity_score = 0;

Tests/Source/VisualTests/TestNavigator.cpp

@@ -87,7 +87,9 @@ void TestNavigator::Update()
 			}
 			else if (iteration_state == IterationState::Comparison)
 			{
-				comparison_results.push_back(CompareCurrentView());
+				RMLUI_ASSERT((int)comparison_results.size() == CurrentSuite().GetNumTests());
+				int test_index = CurrentSuite().GetIndex();
+				comparison_results[test_index] = CompareCurrentView();
 			}
 
 			iteration_index += 1;
@@ -156,6 +158,12 @@ void TestNavigator::ProcessEvent(Rml::Event& event)
 		else if (key_identifier == Rml::Input::KI_F && key_ctrl)
 		{
 			element_filter_input->Focus();
+			context->ProcessKeyDown(Rml::Input::KI_A, Rml::Input::KeyModifier::KM_CTRL);
+			context->ProcessKeyUp(Rml::Input::KI_A, Rml::Input::KeyModifier::KM_CTRL);
+		}
+		else if (key_identifier == Rml::Input::KI_R && key_ctrl)
+		{
+			LoadActiveTest();
 		}
 		else if (key_identifier == Rml::Input::KI_S && key_ctrl)
 		{
@@ -354,10 +362,14 @@ void TestNavigator::StartTestSuiteIteration(IterationState new_iteration_state)
 
 	source_state = SourceType::None;
 
+	TestSuite& suite = CurrentSuite();
+
 	if (new_iteration_state == IterationState::Comparison)
+	{
 		comparison_results.clear();
+		comparison_results.resize(suite.GetNumTests());
+	}
 
-	TestSuite& suite = CurrentSuite();
 	iteration_initial_index = suite.GetIndex();
 	iteration_wait_frames = iteration_wait_frame_count;
 
@@ -406,7 +418,7 @@ void TestNavigator::StopTestSuiteIteration()
 	}
 	else if (iteration_state == IterationState::Comparison)
 	{
-		RMLUI_ASSERT(iteration_index == (int)comparison_results.size());
+		RMLUI_ASSERT(num_tests == (int)comparison_results.size());
 
 		// Indices
 		Rml::Vector<int> equal;
@@ -418,15 +430,15 @@ void TestNavigator::StopTestSuiteIteration()
 		{
 			const ComparisonResult& comparison = comparison_results[i];
 
-			if (!comparison.success)
+			if (comparison.skipped)
+				skipped.push_back(i);
+			else if (!comparison.success)
 				failed.push_back(i);
 			else if (comparison.is_equal)
 				equal.push_back(i);
 			else
 				not_equal.push_back(i);
 		}
-		for (int i = (int)comparison_results.size(); i < num_tests; i++)
-			skipped.push_back(i);
 
 		Rml::String summary = Rml::CreateString(256, "  Total tests: %d\n  Equal: %d\n  Not equal: %d\n  Failed: %d\n  Skipped: %d",
 			num_tests, (int)equal.size(), (int)not_equal.size(), (int)failed.size(), (int)skipped.size());
@@ -451,14 +463,8 @@ void TestNavigator::StopTestSuiteIteration()
 		log.reserve(comparison_results.size() * 100);
 
 		log += "RmlUi VisualTests comparison log output\n---------------------------------------\n\n" + summary;
-		log += "\n\nEqual:\n";
+		log += "\n\nNot Equal:\n";
 
-		for (int i : equal)
-		{
-			suite.SetIndex(i);
-			log += Rml::CreateString(256, "%5d   %s\n", i + 1, suite.GetFilename().c_str());
-		}
-		log += "\nNot Equal:\n";
 		if (!not_equal.empty())
 			log += "Percentages are similarity scores. Difference images written to " + GetCaptureOutputDirectory() + "/diff-*.png\n\n";
 		for (int i : not_equal)
@@ -468,6 +474,12 @@ void TestNavigator::StopTestSuiteIteration()
 			if (!comparison_results[i].error_msg.empty())
 				log += "          " + comparison_results[i].error_msg + "\n";
 		}
+		log += "\nEqual:\n";
+		for (int i : equal)
+		{
+			suite.SetIndex(i);
+			log += Rml::CreateString(256, "%5d   %s\n", i + 1, suite.GetFilename().c_str());
+		}
 		log += "\nFailed:\n";
 		for (int i : failed)
 		{

Tests/Tools/convert_css_test_suite_to_rml.py

@@ -76,7 +76,7 @@ def border_format(side: str, type: str, content: str):
 		return "border" + side + "-width: " + content
 
 	# Next are the shorthand properties, they should contain max a single size, a single style, and a single color.
-	width = re.search(r'\b([0-9]+[a-z]+)\b', content, flags = re.IGNORECASE)
+	width = re.search(r'\b([0-9]+(\.[0-9]+)?[a-z]+|0)\b', content, flags = re.IGNORECASE)
 	if width:
 		width = width.group(1)
 
@@ -123,6 +123,9 @@ assert( border_find_replace("margin:10px; border:20px solid black; padding:30px;
 assert( border_find_replace(" border-left: 7px solid navy; border-right: 17px solid navy; } ") == ' border-left: 7px navy; border-right: 17px navy; } ' )
 assert( border_find_replace(" border: blue solid 3px; ") == ' border: 3px blue; ' )
 assert( border_find_replace(" border: solid lime; ") == ' border: 3px lime; ' )
+assert( border_find_replace(" border: 0; ") == ' border: 0 black; ' )
+assert( border_find_replace(" border-bottom: 0.25em solid green; ") == ' border-bottom: 0.25em green; ' )
+assert( border_find_replace(" border-width: 0; ") == ' border-width:  0; ' )
 assert( border_find_replace(" border-left: orange solid 1em; ") == ' border-left: 1em orange; ' )
 assert( border_find_replace(" border-style: solid none solid solid; ") == ' border-width:  3px 0px 3px 3px; ' )
 assert( border_find_replace("   border: solid; border-style: solid none solid solid; border-style: solid solid solid none; ") == '   border: 3px black; border-width:  3px 0px 3px 3px; border-width:  3px 3px 3px 0px; ' )