Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f1fd60 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix flakiness in FadeTransitionTest"

parents df99c779 500ae8b6

core/tests/coretests/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -1310,14 +1310,16 @@ 
            </intent-filter>

        </activity>



        <activity android:name="android.animation.BasicAnimatorActivity">

        <activity android:name="android.animation.BasicAnimatorActivity"

                  android:screenOrientation="locked">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />

            </intent-filter>

        </activity>



        <activity android:name="android.animation.AnimatorSetActivity">

        <activity android:name="android.animation.AnimatorSetActivity"

                  android:screenOrientation="locked">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />

core/tests/coretests/src/android/transition/FadeTransitionTest.java

+10 −10
Original line number Diff line number Diff line
@@ -48,23 +48,23 @@ public class FadeTransitionTest extends ActivityInstrumentationTestCase2<Animato 
        View square1 = mActivity.findViewById(R.id.square1);

        Fade fadeOut = new Fade(Fade.MODE_OUT);

        TransitionLatch latch = setVisibilityInTransition(fadeOut, R.id.square1, View.INVISIBLE);

        assertTrue(latch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(latch.startLatch.await(400, TimeUnit.MILLISECONDS));

        assertEquals(View.VISIBLE, square1.getVisibility());

        waitForAnimation();

        assertFalse(square1.getTransitionAlpha() == 0 || square1.getTransitionAlpha() == 1);

        assertTrue(latch.endLatch.await(400, TimeUnit.MILLISECONDS));

        assertTrue(latch.endLatch.await(800, TimeUnit.MILLISECONDS));

        assertEquals(1.0f, square1.getTransitionAlpha());

        assertEquals(View.INVISIBLE, square1.getVisibility());



        Fade fadeIn = new Fade(Fade.MODE_IN);

        latch = setVisibilityInTransition(fadeIn, R.id.square1, View.VISIBLE);

        assertTrue(latch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(latch.startLatch.await(400, TimeUnit.MILLISECONDS));

        assertEquals(View.VISIBLE, square1.getVisibility());

        waitForAnimation();

        final float transitionAlpha = square1.getTransitionAlpha();

        assertTrue("expecting transitionAlpha to be between 0 and 1. Was " + transitionAlpha,

                transitionAlpha > 0 && transitionAlpha < 1);

        assertTrue(latch.endLatch.await(400, TimeUnit.MILLISECONDS));

        assertTrue(latch.endLatch.await(800, TimeUnit.MILLISECONDS));

        assertEquals(1.0f, square1.getTransitionAlpha());

        assertEquals(View.VISIBLE, square1.getVisibility());

    }
@@ -76,14 +76,14 @@ public class FadeTransitionTest extends ActivityInstrumentationTestCase2<Animato 
        FadeValueCheck fadeOutValueCheck = new FadeValueCheck(square1);

        fadeOut.addListener(fadeOutValueCheck);

        TransitionLatch outLatch = setVisibilityInTransition(fadeOut, R.id.square1, View.INVISIBLE);

        assertTrue(outLatch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(outLatch.startLatch.await(400, TimeUnit.MILLISECONDS));

        waitForAnimation();



        Fade fadeIn = new Fade(Fade.MODE_IN);

        FadeValueCheck fadeInValueCheck = new FadeValueCheck(square1);

        fadeIn.addListener(fadeInValueCheck);

        TransitionLatch inLatch = setVisibilityInTransition(fadeIn, R.id.square1, View.VISIBLE);

        assertTrue(inLatch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(inLatch.startLatch.await(400, TimeUnit.MILLISECONDS));



        assertEquals(fadeOutValueCheck.pauseTransitionAlpha, fadeInValueCheck.startTransitionAlpha);

        assertTrue("expecting transitionAlpha to be between 0 and 1. Was " +
@@ -91,7 +91,7 @@ public class FadeTransitionTest extends ActivityInstrumentationTestCase2<Animato 
                fadeOutValueCheck.pauseTransitionAlpha > 0 &&

                        fadeOutValueCheck.pauseTransitionAlpha < 1);



        assertTrue(inLatch.endLatch.await(400, TimeUnit.MILLISECONDS));

        assertTrue(inLatch.endLatch.await(800, TimeUnit.MILLISECONDS));

        assertEquals(1.0f, square1.getTransitionAlpha());

        assertEquals(View.VISIBLE, square1.getVisibility());

    }
@@ -109,14 +109,14 @@ public class FadeTransitionTest extends ActivityInstrumentationTestCase2<Animato 
        FadeValueCheck fadeInValueCheck = new FadeValueCheck(square1);

        fadeIn.addListener(fadeInValueCheck);

        TransitionLatch inLatch = setVisibilityInTransition(fadeIn, R.id.square1, View.VISIBLE);

        assertTrue(inLatch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(inLatch.startLatch.await(400, TimeUnit.MILLISECONDS));

        waitForAnimation();



        Fade fadeOut = new Fade(Fade.MODE_OUT);

        FadeValueCheck fadeOutValueCheck = new FadeValueCheck(square1);

        fadeOut.addListener(fadeOutValueCheck);

        TransitionLatch outLatch = setVisibilityInTransition(fadeOut, R.id.square1, View.INVISIBLE);

        assertTrue(outLatch.startLatch.await(200, TimeUnit.MILLISECONDS));

        assertTrue(outLatch.startLatch.await(400, TimeUnit.MILLISECONDS));



        assertEquals(fadeInValueCheck.pauseTransitionAlpha, fadeOutValueCheck.startTransitionAlpha);

        assertTrue("expecting transitionAlpha to be between 0 and 1. Was " +
@@ -124,7 +124,7 @@ public class FadeTransitionTest extends ActivityInstrumentationTestCase2<Animato 
                fadeInValueCheck.pauseTransitionAlpha > 0 &&

                        fadeInValueCheck.pauseTransitionAlpha < 1);



        assertTrue(outLatch.endLatch.await(400, TimeUnit.MILLISECONDS));

        assertTrue(outLatch.endLatch.await(800, TimeUnit.MILLISECONDS));

        assertEquals(1.0f, square1.getTransitionAlpha());

        assertEquals(View.INVISIBLE, square1.getVisibility());

    }