From e54dc43ae20014cd6aa6061d8599d902390dcd92 Mon Sep 17 00:00:00 2001 From: u7281898 Date: Sun, 30 Oct 2022 09:02:13 +1100 Subject: [PATCH 1/2] Replaced appropriate asserts with assertThat to improve code readability --- app/build.gradle | 1 + .../nrw/commons/media/MediaDetailFragment.java | 8 +++++++- .../free/nrw/commons/auth/AccountUtilUnitTest.kt | 15 +++++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ddd786bac1..92384e7c3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,6 +47,7 @@ dependencies { implementation 'com.karumi:dexter:5.0.0' implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'com.google.firebase:firebase-firestore:24.1.2' kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION" implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:$ADAPTER_DELEGATES_VERSION" diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 2a930bdfce..473219a880 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -1,5 +1,4 @@ package fr.free.nrw.commons.media; - import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_OK; import static android.view.View.GONE; @@ -11,6 +10,11 @@ import static fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT; import static fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION; import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources; +//import org.junit.Test; +//import static org.junit.Assert.assertThat; +//import static org.hamcrest.Matchers.is; +//import static org.hamcrest.Matchers.not; +//import static org.hamcrest.Matchers.nullValue; import android.annotation.SuppressLint; import android.app.AlertDialog; import android.content.Context; @@ -53,6 +57,7 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; import com.facebook.imagepipeline.request.ImageRequest; +import com.google.firebase.firestore.util.Assert; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; import fr.free.nrw.commons.LocationPicker.LocationPicker; @@ -991,6 +996,7 @@ public void onActivityResult(final int requestCode, final int resultCode, if (requestCode == REQUEST_CODE && resultCode == RESULT_OK) { +// assertThat(data, not(nullValue())); assert data != null; final CameraPosition cameraPosition = LocationPicker.getCameraPosition(data); diff --git a/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt index ca309344f5..b9390b87bb 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/auth/AccountUtilUnitTest.kt @@ -3,13 +3,16 @@ package fr.free.nrw.commons.auth import fr.free.nrw.commons.FakeContextWrapper import fr.free.nrw.commons.FakeContextWrapperWithException import fr.free.nrw.commons.TestCommonsApplication -import org.junit.Assert +import org.junit.Assert.* import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config +import org.hamcrest.CoreMatchers.*; +import org.hamcrest.MatcherAssert.assertThat; + @RunWith(RobolectricTestRunner::class) @Config(sdk = [21], application = TestCommonsApplication::class) @@ -28,13 +31,13 @@ class AccountUtilUnitTest { @Test @Throws(Exception::class) fun checkNotNull() { - Assert.assertNotNull(accountUtil) + assertThat(accountUtil, not(nullValue())); } @Test @Throws(Exception::class) fun testGetUserName() { - Assert.assertEquals(AccountUtil.getUserName(context), "test@example.com") + assertThat(AccountUtil.getUserName(context), equalTo("test@example.com")) } @Test @@ -42,13 +45,13 @@ class AccountUtilUnitTest { fun testGetUserNameWithException() { val context = FakeContextWrapperWithException(RuntimeEnvironment.application.applicationContext) - Assert.assertEquals(AccountUtil.getUserName(context), null) + assertThat(AccountUtil.getUserName(context), not(nullValue())) } @Test @Throws(Exception::class) fun testAccount() { - Assert.assertEquals(AccountUtil.account(context)?.name, "test@example.com") + assertThat(AccountUtil.account(context)?.name, equalTo("test@example.com")) } @Test @@ -56,6 +59,6 @@ class AccountUtilUnitTest { fun testAccountWithException() { val context = FakeContextWrapperWithException(RuntimeEnvironment.application.applicationContext) - Assert.assertEquals(AccountUtil.account(context), null) + assertThat(AccountUtil.account(context), not(nullValue())) } } \ No newline at end of file From 74212ac2d581be479a15c2bae09dd5b945861b31 Mon Sep 17 00:00:00 2001 From: u7281898 Date: Sun, 30 Oct 2022 19:54:49 +1100 Subject: [PATCH 2/2] Removed unnecessary implementation --- app/build.gradle | 2 +- .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 1 - data-client/build.gradle | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92384e7c3d..e2b82c0de2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation 'com.karumi:dexter:5.0.0' implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'com.google.firebase:firebase-firestore:24.1.2' +// implementation 'com.google.firebase:firebase-firestore:24.1.2' kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION" implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:$ADAPTER_DELEGATES_VERSION" diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 473219a880..6a6df5bd47 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -57,7 +57,6 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; import com.facebook.imagepipeline.request.ImageRequest; -import com.google.firebase.firestore.util.Assert; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; import fr.free.nrw.commons.LocationPicker.LocationPicker; diff --git a/data-client/build.gradle b/data-client/build.gradle index 382c1a651f..ed716c156c 100644 --- a/data-client/build.gradle +++ b/data-client/build.gradle @@ -32,11 +32,11 @@ version = "${VERSION_NAME}" group = "${GROUP_ID}" android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { minSdkVersion 19 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "${VERSION_NAME}"