mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Format Java code in xplat/js/react-native-github
Summary: This diff formats the Java class files inside xplat/js/react-native-github. Since google-java-format was enabled in D16071401 we want to codemode the existing code so that users don't have to deal with formatter lint noise at diff-time. ```arc f --paths-cmd 'hg files -I "**/*.java"'``` drop-conflicts Reviewed By: cpojer Differential Revision: D16071725 fbshipit-source-id: fc6e3852e45742c109f0c5ac4065d64201c74204
This commit is contained in:
1 parent
61e95e5cbf
commit
6c0f73b322
681 files changed
+14082
-16365
No files matched your search
+42
-71
@@ -1,30 +1,25 @@
|
||||
/**
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
|
||||
* directory of this source tree.
|
||||
*/
|
||||
|
||||
package com.facebook.react.tests;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import android.content.Context;
|
||||
import javax.annotation.Nullable;
|
||||
import android.widget.ScrollView;
|
||||
|
||||
import com.facebook.react.bridge.JavaScriptModule;
|
||||
import com.facebook.react.testing.ReactAppInstrumentationTestCase;
|
||||
import com.facebook.react.testing.ReactInstanceSpecForTest;
|
||||
import com.facebook.react.uimanager.PixelUtil;
|
||||
import com.facebook.react.uimanager.annotations.ReactProp;
|
||||
import com.facebook.react.uimanager.ThemedReactContext;
|
||||
import com.facebook.react.uimanager.annotations.ReactProp;
|
||||
import com.facebook.react.views.view.ReactViewGroup;
|
||||
import com.facebook.react.views.view.ReactViewManager;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.annotation.Nullable;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Ignore;
|
||||
|
||||
/**
|
||||
* Integration test for {@code removeClippedSubviews} property that verify correct scrollview
|
||||
@@ -34,9 +29,13 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
|
||||
private interface SubviewsClippingTestModule extends JavaScriptModule {
|
||||
void renderClippingSample1();
|
||||
|
||||
void renderClippingSample2();
|
||||
|
||||
void renderScrollViewTest();
|
||||
|
||||
void renderUpdatingSample1(boolean update1, boolean update2);
|
||||
|
||||
void renderUpdatingSample2(boolean update);
|
||||
}
|
||||
|
||||
@@ -49,78 +48,50 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
|
||||
@Override
|
||||
protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
|
||||
return super.createReactInstanceSpecForTest()
|
||||
.addViewManager(new ClippableViewManager(mEvents));
|
||||
return super.createReactInstanceSpecForTest().addViewManager(new ClippableViewManager(mEvents));
|
||||
}
|
||||
|
||||
/**
|
||||
* In this test view are layout in a following way:
|
||||
* +-----------------------------+
|
||||
* | |
|
||||
* | +---------------------+ |
|
||||
* | | inner1 | |
|
||||
* | +---------------------+ |
|
||||
* | +-------------------------+ |
|
||||
* | | outer (clip=true) | |
|
||||
* | | +---------------------+ | |
|
||||
* | | | inner2 | | |
|
||||
* | | +---------------------+ | |
|
||||
* | | | |
|
||||
* | +-------------------------+ |
|
||||
* | +---------------------+ |
|
||||
* | | inner3 | |
|
||||
* | +---------------------+ |
|
||||
* | |
|
||||
* In this test view are layout in a following way: +-----------------------------+ | | |
|
||||
* +---------------------+ | | | inner1 | | | +---------------------+ | |
|
||||
* +-------------------------+ | | | outer (clip=true) | | | | +---------------------+ | | | | |
|
||||
* inner2 | | | | | +---------------------+ | | | | | | | +-------------------------+ | |
|
||||
* +---------------------+ | | | inner3 | | | +---------------------+ | | |
|
||||
* +-----------------------------+
|
||||
*
|
||||
* We expect only outer and inner2 to be attached
|
||||
* <p>We expect only outer and inner2 to be attached
|
||||
*/
|
||||
public void XtestOneLevelClippingInView() throws Throwable {
|
||||
mEvents.clear();
|
||||
getReactContext().getJSModule(SubviewsClippingTestModule.class).renderClippingSample1();
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Attach_outer", "Attach_inner2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_outer", "Attach_inner2"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* In this test view are layout in a following way:
|
||||
* +-----------------------------+
|
||||
* | outer (clip=true) |
|
||||
* | |
|
||||
* | |
|
||||
* | |
|
||||
* | +-----------------------------+
|
||||
* | | complexInner (clip=true) |
|
||||
* | | +----------+ | +---------+ |
|
||||
* | | | inner1 | | | inner2 | |
|
||||
* | | | | | | | |
|
||||
* | | +----------+ | +---------+ |
|
||||
* +--------------+--------------+ |
|
||||
* | +----------+ +---------+ |
|
||||
* | | inner3 | | inner4 | |
|
||||
* | | | | | |
|
||||
* | +----------+ +---------+ |
|
||||
* | |
|
||||
* +-----------------------------+
|
||||
* In this test view are layout in a following way: +-----------------------------+ | outer
|
||||
* (clip=true) | | | | | | | | +-----------------------------+ | | complexInner (clip=true) | | |
|
||||
* +----------+ | +---------+ | | | | inner1 | | | inner2 | | | | | | | | | | | | +----------+ |
|
||||
* +---------+ | +--------------+--------------+ | | +----------+ +---------+ | | | inner3 | |
|
||||
* inner4 | | | | | | | | | +----------+ +---------+ | | | +-----------------------------+
|
||||
*
|
||||
* We expect outer, complexInner & inner1 to be attached
|
||||
* <p>We expect outer, complexInner & inner1 to be attached
|
||||
*/
|
||||
public void XtestTwoLevelClippingInView() throws Throwable {
|
||||
mEvents.clear();
|
||||
getReactContext().getJSModule(SubviewsClippingTestModule.class).renderClippingSample2();
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(
|
||||
new String[]{"Attach_outer", "Attach_complexInner", "Attach_inner1"},
|
||||
mEvents.toArray());
|
||||
new String[] {"Attach_outer", "Attach_complexInner", "Attach_inner1"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* This test verifies that we update clipped subviews appropriately when some of them gets
|
||||
* re-layouted.
|
||||
*
|
||||
* In this test scenario we render clipping view ("outer") with two subviews, one is outside and
|
||||
* clipped and one is inside (absolutely positioned). By updating view props we first change the
|
||||
* height of the first element so that it should intersect with clipping "outer" view. Then we
|
||||
* <p>In this test scenario we render clipping view ("outer") with two subviews, one is outside
|
||||
* and clipped and one is inside (absolutely positioned). By updating view props we first change
|
||||
* the height of the first element so that it should intersect with clipping "outer" view. Then we
|
||||
* update top position of the second view so that is should go off screen.
|
||||
*/
|
||||
public void testClippingAfterLayoutInner() {
|
||||
@@ -130,24 +101,24 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
mEvents.clear();
|
||||
subviewsClippingTestModule.renderUpdatingSample1(false, false);
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Attach_outer", "Attach_inner2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_outer", "Attach_inner2"}, mEvents.toArray());
|
||||
|
||||
mEvents.clear();
|
||||
subviewsClippingTestModule.renderUpdatingSample1(true, false);
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Attach_inner1"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_inner1"}, mEvents.toArray());
|
||||
|
||||
mEvents.clear();
|
||||
subviewsClippingTestModule.renderUpdatingSample1(true, true);
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Detach_inner2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Detach_inner2"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
/**
|
||||
* This test verifies that we update clipping views appropriately when parent view layout changes
|
||||
* in a way that affects clipping.
|
||||
*
|
||||
* In this test we render clipping view ("outer") set to be 100x100dp with inner view that is
|
||||
* <p>In this test we render clipping view ("outer") set to be 100x100dp with inner view that is
|
||||
* absolutely positioned out of the clipping area of the parent view. Then we resize parent view
|
||||
* so that inner view should be visible.
|
||||
*/
|
||||
@@ -158,12 +129,12 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
mEvents.clear();
|
||||
subviewsClippingTestModule.renderUpdatingSample2(false);
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Attach_outer"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_outer"}, mEvents.toArray());
|
||||
|
||||
mEvents.clear();
|
||||
subviewsClippingTestModule.renderUpdatingSample2(true);
|
||||
waitForBridgeAndUIIdle();
|
||||
Assert.assertArrayEquals(new String[]{"Attach_inner"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_inner"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
public void testOneLevelClippingInScrollView() throws Throwable {
|
||||
@@ -171,13 +142,13 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
waitForBridgeAndUIIdle();
|
||||
|
||||
// Only 3 first views should be attached at the beginning
|
||||
Assert.assertArrayEquals(new String[]{"Attach_0", "Attach_1", "Attach_2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_0", "Attach_1", "Attach_2"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// We scroll down such that first view get out of the bounds, we expect the first view to be
|
||||
// detached and 4th view to get attached
|
||||
scrollToDpInUIThread(120);
|
||||
Assert.assertArrayEquals(new String[]{"Detach_0", "Attach_3"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Detach_0", "Attach_3"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
public void testTwoLevelClippingInScrollView() throws Throwable {
|
||||
@@ -197,38 +168,38 @@ public class CatalystSubviewsClippingTestCase extends ReactAppInstrumentationTes
|
||||
// Scroll a little bit so that "complex" view is visible, but it's inner views are not
|
||||
scrollToDpInUIThread(complexViewOffset + 5);
|
||||
|
||||
Assert.assertArrayEquals(new String[]{"Attach_C0"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_C0"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// Step 3
|
||||
// Scroll even more so that first subview of "complex" view is visible, view 1 will get off
|
||||
// screen
|
||||
scrollToDpInUIThread(complexViewOffset + 100);
|
||||
Assert.assertArrayEquals(new String[]{"Detach_1", "Attach_C0.1"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Detach_1", "Attach_C0.1"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// Step 4
|
||||
// Scroll even more to reveal second subview of "complex" view
|
||||
scrollToDpInUIThread(complexViewOffset + 150);
|
||||
Assert.assertArrayEquals(new String[]{"Attach_C0.2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_C0.2"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// Step 5
|
||||
// Scroll back to previous position (Step 3), second view should get detached
|
||||
scrollToDpInUIThread(complexViewOffset + 100);
|
||||
Assert.assertArrayEquals(new String[]{"Detach_C0.2"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Detach_C0.2"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// Step 6
|
||||
// Scroll back to Step 2, complex view should be visible but all subviews should be detached
|
||||
scrollToDpInUIThread(complexViewOffset + 5);
|
||||
Assert.assertArrayEquals(new String[]{"Attach_1", "Detach_C0.1"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Attach_1", "Detach_C0.1"}, mEvents.toArray());
|
||||
mEvents.clear();
|
||||
|
||||
// Step 7
|
||||
// Scroll back to Step 1, complex view should be gone
|
||||
scrollToDpInUIThread(complexViewOffset);
|
||||
Assert.assertArrayEquals(new String[]{"Detach_C0"}, mEvents.toArray());
|
||||
Assert.assertArrayEquals(new String[] {"Detach_C0"}, mEvents.toArray());
|
||||
}
|
||||
|
||||
private void scrollToDpInUIThread(final int yPositionInDP) throws Throwable {
|
||||
|
||||
Reference in new issue
Block a user