Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test setup in attributedString module

Browse Source 
Summary:
changelog: [internal]

Tests were not running because of `#ifdef ANDROID` directive.
Tests had leaks and were using asserts instead of `EXPECT_EQ`.

Reviewed By: JoshuaGross

Differential Revision: D26168536

fbshipit-source-id: 453fe06a965c48f54d4bad6fe6653b6f45c39ccd
This commit is contained in:
Samuel Susla
2021-01-31 15:10:58 -08:00
committed by Facebook GitHub Bot
parent dce1863bf9
commit 67699ba9f2
4 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactCommon/react/renderer/attributedstring/BUCK
+1
View File
@@ -74,6 +74,7 @@ fb_xplat_cxx_test(
"-Wall",
],
contacts = ["oncall+react_native@xmail.facebook.com"],
fbandroid_use_instrumentation_test = True,
platforms = (ANDROID, APPLE, CXX),
deps = [
":attributedstring",
ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp
+17 -20
View File
@@ -5,9 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/
#include <memory>
#include <assert.h>
#include <gtest/gtest.h>
#include <react/renderer/attributedstring/TextAttributes.h>
#include <react/renderer/attributedstring/conversions.h>
@@ -20,28 +17,28 @@ namespace react {
#ifdef ANDROID
TEST(AttributedStringTest, testToDynamic) {
auto attString = new AttributedString();
auto fragment = new AttributedString::Fragment();
fragment->string = "test";
auto attributedString = AttributedString{};
auto fragment = AttributedString::Fragment{};
fragment.string = "test";
auto text = new TextAttributes();
text->foregroundColor = {
auto text = TextAttributes{};
text.foregroundColor = {
colorFromComponents({100 / 255.0, 153 / 255.0, 200 / 255.0, 1.0})};
text->opacity = 0.5;
text->fontStyle = FontStyle::Italic;
text->fontWeight = FontWeight::Thin;
text->fontVariant = FontVariant::TabularNums;
fragment->textAttributes = *text;
text.opacity = 0.5;
text.fontStyle = FontStyle::Italic;
text.fontWeight = FontWeight::Thin;
text.fontVariant = FontVariant::TabularNums;
fragment.textAttributes = text;
attString->prependFragment(*fragment);
attributedString.appendFragment(fragment);
auto result = toDynamic(*attString);
assert(result["string"] == fragment->string);
auto result = toDynamic(attributedString);
EXPECT_EQ(result["string"], fragment.string);
auto textAttribute = result["fragments"][0]["textAttributes"];
assert(textAttribute["foregroundColor"] == toDynamic(text->foregroundColor));
assert(textAttribute["opacity"] == text->opacity);
assert(textAttribute["fontStyle"] == toString(*text->fontStyle));
assert(textAttribute["fontWeight"] == toString(*text->fontWeight));
EXPECT_EQ(textAttribute["foregroundColor"], toDynamic(text.foregroundColor));
EXPECT_EQ(textAttribute["opacity"], text.opacity);
EXPECT_EQ(textAttribute["fontStyle"], toString(text.fontStyle.value()));
EXPECT_EQ(textAttribute["fontWeight"], toString(text.fontWeight.value()));
}
#endif
ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp
+7 -12
View File
@@ -5,9 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/
#include <memory>
#include <assert.h>
#include <gtest/gtest.h>
#include <react/renderer/attributedstring/ParagraphAttributes.h>
#include <react/renderer/attributedstring/conversions.h>
@@ -19,20 +16,18 @@ namespace react {
#ifdef ANDROID
TEST(ParagraphAttributesTest, testToDynamic) {
auto paragraphAttributes = ParagraphAttributes();
auto paragraphAttributes = ParagraphAttributes{};
paragraphAttributes.maximumNumberOfLines = 2;
paragraphAttributes.adjustsFontSizeToFit = false;
paragraphAttributes.ellipsizeMode = EllipsizeMode::Middle;
auto result = toDynamic(paragraphAttributes);
assert(
result["maximumNumberOfLines"] ==
paragraphAttributes.maximumNumberOfLines);
assert(
result["adjustsFontSizeToFit"] ==
paragraphAttributes.adjustsFontSizeToFit);
assert(
result["ellipsizeMode"] == toString(paragraphAttributes.ellipsizeMode));
EXPECT_EQ(
result["maximumNumberOfLines"], paragraphAttributes.maximumNumberOfLines);
EXPECT_EQ(
result["adjustsFontSizeToFit"], paragraphAttributes.adjustsFontSizeToFit);
EXPECT_EQ(
result["ellipsizeMode"], toString(paragraphAttributes.ellipsizeMode));
}
#endif
ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp
+12 -14
View File
@@ -5,9 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/
#include <memory>
#include <assert.h>
#include <gtest/gtest.h>
#include <react/renderer/attributedstring/TextAttributes.h>
#include <react/renderer/attributedstring/conversions.h>
@@ -20,19 +17,20 @@ namespace react {
#ifdef ANDROID
TEST(TextAttributesTest, testToDynamic) {
auto text = TextAttributes();
text.foregroundColor = {
auto textAttributes = TextAttributes{};
textAttributes.foregroundColor = {
colorFromComponents({200 / 255.0, 153 / 255.0, 100 / 255.0, 1.0})};
text.opacity = 0.5;
text.fontStyle = FontStyle::Italic;
text.fontWeight = FontWeight::Thin;
text.fontVariant = FontVariant::TabularNums;
textAttributes.opacity = 0.5;
textAttributes.fontStyle = FontStyle::Italic;
textAttributes.fontWeight = FontWeight::Thin;
textAttributes.fontVariant = FontVariant::TabularNums;
auto result = toDynamic(text);
assert(result["foregroundColor"] == toDynamic(text.foregroundColor));
assert(result["opacity"] == text.opacity);
assert(result["fontStyle"] == toString(*text.fontStyle));
assert(result["fontWeight"] == toString(*text.fontWeight));
auto result = toDynamic(textAttributes);
EXPECT_EQ(
result["foregroundColor"], toDynamic(textAttributes.foregroundColor));
EXPECT_EQ(result["opacity"], textAttributes.opacity);
EXPECT_EQ(result["fontStyle"], toString(textAttributes.fontStyle.value()));
EXPECT_EQ(result["fontWeight"], toString(textAttributes.fontWeight.value()));
}
#endif