Permalink
Browse files

Updating <size>Test annotations to be from

android.support.test.filters.* across all projects.
Removed the annotation from unit tests.
  • Loading branch information...
1 parent e992f10 commit 8f94016282cca16d3dec139802b5bd0aaa503841 Douglas Sigelbaum committed Dec 21, 2016
Showing with 16 additions and 26 deletions.
  1. +1 −1 .../app/src/androidTest/java/com/example/android/testing/ServiceTestRuleSample/LocalServiceTest.java
  2. +1 −1 ...est/java/com/example/android/testing/androidjunitrunnersample/CalculatorAddParameterizedTest.java
  3. +1 −1 ...Test/java/com/example/android/testing/androidjunitrunnersample/CalculatorInstrumentationTest.java
  4. +1 −1 ...app/src/androidTest/java/com/example/android/testing/androidjunitrunnersample/CalculatorTest.java
  5. +1 −2 ...t/java/com/example/android/testing/androidjunitrunnersample/OperationHintInstrumentationTest.java
  6. +1 −1 .../com/example/android/testing/androidjunitrunnersample/OperationHintLegacyInstrumentationTest.java
  7. +1 −1 ...src/androidTest/java/com/example/android/testing/espresso/BasicSample/ChangeTextBehaviorTest.java
  8. +1 −1 ...c/androidTest/java/com/example/android/testing/espresso/CustomMatcherSample/HintMatchersTest.java
  9. +1 −5 ...androidTest/java/com/example/android/testing/espresso/DataAdapterSample/LongListActivityTest.java
  10. +1 −1 ...idTest/java/com/example/android/testing/espresso/IdlingResourceSample/ChangeTextBehaviorTest.java
  11. +1 −1 ...est/java/com/example/android/testing/espresso/intents/AdvancedSample/ImageViewerActivityTest.java
  12. +1 −1 ...app/src/androidTest/java/com/example/android/testing/espresso/BasicSample/DialerActivityTest.java
  13. +1 −1 .../src/androidTest/java/com/example/android/testing/espresso/MultiWindowSample/MultiWindowTest.java
  14. +1 −1 ...roidTest/java/com/example/android/testing/espresso/RecyclerViewSample/RecyclerViewSampleTest.java
  15. +1 −1 ...rc/androidTest/java/com/example/android/testing/espresso/web/BasicSample/WebViewActivityTest.java
  16. +0 −3 ...ple/app/src/test/java/com/example/android/testing/unittesting/BasicSample/EmailValidatorTest.java
  17. +0 −2 ...rc/test/java/com/example/android/testing/unittesting/BasicSample/SharedPreferencesHelperTest.java
  18. +1 −1 .../java/com/example/android/testing/unittesting/basicunitandroidtest/LogHistoryAndroidUnitTest.java
@@ -19,9 +19,9 @@
import android.content.Intent;
import android.os.IBinder;
import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
import android.support.test.rule.ServiceTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.MediumTest;
import org.junit.Rule;
import org.junit.Test;
@@ -21,7 +21,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
import java.lang.Iterable;
import java.util.Arrays;
@@ -24,11 +24,11 @@
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
import org.junit.runner.RunWith;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.support.test.runner.AndroidJUnitRunner;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -20,8 +20,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -18,12 +18,11 @@
import junit.framework.TestSuite;
-import org.junit.Test;
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
+import android.support.test.filters.LargeTest;
import android.support.test.runner.AndroidJUnitRunner;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import static com.example.android.testing.androidjunitrunnersample.HintMatcher.withHint;
import static android.support.test.espresso.Espresso.onView;
@@ -20,9 +20,9 @@
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
+import android.support.test.filters.LargeTest;
import android.support.test.runner.AndroidJUnitRunner;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
@@ -26,8 +26,8 @@
import android.support.test.espresso.matcher.ViewMatchers;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+import android.support.test.filters.LargeTest;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -21,10 +21,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
@@ -25,12 +25,10 @@
import android.support.test.espresso.Espresso;
import android.support.test.espresso.action.ViewActions;
import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import java.util.Map;
import static android.support.test.espresso.Espresso.onData;
import static android.support.test.espresso.Espresso.onView;
@@ -41,10 +39,8 @@
import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
/**
@@ -26,9 +26,9 @@
import android.support.test.espresso.Espresso;
import android.support.test.espresso.IdlingResource;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
import org.junit.After;
import org.junit.Before;
@@ -22,9 +22,9 @@
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Before;
import org.junit.Rule;
@@ -43,9 +43,9 @@
import android.net.Uri;
import android.os.Build;
import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Before;
import org.junit.Rule;
@@ -15,10 +15,10 @@
*/
package com.example.android.testing.espresso.MultiWindowSample;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import org.junit.Before;
import org.junit.Rule;
@@ -24,9 +24,9 @@
import android.support.test.espresso.contrib.RecyclerViewActions;
import android.support.test.espresso.matcher.ViewMatchers;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -25,10 +25,10 @@
import android.support.test.espresso.web.sugar.Web;
import android.support.test.espresso.web.webdriver.DriverAtoms;
import android.support.test.espresso.web.webdriver.Locator;
+import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
import android.webkit.WebView;
import static android.support.test.espresso.web.assertion.WebViewAssertions.webMatches;
@@ -16,8 +16,6 @@
package com.example.android.testing.unittesting.BasicSample;
-import android.test.suitebuilder.annotation.SmallTest;
-
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -27,7 +25,6 @@
/**
* Unit tests for the EmailValidator logic.
*/
-@SmallTest
public class EmailValidatorTest {
@@ -26,15 +26,13 @@
import org.mockito.runners.MockitoJUnitRunner;
import android.content.SharedPreferences;
-import android.test.suitebuilder.annotation.SmallTest;
import java.util.Calendar;
/**
* Unit tests for the {@link SharedPreferencesHelper} that mocks {@link SharedPreferences}.
*/
-@SmallTest
@RunWith(MockitoJUnitRunner.class)
public class SharedPreferencesHelperTest {
@@ -17,8 +17,8 @@
package com.example.android.testing.unittesting.basicunitandroidtest;
import android.os.Parcel;
+import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;
import org.junit.Before;

0 comments on commit 8f94016

Please sign in to comment.