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

Commit 6842ee55 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Fixed incorrect annotation Flaky to FlakyTest"

parents befc8efb 36d0a34c

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.WindowConfiguration; 
import android.content.res.Configuration;

import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.DisplayInfo;
@@ -44,6 +45,7 @@ import static org.junit.Assert.assertTrue; 
 *  bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests

 */

@SmallTest

@FlakyTest(bugId = 74078662)

@Presubmit

@org.junit.runner.RunWith(AndroidJUnit4.class)

public class WindowConfigurationTests extends WindowTestsBase {

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.verify; 
 * atest FrameworksServicesTests:com.android.server.wm.WindowStateTests

 */

@SmallTest

@Flaky(bugId = 74078662)

@FlakyTest(bugId = 74078662)

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowStateTests extends WindowTestsBase {

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; 
 *  bit FrameworksServicesTests:com.android.server.wm.WindowTokenTests

 */

@SmallTest

@Flaky(bugId = 74078662)

@FlakyTest(bugId = 74078662)

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowTokenTests extends WindowTestsBase {

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.nio.charset.StandardCharsets; 
 *  bit FrameworksServicesTests:com.android.server.wm.WindowTracingTest

 */

@SmallTest

@Flaky(bugId = 74078662)

@FlakyTest(bugId = 74078662)

@Presubmit

@RunWith(AndroidJUnit4.class)

public class WindowTracingTest extends WindowTestsBase {

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import java.util.LinkedList; 
 *  bit FrameworksServicesTests:com.android.server.wm.ZOrderingTests

 */

@SmallTest

@Flaky(bugId = 74078662)

@FlakyTest(bugId = 74078662)

@Presubmit

@RunWith(AndroidJUnit4.class)

public class ZOrderingTests extends WindowTestsBase {