Commit 2ad81100 authored by timloh@chromium.org's avatar timloh@chromium.org

Don't use nonstandard %% dimension in unit tests

The current parser allows an arbitrary number of %s (e.g. left: 10%%%),
but we shouldn't depend on it in our unit tests.

Review URL: https://codereview.chromium.org/641343004

git-svn-id: svn://svn.chromium.org/blink/trunk@183857 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 914955c9
...@@ -113,7 +113,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnits) ...@@ -113,7 +113,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnits)
initLengthArray(expectation); initLengthArray(expectation);
OwnPtrWillBeRawPtr<InterpolableList> list = createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10); OwnPtrWillBeRawPtr<InterpolableList> list = createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10);
toCSSPrimitiveValue(interpolableValueToLength(list.get(), ValueRangeAll).get())->accumulateLengthArray(expectation); toCSSPrimitiveValue(interpolableValueToLength(list.get(), ValueRangeAll).get())->accumulateLengthArray(expectation);
EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(10%% + 10ex + 10ch + 10vh + 10vmax)"))); EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(10% + 10ex + 10ch + 10vh + 10vmax)")));
} }
} }
...@@ -179,20 +179,20 @@ TEST(CSSCalculationValue, AddToLengthUnitValues) ...@@ -179,20 +179,20 @@ TEST(CSSCalculationValue, AddToLengthUnitValues)
expectation.at(CSSPrimitiveValue::UnitTypePixels) = 0; expectation.at(CSSPrimitiveValue::UnitTypePixels) = 0;
expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 20; expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 20;
EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "20%%"))); EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "20%")));
expectation.at(CSSPrimitiveValue::UnitTypePixels) = 30; expectation.at(CSSPrimitiveValue::UnitTypePixels) = 30;
expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40; expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(30px - 40%%)"))); EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(30px - 40%)")));
expectation.at(CSSPrimitiveValue::UnitTypePixels) = 90; expectation.at(CSSPrimitiveValue::UnitTypePixels) = 90;
expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10; expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10;
EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10%% - 6px)"))); EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10% - 6px)")));
expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15; expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15;
expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20; expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20;
expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40; expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80%% / (3 - 1) + 5px)"))); EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)")));
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment