Skip to content

PAINTROID-782 Use file picker for choosing file saving location #1347

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PAINTROID-782 Use file picker for choosing file saving location #1347

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
74 changes: 50 additions & 24 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 @@ -20,13 +20,20 @@

package org.catrobat.paintroid.test.espresso

import android.app.Activity
import android.app.Instrumentation
import android.content.Intent
import android.net.Uri
import android.os.Environment
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.intent.Intents.init
import androidx.test.espresso.intent.Intents.intending
import androidx.test.espresso.intent.Intents.release
import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
import androidx.test.espresso.matcher.RootMatchers
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
Expand Down Expand Up @@ -65,51 +72,70 @@ class CatrobatImageIOIntegrationTest {
val screenshotOnFailRule = ScreenshotOnFailRule()

@get:Rule
val grantPermissionRule: GrantPermissionRule = EspressoUtils.grantPermissionRulesVersionCheck()
val grantPermissionRule: GrantPermissionRule =
EspressoUtils.grantPermissionRulesVersionCheck()

private var uriFile: Uri? = null
private lateinit var activity: MainActivity

companion object {
private const val IMAGE_NAME = "fileName"
}

@Before
fun setUp() { activity = launchActivityRule.activity }
fun setUp() {
activity = launchActivityRule.activity
init()

val downloadsDir = activity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)!!
val targetFile = File(downloadsDir, "$IMAGE_NAME.CATROBAT_IMAGE_ENDING")

downloadsDir.mkdirs()

if (!targetFile.exists()) {
targetFile.createNewFile()
}

val fakeUri = Uri.fromFile(targetFile)

val resultData = Intent().setData(fakeUri)
intending(hasAction(Intent.ACTION_CREATE_DOCUMENT))
.respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, resultData))
}

@After
fun tearDown() {
val imagesDirectory =
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).toString()
val pathToFile = imagesDirectory + File.separator + IMAGE_NAME + "." + CATROBAT_IMAGE_ENDING
val imageFile = File(pathToFile)
if (imageFile.exists()) {
imageFile.delete()
}
// clean up
release()
activity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
?.let { dir ->
File(dir, "$IMAGE_NAME.$CATROBAT_IMAGE_ENDING").delete()
}
}

@Test
fun testWriteAndReadCatrobatImage() {
onDrawingSurfaceView()
.perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))
TopBarViewInteraction.onTopBarView()
.performOpenMoreOptions()
onView(withText(R.string.menu_save_image))
.perform(ViewActions.click())
onView(withId(R.id.pocketpaint_save_dialog_spinner))
.perform(ViewActions.click())
onDrawingSurfaceView().perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))

TopBarViewInteraction.onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(ViewActions.click())
onView(withId(R.id.pocketpaint_save_dialog_spinner)).perform(ViewActions.click())
Espresso.onData(
AllOf.allOf(
Matchers.`is`(Matchers.instanceOf<Any>(String::class.java)),
Matchers.`is`(Matchers.instanceOf(String::class.java)),
Matchers.`is`(FileIO.FileType.CATROBAT.value)
)
).inRoot(RootMatchers.isPlatformPopup()).perform(ViewActions.click())
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText(IMAGE_NAME))
onView(withId(R.id.pocketpaint_image_name_save_text)).perform(replaceText(IMAGE_NAME))
onView(withText(R.string.save_button_text)).check(matches(isDisplayed()))
.perform(ViewActions.click())
uriFile = activity.model.savedPictureUri!!
Assert.assertNotNull(uriFile)
Assert.assertNotNull(CommandSerializer(activity, activity.commandManager, activity.model).readFromFile(uriFile!!))

Espresso.onIdle()

val uriFile = activity.model.savedPictureUri
Assert.assertNotNull("savedPictureUri was never set", uriFile)

val commands = CommandSerializer(activity, activity.commandManager, activity.model)
.readFromFile(uriFile!!)
Assert.assertNotNull("Failed to read back Catrobat commands", commands)
}
}
Loading