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-762 Update to Android 14 #1342

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

PAINTROID-762 Update to Android 14 #1342

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
8 changes: 5 additions & 3 deletions Paintroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ android {
}

packagingOptions {
exclude "META-INF/AL2.0"
exclude "META-INF/LGPL2.1"
resources {
excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1', "**/attach_hotspot_windows.dll"]
merges += ['META-INF/licenses/ASM']
}
}
}

Expand Down Expand Up @@ -141,7 +143,7 @@ dependencies {
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation 'org.mockito:mockito-android:2.18.3'
androidTestImplementation 'org.mockito:mockito-android:3.6.28'
androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'

Expand Down
13 changes: 5 additions & 8 deletions ...droidTest/java/org/catrobat/paintroid/test/espresso/FileFromOtherSourceIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,13 @@ class FileFromOtherSourceIntegrationTest {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES)
}
val imageUri =
resolver?.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
val imageUri = resolver?.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
try {
val requireNonNull = Objects.requireNonNull(imageUri)
val fos = requireNonNull.let {
it?.let { it1 -> resolver?.openOutputStream(it1) }
val fos = imageUri?.let {
resolver?.openOutputStream(it)
}
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
assert(fos != null)
fos!!.close()
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos!!))
fos.close()
} catch (e: IOException) {
throw AssertionError("Picture file could not be created.", e)
}
Expand Down
2 changes: 1 addition & 1 deletion Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ class LayerIntegrationTest {
)
val imageUri = Uri.fromFile(imageFile)
launchActivityRule.activity.myContentResolver.openOutputStream(imageUri).use { fos ->
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos!!))
}
deletionFileList.add(imageFile)
return imageUri
Expand Down
13 changes: 5 additions & 8 deletions ...troid/src/androidTest/java/org/catrobat/paintroid/test/espresso/MainActivityIntentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import org.junit.runner.RunWith
import org.mockito.MockitoAnnotations
import java.io.File
import java.io.IOException
import java.util.Objects

@RunWith(AndroidJUnit4::class)
class MainActivityIntentTest {
Expand Down Expand Up @@ -78,7 +77,7 @@ class MainActivityIntentTest {
Intents.release()
}

private fun createTestImageFile(): Uri? {
private fun createTestImageFile(): Uri {
val bitmap = Bitmap.createBitmap(400, 400, Bitmap.Config.ARGB_8888)
val contentValues = ContentValues()
contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, "testfile.jpeg")
Expand All @@ -89,15 +88,13 @@ class MainActivityIntentTest {
val imageUri =
contentResolver?.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
try {
val fos = Objects.requireNonNull(imageUri)
?.let { contentResolver?.openOutputStream(it) }
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos))
assert(fos != null)
fos?.close()
val fos = imageUri?.let { contentResolver?.openOutputStream(it) }
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos!!))
fos.close()
} catch (e: IOException) {
throw AssertionError("Picture file could not be created.", e)
}
val imageFile = File(imageUri?.path, "testfile.jpeg")
val imageFile = File(imageUri.path, "testfile.jpeg")
deletionFileList.add(imageFile)
return imageUri
}
Expand Down
93 changes: 56 additions & 37 deletions .../androidTest/java/org/catrobat/paintroid/test/espresso/MenuFileActivityIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Color
import android.net.Uri
import android.os.Build
Expand Down Expand Up @@ -75,6 +76,7 @@ import org.hamcrest.core.IsNot
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNotSame
import org.junit.Assert.assertTrue
Expand Down Expand Up @@ -116,26 +118,28 @@ class MenuFileActivityIntegrationTest {

@After
fun tearDown() {
for (file in deletionFileList) {
if (file != null && file.exists()) {
assertTrue(file.delete())
for (uri in deletionFileList) {
if (uri != null && uri.exists()) {
assertTrue(uri.delete())
}
}
IdlingRegistry.getInstance().unregister(idlingResource)
}

@Test
fun testNewEmptyDrawingWithSave() {
FileIO.fileType = FileIO.FileType.PNG
onDrawingSurfaceView().perform(touchAt(MIDDLE))
onDrawingSurfaceView().checkPixelColor(Color.BLACK, BitmapLocationProvider.MIDDLE)
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_new_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
val fileName = "test987654"
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("test987654"))
.perform(replaceText(fileName))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
onView(isRoot()).perform(waitFor(500))
addFileToDeletionFileList(fileName, "png", Environment.DIRECTORY_PICTURES)
onDrawingSurfaceView().checkPixelColor(Color.TRANSPARENT, BitmapLocationProvider.MIDDLE)
}

Expand Down Expand Up @@ -239,7 +243,6 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("test98765"))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
assertTrue(activity.model.isSaved)
Expand Down Expand Up @@ -268,21 +271,31 @@ class MenuFileActivityIntegrationTest {
.edit()
.clear()
.commit()

onDrawingSurfaceView().perform(touchAt(MIDDLE))
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(click())
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("testSaveCopy"))
onView(withText(R.string.save_button_text)).perform(click())

assertNotNull(activity.model.savedPictureUri)
if (!activity.model.isOpenedFromCatroid) {
assertNotSame(
"null",
MainActivityPresenter.getPathFromUri(activity, activity.model.savedPictureUri!!)
)
}

addUriToDeletionFileList(activity.model.savedPictureUri)
val oldFile = File(activity.model.savedPictureUri.toString())
val savedImageFile =
activity.model.savedPictureUri?.let {
MainActivityPresenter.getPathFromUri(
activity,
it
)
}
?.let { File(it) }
onView(withText(R.string.pocketpaint_no)).perform(click())
onView(withText(R.string.pocketpaint_ok)).perform(click())
onDrawingSurfaceView().perform(touchAt(HALFWAY_BOTTOM_MIDDLE))
Expand All @@ -291,17 +304,13 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("copy1"))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
val newFile = File(activity.model.savedPictureUri.toString())
assertNotSame("Changes to saved", oldFile, newFile)
assertNotNull(activity.model.savedPictureUri)
if (!activity.model.isOpenedFromCatroid) {
assertNotSame(
"null",
MainActivityPresenter.getPathFromUri(activity, activity.model.savedPictureUri!!)
)
}
addUriToDeletionFileList(activity.model.savedPictureUri)

val savedCopyFile = createFileFromFileName("copy1", "png", Environment.DIRECTORY_PICTURES)
val bitmap1 = BitmapFactory.decodeFile(savedImageFile?.absolutePath)
val bitmap2 = BitmapFactory.decodeFile(savedCopyFile.absolutePath)
assertNotEquals("Bitmaps should not be the same", bitmap1, bitmap2)

addFileToDeletionFileList("copy1", "png", Environment.DIRECTORY_PICTURES)
}

@Test
Expand All @@ -328,13 +337,12 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("12345test12345"))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
onView(isRoot()).perform(waitFor(300))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
onView(withText(R.string.overwrite_button_text)).check(matches(isDisplayed()))
}

Expand All @@ -351,7 +359,6 @@ class MenuFileActivityIntegrationTest {
onDrawingSurfaceView().perform(touchAt(MIDDLE))
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(click())
onView(isRoot()).perform(waitFor(200))
val newImageNumber = launchActivityRule.activity.presenter.imageNumber
assertEquals((imageNumber + 1).toLong(), newImageNumber.toLong())
}
Expand All @@ -365,7 +372,6 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText("test9876"))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
val newImageNumber = launchActivityRule.activity.presenter.imageNumber
Expand All @@ -386,7 +392,6 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText(defaultFileName))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
val oldFile = File(activity.model.savedPictureUri.toString())
Expand All @@ -398,7 +403,6 @@ class MenuFileActivityIntegrationTest {
onView(withId(R.id.pocketpaint_image_name_save_text))
.perform(replaceText(defaultFileName))
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
val newFile = File(activity.model.savedPictureUri.toString())
Expand Down Expand Up @@ -450,7 +454,6 @@ class MenuFileActivityIntegrationTest {
onData(allOf(`is`(instanceOf<Any>(String::class.java)), `is`("png")))
.inRoot(RootMatchers.isPlatformPopup()).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
assertNotNull(activity.model.savedPictureUri)
addUriToDeletionFileList(activity.model.savedPictureUri)
onTopBarView().performOpenMoreOptions()
Expand All @@ -472,6 +475,7 @@ class MenuFileActivityIntegrationTest {
.inRoot(RootMatchers.isPlatformPopup()).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
addFileToDeletionFileList("image$imageNumber", "png", Environment.DIRECTORY_PICTURES)
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_copy)).perform(click())
imageNumber = launchActivityRule.activity.presenter.imageNumber
Expand All @@ -498,14 +502,14 @@ class MenuFileActivityIntegrationTest {
val imageUri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
try {
val fos = imageUri?.let { resolver.openOutputStream(it) }
assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
fos?.let { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
?.let { assertTrue(it) }
assert(fos != null)
fos?.close()
} catch (e: IOException) {
throw AssertionError("Picture file could not be created.", e)
}
val imageFile = File(imageUri?.path, "testfile.jpg")
deletionFileList.add(imageFile)
addUriToDeletionFileList(imageUri)
return imageUri
}

Expand Down Expand Up @@ -534,15 +538,14 @@ class MenuFileActivityIntegrationTest {
onView(withText(R.string.menu_save_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(200))
addUriToDeletionFileList(activity.model.savedPictureUri)
val uri = activity.model.savedPictureUri
onDrawingSurfaceView().perform(touchAt(MIDDLE))
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
onView(withText(R.string.overwrite_button_text)).check(matches(isDisplayed()))
onView(withText(R.string.overwrite_button_text)).perform(click())
onView(isRoot()).perform(waitFor(500))

val oldFileName = uri?.path?.let { File(it).name }
val newFileName = activity.model.savedPictureUri?.path?.let { File(it).name }
Expand All @@ -561,12 +564,14 @@ class MenuFileActivityIntegrationTest {
onView(withText(R.string.menu_save_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(200))
addUriToDeletionFileList(activity.model.savedPictureUri)
val uri = activity.model.savedPictureUri
onDrawingSurfaceView().perform(touchAt(MIDDLE))
onTopBarView().performOpenMoreOptions()
onView(withText(R.string.menu_save_image)).perform(click())
onView(withText(R.string.save_button_text)).perform(click())
onView(isRoot()).perform(waitFor(100))
addUriToDeletionFileList(activity.model.savedPictureUri)
onView(withText(R.string.overwrite_button_text)).check(matches(isDisplayed()))
onView(withText(R.string.overwrite_button_text)).perform(click())
onView(isRoot()).perform(waitFor(500))
Expand Down Expand Up @@ -645,21 +650,35 @@ class MenuFileActivityIntegrationTest {
assertEquals(oldFileName, newFileName)

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
addFileToDeletionFileList(name, FileIO.fileType.value)
addFileToDeletionFileList(name, FileIO.fileType.value, Environment.DIRECTORY_DOWNLOADS)
} else {
addUriToDeletionFileList(activity.model.savedPictureUri)
}
}

private fun addUriToDeletionFileList(uri: Uri?) {
uri?.path?.let {
deletionFileList.add(File(it))
uri?.let {
val path = MainActivityPresenter.getPathFromUri(activity, it)
deletionFileList.add(File(path))
}
}

private fun addFileToDeletionFileList(fileName: String?, extension: String?) {
val dir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
val file = File(dir, "$fileName.$extension")
private fun addFileToDeletionFileList(
fileName: String?,
extension: String?,
directory: String
) {
val file = createFileFromFileName(fileName, extension, directory)
deletionFileList.add(file)
}

private fun createFileFromFileName(
fileName: String?,
extension: String?,
directory: String
): File {
val dir = Environment.getExternalStoragePublicDirectory(directory)
val file = File(dir, "$fileName.$extension")
return file
}
}
7 changes: 3 additions & 4 deletions Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,9 @@ class OraFileIntentTest {
}
val imageUri = resolver!!.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
try {
val fos = Objects.requireNonNull(imageUri)?.let { resolver!!.openOutputStream(it) }
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos))
assert(fos != null)
fos!!.close()
val fos = imageUri?.let { resolver?.openOutputStream(it) }
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos!!))
fos.close()
} catch (e: IOException) {
throw AssertionError("Picture file could not be created.", e)
}
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/org/catrobat/paintroid/test/espresso/catroid/OpenedFromPocketCodeNewImageTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import org.catrobat.paintroid.common.PAINTROID_PICTURE_PATH
import org.hamcrest.Matchers
import org.junit.After
import org.junit.Assert
import org.junit.Assert.assertTrue
import org.junit.Rule
import org.junit.Test
import java.io.File
Expand Down Expand Up @@ -175,9 +176,8 @@ class OpenedFromPocketCodeNewImageTest {
val imageUri = Uri.fromFile(imageFile)
try {
val fos = activity?.contentResolver?.openOutputStream(Objects.requireNonNull(imageUri))
Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
assert(fos != null)
fos?.close()
assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos!!))
fos.close()
} catch (e: IOException) {
throw AssertionError("Picture file could not be created.", e)
}
Expand Down
Loading