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

Commit 60c326be authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Added WindowManager unit tests to pre-submit"

parents 76f856ac 5fc70966

services/tests/servicestests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    guava \

    android-support-test \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    ShortcutManagerTestUtils



LOCAL_JAVA_LIBRARIES := android.test.runner

services/tests/servicestests/src/com/android/server/wm/AppWindowTokenTests.java

+2 −1
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



import android.content.Context;

import android.platform.test.annotations.Presubmit;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.IWindow;

import android.view.WindowManager;

import android.view.WindowManagerPolicy;



import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
@@ -42,6 +42,7 @@ import static org.junit.Assert.assertNull; 
 * Run: adb shell am instrument -w -e class com.android.server.wm.AppWindowTokenTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

 */

@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class AppWindowTokenTests {

services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import org.junit.Test;

import org.junit.runner.RunWith;



import android.platform.test.annotations.Presubmit;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;
@@ -43,6 +44,7 @@ import static org.junit.Assert.assertTrue; 
 * Run: adb shell am instrument -w -e class com.android.server.wm.WindowContainerTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

 */

@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowContainerTests {

services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java

+2 −1
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ import org.junit.runner.RunWith; 


import android.content.Context;

import android.os.Binder;

import android.platform.test.annotations.Presubmit;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.IWindow;

import android.view.WindowManager;

import android.view.WindowManagerPolicy;



import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
@@ -46,6 +46,7 @@ import static org.junit.Assert.assertTrue; 
 * Run: adb shell am instrument -w -e class com.android.server.wm.WindowStateTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

 */

@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowStateTests {

services/tests/servicestests/src/com/android/server/wm/WindowTokenTests.java

+2 −1
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



import android.content.Context;

import android.platform.test.annotations.Presubmit;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.IWindow;

import android.view.WindowManager;

import android.view.WindowManagerPolicy;



import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
@@ -43,6 +43,7 @@ import static org.junit.Assert.assertTrue; 
 * Run: adb shell am instrument -w -e class com.android.server.wm.WindowTokenTests com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

 */

@SmallTest

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowTokenTests {