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

Commit e9afdef2 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wmflicker-kotlin" 

* changes:
  Move tests into specific packages
  Use kotlin lambdas on flicker assertions
  Convert flicker tests to kotlin
parents 36517955 da218f83

tests/FlickerTests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


android_test {

    name: "FlickerTests",

    srcs: ["src/**/*.java"],

    srcs: ["src/**/*.java", "src/**/*.kt"],

    manifest: "AndroidManifest.xml",

    test_config: "AndroidTest.xml",

    platform_apis: true,

tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java

deleted100644 → 0
+0 −174
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker;



import static android.view.Surface.rotationToString;



import static com.android.server.wm.flicker.CommonTransitions.changeAppRotation;

import static com.android.server.wm.flicker.WindowUtils.getAppPosition;

import static com.android.server.wm.flicker.WindowUtils.getNavigationBarPosition;

import static com.android.server.wm.flicker.WindowUtils.getStatusBarPosition;

import static com.android.server.wm.flicker.WmTraceSubject.assertThat;



import android.graphics.Rect;

import android.util.Log;

import android.view.Surface;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;



import org.junit.FixMethodOrder;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.MethodSorters;

import org.junit.runners.Parameterized;

import org.junit.runners.Parameterized.Parameters;



import java.util.ArrayList;

import java.util.Collection;



/**

 * Cycle through supported app rotations.

 * To run this test: {@code atest FlickerTest:ChangeAppRotationTest}

 */

@LargeTest

@RunWith(Parameterized.class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

public class ChangeAppRotationTest extends FlickerTestBase {

    private int mBeginRotation;

    private int mEndRotation;



    public ChangeAppRotationTest(String beginRotationName, String endRotationName,

            int beginRotation, int endRotation) {

        this.mTestApp = new StandardAppHelper(InstrumentationRegistry.getInstrumentation(),

                "com.android.server.wm.flicker.testapp", "SimpleApp");

        this.mBeginRotation = beginRotation;

        this.mEndRotation = endRotation;

    }



    @Parameters(name = "{0}-{1}")

    public static Collection<Object[]> getParams() {

        int[] supportedRotations =

                {Surface.ROTATION_0, Surface.ROTATION_90};

        Collection<Object[]> params = new ArrayList<>();

        for (int begin : supportedRotations) {

            for (int end : supportedRotations) {

                if (begin != end) {

                    params.add(new Object[]{rotationToString(begin), rotationToString(end), begin,

                            end});

                }

            }

        }

        return params;

    }



    @Override

    TransitionRunner getTransitionToRun() {

        return changeAppRotation(mTestApp, mUiDevice, mBeginRotation, mEndRotation)

                .includeJankyRuns().build();

    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    public void checkVisibility_navBarWindowIsAlwaysVisible() {

        checkResults(result -> assertThat(result)

                .showsAboveAppWindow(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());

    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    public void checkVisibility_statusBarWindowIsAlwaysVisible() {

        checkResults(result -> assertThat(result)

                .showsAboveAppWindow(STATUS_BAR_WINDOW_TITLE).forAllEntries());

    }



    @Test

    public void checkPosition_navBarLayerRotatesAndScales() {

        Rect startingPos = getNavigationBarPosition(mBeginRotation);

        Rect endingPos = getNavigationBarPosition(mEndRotation);

        checkResults(result -> {

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, startingPos)

                            .inTheBeginning();

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(NAVIGATION_BAR_WINDOW_TITLE, endingPos).atTheEnd();

                }

        );

    }



    @Test

    public void checkPosition_appLayerRotates() {

        Rect startingPos = getAppPosition(mBeginRotation);

        Rect endingPos = getAppPosition(mEndRotation);

        Log.e(TAG, "startingPos=" + startingPos + " endingPos=" + endingPos);

        checkResults(result -> {

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(mTestApp.getPackage(), startingPos).inTheBeginning();

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(mTestApp.getPackage(), endingPos).atTheEnd();

                }

        );

    }



    @Test

    public void checkPosition_statusBarLayerScales() {

        Rect startingPos = getStatusBarPosition(mBeginRotation);

        Rect endingPos = getStatusBarPosition(mEndRotation);

        checkResults(result -> {

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(STATUS_BAR_WINDOW_TITLE, startingPos)

                            .inTheBeginning();

                    LayersTraceSubject.assertThat(result)

                            .hasVisibleRegion(STATUS_BAR_WINDOW_TITLE, endingPos).atTheEnd();

                }

        );

    }



    @Ignore("Flaky. Pending debug")

    @Test

    public void checkVisibility_screenshotLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer(mTestApp.getPackage())

                .then()

                .replaceVisibleLayer(mTestApp.getPackage(), SCREENSHOT_LAYER)

                .then()

                .showsLayer(mTestApp.getPackage()).and().showsLayer(SCREENSHOT_LAYER)

                .then()

                .replaceVisibleLayer(SCREENSHOT_LAYER, mTestApp.getPackage())

                .forAllEntries());

    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    public void checkVisibility_navBarLayerIsAlwaysVisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer(NAVIGATION_BAR_WINDOW_TITLE).forAllEntries());

    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    public void checkVisibility_statusBarLayerIsAlwaysVisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer(STATUS_BAR_WINDOW_TITLE).forAllEntries());

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToAppTest.java

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker;



import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusToApp;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;



import com.android.server.wm.flicker.helpers.ImeAppHelper;



import org.junit.FixMethodOrder;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.MethodSorters;

import org.junit.runners.Parameterized;



/**

 * Test IME window closing back to app window transitions.

 * To run this test: {@code atest FlickerTests:CloseImeWindowToAppTest}

 */

@LargeTest

@RunWith(Parameterized.class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

public class CloseImeWindowToAppTest extends NonRotationTestBase {



    static final String IME_WINDOW_TITLE = "InputMethod";



    public CloseImeWindowToAppTest(String beginRotationName, int beginRotation) {

        super(beginRotationName, beginRotation);



        mTestApp = new ImeAppHelper(InstrumentationRegistry.getInstrumentation());

    }



    @Override

    TransitionRunner getTransitionToRun() {

        return editTextLoseFocusToApp((ImeAppHelper) mTestApp, mUiDevice, mBeginRotation)

                .includeJankyRuns().build();

    }



    @Ignore("Flaky. Pending debug")

    @Test

    public void checkVisibility_imeLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer(IME_WINDOW_TITLE)

                .then()

                .hidesLayer(IME_WINDOW_TITLE)

                .forAllEntries());

    }



    @Test

    public void checkVisibility_imeAppLayerIsAlwaysVisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .showsLayer(mTestApp.getPackage())

                .forAllEntries());

    }



    @Test

    public void checkVisibility_imeAppWindowIsAlwaysVisible() {

        checkResults(result -> WmTraceSubject.assertThat(result)

                .showsAppWindowOnTop(mTestApp.getPackage())

                .forAllEntries());

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/CloseImeWindowToHomeTest.java

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker;



import static com.android.server.wm.flicker.CommonTransitions.editTextLoseFocusToHome;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.LargeTest;



import com.android.server.wm.flicker.helpers.ImeAppHelper;



import org.junit.FixMethodOrder;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.MethodSorters;

import org.junit.runners.Parameterized;



/**

 * Test IME window closing to home transitions.

 * To run this test: {@code atest FlickerTests:CloseImeWindowToHomeTest}

 */

@LargeTest

@RunWith(Parameterized.class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

public class CloseImeWindowToHomeTest extends NonRotationTestBase {



    static final String IME_WINDOW_TITLE = "InputMethod";



    public CloseImeWindowToHomeTest(String beginRotationName, int beginRotation) {

        super(beginRotationName, beginRotation);



        mTestApp = new ImeAppHelper(InstrumentationRegistry.getInstrumentation());

    }



    @Override

    TransitionRunner getTransitionToRun() {

        return editTextLoseFocusToHome((ImeAppHelper) mTestApp, mUiDevice, mBeginRotation)

                .includeJankyRuns().build();

    }



    @Test

    public void checkVisibility_imeWindowBecomesInvisible() {

        checkResults(result -> WmTraceSubject.assertThat(result)

                .showsImeWindow(IME_WINDOW_TITLE)

                .then()

                .hidesImeWindow(IME_WINDOW_TITLE)

                .forAllEntries());

    }



    @FlakyTest(bugId = 153739621)

    @Ignore

    @Test

    public void checkVisibility_imeLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .skipUntilFirstAssertion()

                .showsLayer(IME_WINDOW_TITLE)

                .then()

                .hidesLayer(IME_WINDOW_TITLE)

                .forAllEntries());

    }



    @FlakyTest(bugId = 153739621)

    @Ignore

    @Test

    public void checkVisibility_imeAppLayerBecomesInvisible() {

        checkResults(result -> LayersTraceSubject.assertThat(result)

                .skipUntilFirstAssertion()

                .showsLayer(mTestApp.getPackage())

                .then()

                .hidesLayer(mTestApp.getPackage())

                .forAllEntries());

    }



    @Test

    public void checkVisibility_imeAppWindowBecomesInvisible() {

        checkResults(result -> WmTraceSubject.assertThat(result)

                .showsAppWindowOnTop(mTestApp.getPackage())

                .then()

                .hidesAppWindowOnTop(mTestApp.getPackage())

                .forAllEntries());

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/CommonTransitions.java

deleted100644 → 0
+0 −399

File deleted.

Preview size limit exceeded, changes collapsed.