Merge pull request #29 from googlecodelabs/fix-testsize-annotations

Fix testsize annotations + replaced NVA with espresso-contrib version

Author: slinzner

app/src/androidTest/java/com/example/android/testing/notes/custom/action/NavigationViewActions.java

@@ -23,10 +23,10 @@
 import org.junit.runner.RunWith;
 
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v4.widget.DrawerLayout;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.Gravity;
 
 import static android.support.test.espresso.Espresso.onView;
@@ -35,10 +35,10 @@
 import static android.support.test.espresso.contrib.DrawerActions.open;
 import static android.support.test.espresso.contrib.DrawerMatchers.isClosed;
 import static android.support.test.espresso.contrib.DrawerMatchers.isOpen;
+import static android.support.test.espresso.contrib.NavigationViewActions.navigateTo;
 import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.example.android.testing.notes.custom.action.NavigationViewActions.navigateTo;
 
 /**
  * Tests for the {@link DrawerLayout} layout component in {@link NotesActivity} which manages

app/src/androidTest/java/com/example/android/testing/notes/notes/AppNavigationTest.java

@@ -25,10 +25,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.support.v7.widget.RecyclerView;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.text.TextUtils;
 import android.view.View;
 

app/src/androidTest/java/com/example/android/testing/notes/notes/NotesScreenTest.java

@@ -29,9 +29,9 @@
 import android.provider.MediaStore;
 import android.support.test.espresso.Espresso;
 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 static android.support.test.InstrumentationRegistry.getTargetContext;
 import static android.support.test.espresso.Espresso.onView;

app/src/androidTestMock/java/com/example/android/testing/notes/addnote/AddNoteScreenTest.java

@@ -29,10 +29,9 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.support.test.espresso.Espresso;
-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 static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;