Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2702)

Unified Diff: base/android/javatests/src/org/chromium/base/test/DisabledTest.java

Issue 10829104: Android: upstream @DisabledTest annotation for instrumentation tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/javatests/src/org/chromium/base/test/DisabledTest.java
diff --git a/base/android/java/src/org/chromium/base/AccessedByNative.java b/base/android/javatests/src/org/chromium/base/test/DisabledTest.java
similarity index 57%
copy from base/android/java/src/org/chromium/base/AccessedByNative.java
copy to base/android/javatests/src/org/chromium/base/test/DisabledTest.java
index 8248cc68eedefd598305f27707f438f0e815df55..2c8ad9a5ab72a5e944d545baa9f04b9b61fe1167 100644
--- a/base/android/java/src/org/chromium/base/AccessedByNative.java
+++ b/base/android/javatests/src/org/chromium/base/test/DisabledTest.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.base;
+package org.chromium.base.test;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -10,11 +10,12 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * @AccessedByNative is used to ensure proguard will keep this field, since it's
- * only accessed by native.
+ * This annotation is for disabled tests.
+ * <p>
+ * Tests with this annotation will not be run on any of the normal bots.
+ * Please note that they might eventually run on a special bot.
*/
-@Target(ElementType.FIELD)
+@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface AccessedByNative {
- public String value() default "";
+public @interface DisabledTest {
}
« no previous file with comments | « no previous file | content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698