From c9a0b90800ea14a36b2110f2a2a03d4c558cad96 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Mon, 13 May 2024 14:59:26 -0700 Subject: [PATCH] Fix CircleCI Android GTest Build (#44562) Summary: D56963463 deleted some tests for code it also deleted. This broke the Android GTest OSS build, which is a centralized list of these test files. Remove from there as well. Changelog: [Internal] Reviewed By: joevilches, realsoelynn Differential Revision: D57299969 --- .../ReactAndroid/src/main/jni/CMakeLists.txt | 5 -- .../text/tests/ParagraphLocalDataTest.cpp | 52 ------------------- .../components/text/tests/TextTest.cpp | 14 ----- 3 files changed, 71 deletions(-) delete mode 100644 packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp delete mode 100644 packages/react-native/ReactCommon/react/renderer/components/text/tests/TextTest.cpp diff --git a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt index cc19c00df234..546da4cc93c7 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt @@ -146,14 +146,9 @@ add_executable(reactnative_unittest ${REACT_COMMON_DIR}/cxxreact/tests/RecoverableErrorTest.cpp ${REACT_COMMON_DIR}/react/bridging/tests/BridgingTest.cpp ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/AttributedStringBoxTest.cpp - ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/AttributedStringTest.cpp - ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp - ${REACT_COMMON_DIR}/react/renderer/attributedstring/tests/TextAttributesTest.cpp ${REACT_COMMON_DIR}/react/renderer/components/image/tests/ImageTest.cpp ${REACT_COMMON_DIR}/react/renderer/components/root/tests/RootShadowNodeTest.cpp ${REACT_COMMON_DIR}/react/renderer/components/scrollview/tests/ScrollViewTest.cpp - ${REACT_COMMON_DIR}/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp - ${REACT_COMMON_DIR}/react/renderer/components/text/tests/TextTest.cpp ${REACT_COMMON_DIR}/react/renderer/components/view/tests/LayoutTest.cpp ${REACT_COMMON_DIR}/react/renderer/components/view/tests/ViewTest.cpp ${REACT_COMMON_DIR}/react/renderer/core/tests/DynamicPropsUtilitiesTest.cpp diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp deleted file mode 100644 index 8b91ffd3c3c9..000000000000 --- a/packages/react-native/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -namespace facebook::react { - -#ifdef ANDROID - -TEST(ParagraphLocalDataTest, testSomething) { - auto attributedString = AttributedString(); - auto fragment = AttributedString::Fragment(); - fragment.string = "test"; - - auto text = TextAttributes(); - text.foregroundColor = { - colorFromComponents({100 / 255.0, 153 / 255.0, 253 / 255.0, 1.0})}; - text.opacity = 0.5; - text.fontStyle = FontStyle::Italic; - text.fontWeight = FontWeight::Thin; - text.fontVariant = FontVariant::TabularNums; - fragment.textAttributes = text; - attributedString.prependFragment(fragment); - - auto paragraphState = ParagraphState{}; - paragraphState.attributedString = attributedString; - - auto result = toDynamic(paragraphState)["attributedString"]; - - EXPECT_EQ(result["string"], fragment.string); - auto textAttribute = result["fragments"][0]["textAttributes"]; - EXPECT_EQ(textAttribute["foregroundColor"], toDynamic(text.foregroundColor)); - EXPECT_EQ(textAttribute["opacity"], text.opacity); - EXPECT_EQ(textAttribute["fontStyle"], toString(*text.fontStyle)); - EXPECT_EQ(textAttribute["fontWeight"], toString(*text.fontWeight)); -} - -#endif - -} // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/tests/TextTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/tests/TextTest.cpp deleted file mode 100644 index 296fc9a53a88..000000000000 --- a/packages/react-native/ReactCommon/react/renderer/components/text/tests/TextTest.cpp +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include - -#include - -TEST(TextTest, testSomething) { - // TODO: -}