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

PAINTROID-394: Fixing and refactoring Tests #1042

Merged
merged 1 commit into from
Jun 23, 2022
Merged

PAINTROID-394: Fixing and refactoring Tests #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 42 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Paintroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
testImplementation "androidx.test:core-ktx:1.4.0"
implementation 'com.android.support.test.espresso:espresso-idling-resource:3.1.0'
}

tasks.withType(Javadoc).all {
Expand Down
4 changes: 2 additions & 2 deletions Paintroid/config/detekt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ complexity:
active: false
ignoredLabels: ""
LargeClass:
active: true
threshold: 650
active: false
threshold: 1000
LongMethod:
active: true
threshold: 80
Expand Down
14 changes: 11 additions & 3 deletions ...c/androidTest/java/org/catrobat/paintroid/test/espresso/CatrobatImageIOIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ import androidx.test.espresso.Espresso
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions
import androidx.test.espresso.action.ViewActions.replaceText
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.RootMatchers
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.rule.ActivityTestRule
import androidx.test.rule.GrantPermissionRule
Expand Down Expand Up @@ -66,6 +68,7 @@ class CatrobatImageIOIntegrationTest {
companion object {
private const val IMAGE_NAME = "fileName"
}

@Before
fun setUp() {
activity = launchActivityRule.activity
Expand Down Expand Up @@ -98,9 +101,14 @@ class CatrobatImageIOIntegrationTest {
).inRoot(RootMatchers.isPlatformPopup()).perform(ViewActions.click())
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText(IMAGE_NAME))
onView(withText(R.string.save_button_text)).perform(ViewActions.click())
onView(withText(R.string.save_button_text)).check(matches(isDisplayed()))
.perform(ViewActions.click())
onView(withText(R.string.overwrite_button_text)).check(matches(isDisplayed()))
.perform(ViewActions.click())
uriFile = activity.model.savedPictureUri!!
Assert.assertNotNull(uriFile)
Assert.assertNotNull(activity.workspace.getCommandSerializationHelper().readFromFile(uriFile))
Assert.assertNotNull(
activity.workspace.getCommandSerializationHelper().readFromFile(uriFile)
)
}
}
2 changes: 1 addition & 1 deletion ...oidTest/java/org/catrobat/paintroid/test/espresso/FileFromOtherSourceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class FileFromOtherSourceIntegrationTest {
public ScreenshotOnFailRule screenshotOnFailRule = new ScreenshotOnFailRule();

@ClassRule
public static GrantPermissionRule grantPermissionRule = EspressoUtils.grantPermissionRulesVersionCheck();
public static GrantPermissionRule grantPermissionRule = EspressoUtils.INSTANCE.grantPermissionRulesVersionCheck();

private ContentResolver resolver;
private MainActivity activity;
Expand Down
12 changes: 11 additions & 1 deletion ...d/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,16 @@
import org.catrobat.paintroid.tools.Tool;
import org.catrobat.paintroid.tools.ToolType;
import org.catrobat.paintroid.tools.options.ToolOptionsViewController;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

import androidx.annotation.ArrayRes;
import androidx.annotation.ColorInt;
import androidx.test.espresso.IdlingRegistry;
import androidx.test.espresso.idling.CountingIdlingResource;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;

Expand Down Expand Up @@ -71,7 +74,7 @@
public class LandscapeIntegrationTest {

private MainActivity mainActivity;

private CountingIdlingResource idlingResource;
@Rule
public ActivityTestRule<MainActivity> activityTestRule = new ActivityTestRule<>(MainActivity.class);

Expand All @@ -89,6 +92,13 @@ private ToolOptionsViewController getToolOptionsViewController() {
@Before
public void setUp() {
mainActivity = activityTestRule.getActivity();
idlingResource = mainActivity.getIdlingResource();
IdlingRegistry.getInstance().register(idlingResource);
}

@After
public void tearDown() {
IdlingRegistry.getInstance().unregister(idlingResource);
}

@Test
Expand Down
Loading