Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] bump version vanniktech to 0.11.1 #107

Merged
merged 2 commits into from
Jun 30, 2021
Merged

[Fix] bump version vanniktech to 0.11.1 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3712f76
[Fix] bump version vanniktech to 0.11.1
radityagumay Nov 20, 2020
db1e779
change import for InstrumentationRegistry
radityagumay Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ ext {
dep = [
// Build and upload with:
// ./gradlew clean assemble sourcesJar androidSourcesJar javadocsJar androidJavadocsJar uploadArchives --no-daemon --no-parallel
// Need to use snapshot version and explicitly include javadoc/sources tasks until
// https://github.com/vanniktech/gradle-maven-publish-plugin/issues/54 is fixed.
gradleMavenPublishPlugin : 'com.vanniktech:gradle-maven-publish-plugin:0.9.0-SNAPSHOT',
gradleMavenPublishPlugin : 'com.vanniktech:gradle-maven-publish-plugin:0.11.1',
androidPlugin : 'com.android.tools.build:gradle:3.6.0',
groovyPlugin : 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.1',
nexusPlugin : 'com.bmuschko:gradle-nexus-plugin:2.3.1',
Expand Down
72 changes: 37 additions & 35 deletions okreplay-sample/src/androidTest/java/okreplay/sample/ExampleInstrumentedBarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package okreplay.sample;

import androidx.test.core.app.ApplicationProvider;
import androidx.test.espresso.IdlingRegistry;
import androidx.test.espresso.IdlingResource;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;

import com.jakewharton.espresso.OkHttp3IdlingResource;

import org.junit.After;
Expand All @@ -15,6 +9,11 @@
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;

import androidx.test.espresso.IdlingRegistry;
import androidx.test.espresso.IdlingResource;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import okreplay.AndroidTapeRoot;
import okreplay.MatchRules;
import okreplay.OkReplay;
Expand All @@ -31,33 +30,36 @@

@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedBarTest {
private final DependencyGraph graph = DependencyGraph.Companion.instance();
private final ActivityTestRule<MainActivity> activityTestRule =
new ActivityTestRule<>(MainActivity.class);
private final OkReplayConfig configuration = new OkReplayConfig.Builder()
.tapeRoot(new AndroidTapeRoot(InstrumentationRegistry.getContext(), getClass()))
.defaultMode(TapeMode.READ_WRITE)
.sslEnabled(true)
.interceptor(graph.getOkReplayInterceptor())
.defaultMatchRules(MatchRules.host, MatchRules.path, MatchRules.method)
.build();
@Rule public final TestRule testRule =
new OkReplayRuleChain(configuration, activityTestRule).get();
private final IdlingResource okHttp3IdlingResource =
OkHttp3IdlingResource.create("OkHttp", graph.getOkHttpClient());

@Before public void setUp() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@After public void tearDown() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@Test
@OkReplay
public void bar() {
onView(withId(R.id.navigation_repositories)).perform(click());
onView(withId(R.id.message)).check(matches(withText(containsString("AbsListViewHelper"))));
}
private final DependencyGraph graph = DependencyGraph.Companion.instance();
private final ActivityTestRule<MainActivity> activityTestRule =
new ActivityTestRule<>(MainActivity.class);
private final OkReplayConfig configuration = new OkReplayConfig.Builder()
.tapeRoot(new AndroidTapeRoot(InstrumentationRegistry.getInstrumentation().getTargetContext(), getClass()))
.defaultMode(TapeMode.READ_WRITE)
.sslEnabled(true)
.interceptor(graph.getOkReplayInterceptor())
.defaultMatchRules(MatchRules.host, MatchRules.path, MatchRules.method)
.build();
@Rule
public final TestRule testRule =
new OkReplayRuleChain(configuration, activityTestRule).get();
private final IdlingResource okHttp3IdlingResource =
OkHttp3IdlingResource.create("OkHttp", graph.getOkHttpClient());

@Before
public void setUp() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@After
public void tearDown() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@Test
@OkReplay
public void bar() {
onView(withId(R.id.navigation_repositories)).perform(click());
onView(withId(R.id.message)).check(matches(withText(containsString("AbsListViewHelper"))));
}
}
73 changes: 38 additions & 35 deletions okreplay-sample/src/androidTest/java/okreplay/sample/ExampleInstrumentedFooTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package okreplay.sample;

import androidx.test.core.app.ApplicationProvider;
import androidx.test.espresso.IdlingRegistry;
import androidx.test.espresso.IdlingResource;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;

import com.jakewharton.espresso.OkHttp3IdlingResource;

import org.junit.After;
Expand All @@ -15,6 +9,12 @@
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;

import androidx.test.core.app.ApplicationProvider;
import androidx.test.espresso.IdlingRegistry;
import androidx.test.espresso.IdlingResource;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import okreplay.AndroidTapeRoot;
import okreplay.AssetManager;
import okreplay.MatchRules;
Expand All @@ -33,36 +33,39 @@

@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedFooTest {
private final DependencyGraph graph = DependencyGraph.Companion.instance();
private final ActivityTestRule<MainActivity> activityTestRule =
new ActivityTestRule<>(MainActivity.class);
private final AssetManager assetManager =
new AssetManager(InstrumentationRegistry.getContext());
private final OkReplayConfig configuration = new OkReplayConfig.Builder()
.tapeRoot(new AndroidTapeRoot(assetManager, getClass().getSimpleName()))
.defaultMode(TapeMode.READ_WRITE)
.sslEnabled(true)
.interceptor(graph.getOkReplayInterceptor())
.defaultMatchRules(MatchRules.host, MatchRules.path, MatchRules.method)
.build();
@Rule public final TestRule testRule =
new OkReplayRuleChain(configuration, activityTestRule).get();
private final IdlingResource okHttp3IdlingResource =
OkHttp3IdlingResource.create("OkHttp", graph.getOkHttpClient());
private final DependencyGraph graph = DependencyGraph.Companion.instance();
private final ActivityTestRule<MainActivity> activityTestRule =
new ActivityTestRule<>(MainActivity.class);
private final AssetManager assetManager =
new AssetManager(InstrumentationRegistry.getInstrumentation().getTargetContext());
private final OkReplayConfig configuration = new OkReplayConfig.Builder()
.tapeRoot(new AndroidTapeRoot(assetManager, getClass().getSimpleName()))
.defaultMode(TapeMode.READ_WRITE)
.sslEnabled(true)
.interceptor(graph.getOkReplayInterceptor())
.defaultMatchRules(MatchRules.host, MatchRules.path, MatchRules.method)
.build();
@Rule
public final TestRule testRule =
new OkReplayRuleChain(configuration, activityTestRule).get();
private final IdlingResource okHttp3IdlingResource =
OkHttp3IdlingResource.create("OkHttp", graph.getOkHttpClient());

@Before public void setUp() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}
@Before
public void setUp() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@After public void tearDown() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}
@After
public void tearDown() {
IdlingRegistry.getInstance().register(okHttp3IdlingResource);
}

@Test
@OkReplay
public void foo() {
assertEquals("okreplay.sample", ApplicationProvider.getApplicationContext().getPackageName());
onView(withId(R.id.navigation_repositories)).perform(click());
onView(withId(R.id.message)).check(matches(withText(containsString("6502Android"))));
}
@Test
@OkReplay
public void foo() {
assertEquals("okreplay.sample", ApplicationProvider.getApplicationContext().getPackageName());
onView(withId(R.id.navigation_repositories)).perform(click());
onView(withId(R.id.message)).check(matches(withText(containsString("6502Android"))));
}
}