Unit testing of color-mix()

Author: dirkschulze

svgnative/src/SVGStringParser.cpp

@@ -1124,7 +1124,7 @@ static bool ParseColor(CharIt& pos, const CharIt& end, ColorImpl& paint, bool su
         }
         else if (char4string.compare("colo") == 0)
         {
-            if (std::distance(pos, end) > 10 && std::string(pos, pos + 10).compare("r-mix(") == 0)
+            if (std::distance(pos, end) > 10 && std::string(pos + 4, pos + 10).compare("r-mix(") == 0)
             {
                 pos += 10;
                 if (!SkipOptWsp(pos, end))
@@ -1152,7 +1152,7 @@ static bool ParseColor(CharIt& pos, const CharIt& end, ColorImpl& paint, bool su
                 float blendProgress1{ 50.f };
                 bool hasBlendProgress1{};
                 auto tempPos = pos;
-                if (tempPos != end && isWsp(*tempPos)
+                if (tempPos != end && isWsp(*tempPos) && SkipOptWsp(tempPos, end)
                     && ParseFloatingPoint(tempPos, end, blendProgress1)
                     && tempPos != end && *tempPos == '%')
                 {
@@ -1164,13 +1164,13 @@ static bool ParseColor(CharIt& pos, const CharIt& end, ColorImpl& paint, bool su
                     return false;
 
                 resultColor = SVGDocumentImpl::Result::kInvalid;
-                if (!ParseColor(pos, end, colorMixPtr->color1, supportsCurrentColor, resultColor)
+                if (!ParseColor(pos, end, colorMixPtr->color2, supportsCurrentColor, resultColor)
                     || resultColor != SVGDocumentImpl::Result::kSuccess)
                     return false;
                 float blendProgress2{ 50.f };
                 bool hasBlendProgress2{};
                 tempPos = pos;
-                if (tempPos != end && isWsp(*tempPos)
+                if (tempPos != end && isWsp(*tempPos) && SkipOptWsp(tempPos, end)
                     && ParseFloatingPoint(tempPos, end, blendProgress2)
                     && tempPos != end && *tempPos == '%')
                 {
@@ -1189,9 +1189,9 @@ static bool ParseColor(CharIt& pos, const CharIt& end, ColorImpl& paint, bool su
                 if (!hasBlendProgress1 && hasBlendProgress2)
                     blendProgress1 = 1 - blendProgress2;
                 else if (hasBlendProgress1 && !hasBlendProgress2)
-                    hasBlendProgress2 = 1 - blendProgress1;
+                    blendProgress2 = 1 - blendProgress1;
 
-                colorMixPtr->blendProgress = blendProgress1 / (blendProgress1 + blendProgress2);
+                colorMixPtr->blendProgress = blendProgress2 / (blendProgress1 + blendProgress2);
 
                 paint = colorMixPtr;
                 result = SVGDocumentImpl::Result::kSuccess;

svgnative/tests/CMakeLists.txt

@@ -1,23 +1,21 @@
 set (SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/Interval.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/Interval.h
-)
-add_executable(intervalTests interval-tests.cpp ${SOURCE_FILES})
-target_include_directories(intervalTests PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../src")
-target_link_libraries(intervalTests SVGNativeViewerLib)
-target_link_libraries(intervalTests gtest_main)
-add_test(NAME interval_tests COMMAND intervalTests)
-
-set (SOURCE_FILES
-	${CMAKE_CURRENT_SOURCE_DIR}/../src/Interval.cpp	
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/Rect.cpp
 )
-add_executable(rectangleTests rectangle-tests.cpp ${SOURCE_FILES})
-target_include_directories(rectangleTests PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../src")
-target_link_libraries(rectangleTests SVGNativeViewerLib)
-target_link_libraries(rectangleTests gtest_main)
-add_test(NAME rectangle_tests COMMAND rectangleTests)
 
+set (TEST_FILES
+    interval-tests.cpp
+    rectangle-tests.cpp
+    parsing-tests.cpp
+)
+add_executable(unitTesting ${TEST_FILES} ${SOURCE_FILES})
+target_include_directories(unitTesting PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../src")
+target_link_libraries(unitTesting SVGNativeViewerLib)
+target_link_libraries(unitTesting gtest_main)
+add_test(NAME interval_tests COMMAND unitTesting)
+add_test(NAME rectangle_tests COMMAND unitTesting)
+add_test(NAME parsing_tests COMMAND unitTesting)
 
 # TODO: For now we just use the Skia port, but later on we should
 # extend this and generalize this so that all the ports are equally

svgnative/tests/parsing-tests.cpp

@@ -0,0 +1,65 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+#include "gtest/gtest.h"
+#include "gtest/gtest-spi.h"
+
+#include <svgnative/SVGRenderer.h>
+#include "SVGStringParser.h"
+
+using namespace SVGNative;
+
+using BeforeAfterPath = std::pair<std::string, Color>;
+
+class ParsingTestFixture : public ::testing::TestWithParam<BeforeAfterPath> {
+};
+
+TEST_P(ParsingTestFixture, color_mix)
+{
+    const auto& param = GetParam();
+
+    static const ColorMap colorMap{
+        { "myBlue",     Color{0.f, 0.f, 1.f, 1.f}},
+        { "myRed",      Color{1.f, 0.f, 0.f, 1.f}},
+        { "myGreen",    Color{0.f, 0.5f, 0.f, 1.f}},
+    };
+
+    ColorImpl colorImpl;
+    auto parsingResult = SVGStringParser::ParseColor(param.first, colorImpl);
+
+    auto wasParsingSuccessful = parsingResult == SVGDocumentImpl::Result::kSuccess;
+    EXPECT_EQ(wasParsingSuccessful, true);
+    EXPECT_EQ(colorImpl.type() == typeid(ColorMixPtr), true);
+
+    auto blendedColor = boost::get<ColorMixPtr>(colorImpl)->BlendedColor(colorMap);
+    auto& expectedColor = param.second;
+    EXPECT_FLOAT_EQ(blendedColor[0], expectedColor[0]);
+    EXPECT_FLOAT_EQ(blendedColor[1], expectedColor[1]);
+    EXPECT_FLOAT_EQ(blendedColor[2], expectedColor[2]);
+    EXPECT_FLOAT_EQ(blendedColor[3], expectedColor[3]);
+}
+
+INSTANTIATE_TEST_SUITE_P(ColorMixParsing, ParsingTestFixture,
+    ::testing::ValuesIn(std::vector<BeforeAfterPath>{
+        {
+            "color-mix(in srgb, black, white 80%)",
+            Color{{.8f, .8f, .8f, 1.f}}
+        },
+        {
+            "color-mix(in srgb, black 80%, white)",
+            Color{{.2f, .2f, .2f, 1.f}}
+        },
+        {
+            "color-mix(in srgb, rgb(255, 127, 0) 80%, rgba(0, 127, 0, 1.0))",
+            Color{{.2f, .2f, .2f, 1.f}}
+        }
+    }));