makeDeletion(Context context, Media media, String reason) {
- notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
- notificationBuilder = new NotificationCompat.Builder(context, CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL)
- .setOnlyAlertOnce(true);
ViewUtil.showShortToast(context, "Trying to nominate " + media.getDisplayTitle() + " for deletion");
return Single.fromCallable(() -> delete(media, reason))
@@ -122,7 +113,7 @@ private boolean delete(Media media, String reason) {
return true;
}
- public boolean showDeletionNotification(Context context, Media media, boolean result) {
+ private boolean showDeletionNotification(Context context, Media media, boolean result) {
String message;
String title = "Nominating for Deletion";
@@ -134,20 +125,9 @@ public boolean showDeletionNotification(Context context, Media media, boolean re
message = "Could not request deletion.";
}
- notificationBuilder.setDefaults(DEFAULT_ALL)
- .setContentTitle(title)
- .setStyle(new NotificationCompat.BigTextStyle()
- .bigText(message))
- .setSmallIcon(R.drawable.ic_launcher)
- .setProgress(0, 0, false)
- .setOngoing(false)
- .setPriority(PRIORITY_HIGH);
-
String urlForDelete = BuildConfig.COMMONS_URL + "/wiki/Commons:Deletion_requests/File:" + media.getFilename();
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlForDelete));
- PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, browserIntent, PendingIntent.FLAG_UPDATE_CURRENT);
- notificationBuilder.setContentIntent(pendingIntent);
- notificationManager.notify(NOTIFICATION_DELETE, notificationBuilder.build());
+ notificationHelper.showNotification(context, title, message, NOTIFICATION_DELETE, browserIntent);
return result;
}
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java
new file mode 100644
index 0000000000..b5d53a8de3
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java
@@ -0,0 +1,53 @@
+package fr.free.nrw.commons.notification;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import androidx.core.app.NotificationCompat;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.R;
+
+import static androidx.core.app.NotificationCompat.DEFAULT_ALL;
+import static androidx.core.app.NotificationCompat.PRIORITY_HIGH;
+
+@Singleton
+public class NotificationHelper {
+
+ public static final int NOTIFICATION_DELETE = 1;
+
+ private NotificationManager notificationManager;
+ private NotificationCompat.Builder notificationBuilder;
+
+ @Inject
+ public NotificationHelper(Context context) {
+ notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+ notificationBuilder = new NotificationCompat
+ .Builder(context, CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL)
+ .setOnlyAlertOnce(true);
+ }
+
+ public void showNotification(Context context,
+ String notificationTitle,
+ String notificationMessage,
+ int notificationId,
+ Intent intent) {
+
+ notificationBuilder.setDefaults(DEFAULT_ALL)
+ .setContentTitle(notificationTitle)
+ .setStyle(new NotificationCompat.BigTextStyle()
+ .bigText(notificationMessage))
+ .setSmallIcon(R.drawable.ic_launcher)
+ .setProgress(0, 0, false)
+ .setOngoing(false)
+ .setPriority(PRIORITY_HIGH);
+
+ PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+ notificationBuilder.setContentIntent(pendingIntent);
+ notificationManager.notify(notificationId, notificationBuilder.build());
+ }
+}
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt
new file mode 100644
index 0000000000..214151f9a0
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt
@@ -0,0 +1,54 @@
+package fr.free.nrw.commons
+
+import fr.free.nrw.commons.mwapi.MediaResult
+import fr.free.nrw.commons.mwapi.MediaWikiApi
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
+import io.reactivex.Single
+import junit.framework.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+import org.mockito.MockitoAnnotations
+
+class MediaDataExtractorTest {
+
+ @Mock
+ internal var mwApi: MediaWikiApi? = null
+
+ @Mock
+ internal var okHttpJsonApiClient: OkHttpJsonApiClient? = null
+
+ @InjectMocks
+ var mediaDataExtractor: MediaDataExtractor? = null
+
+ @Before
+ @Throws(Exception::class)
+ fun setUp() {
+ MockitoAnnotations.initMocks(this)
+ }
+
+ @Test
+ fun fetchMediaDetails() {
+ `when`(okHttpJsonApiClient!!.getMedia(ArgumentMatchers.anyString(), ArgumentMatchers.anyBoolean()))
+ .thenReturn(Single.just(mock(Media::class.java)))
+
+ `when`(mwApi!!.pageExists(ArgumentMatchers.anyString()))
+ .thenReturn(Single.just(true))
+
+ val mediaResult = mock(MediaResult::class.java)
+ `when`(mediaResult.wikiSource).thenReturn("some wiki source")
+ `when`(mwApi!!.fetchMediaByFilename(ArgumentMatchers.anyString()))
+ .thenReturn(Single.just(mediaResult))
+
+ `when`(mwApi!!.parseWikicode(ArgumentMatchers.anyString()))
+ .thenReturn(Single.just("discussion text"))
+
+ val fetchMediaDetails = mediaDataExtractor!!.fetchMediaDetails("test.jpg").blockingGet()
+
+ assertTrue(fetchMediaDetails is Media)
+ }
+}
\ No newline at end of file
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
new file mode 100644
index 0000000000..24de836d6d
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
@@ -0,0 +1,75 @@
+package fr.free.nrw.commons.delete
+
+import android.accounts.Account
+import android.content.Context
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.auth.SessionManager
+import fr.free.nrw.commons.mwapi.MediaWikiApi
+import fr.free.nrw.commons.notification.NotificationHelper
+import fr.free.nrw.commons.utils.ViewUtil
+import junit.framework.Assert.assertFalse
+import junit.framework.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ViewUtil::class)
+class DeleteHelperTest {
+
+ @Mock
+ internal var mwApi: MediaWikiApi? = null
+
+ @Mock
+ internal var sessionManager: SessionManager? = null
+
+ @Mock
+ internal var notificationHelper: NotificationHelper? = null
+
+ @Mock
+ internal var context: Context? = null
+
+ @Mock
+ internal var media: Media? = null
+
+ @InjectMocks
+ var deleteHelper: DeleteHelper? = null
+
+ @Test
+ fun makeDeletion() {
+ `when`(mwApi!!.editToken).thenReturn("token")
+ `when`(sessionManager!!.authCookie).thenReturn("Mock cookie")
+ `when`(sessionManager!!.currentAccount).thenReturn(Account("TestUser", "Test"))
+
+ MockitoAnnotations.initMocks(this)
+ PowerMockito.mockStatic(ViewUtil::class.java)
+
+ `when`(media!!.displayTitle).thenReturn("Test file")
+ `when`(media!!.filename).thenReturn("Test file.jpg")
+
+ val makeDeletion = deleteHelper!!.makeDeletion(context, media, "Test reason").blockingGet()
+ assertTrue(makeDeletion)
+ }
+
+ @Test
+ fun makeDeletionForNullToken() {
+ `when`(mwApi!!.editToken).thenReturn(null)
+ `when`(sessionManager!!.authCookie).thenReturn("Mock cookie")
+ `when`(sessionManager!!.currentAccount).thenReturn(Account("TestUser", "Test"))
+
+ MockitoAnnotations.initMocks(this)
+ PowerMockito.mockStatic(ViewUtil::class.java)
+
+ `when`(media!!.displayTitle).thenReturn("Test file")
+ `when`(media!!.filename).thenReturn("Test file.jpg")
+
+ val makeDeletion = deleteHelper!!.makeDeletion(context, media, "Test reason").blockingGet()
+ assertFalse(makeDeletion)
+ }
+}
\ No newline at end of file
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
index 9d2a468f5d..b32ae953d9 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
@@ -2,9 +2,11 @@ package fr.free.nrw.commons.mwapi
import com.google.gson.Gson
import fr.free.nrw.commons.BuildConfig
+import fr.free.nrw.commons.Media
import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient.mapType
+import fr.free.nrw.commons.utils.DateUtils
import junit.framework.Assert.assertEquals
import okhttp3.HttpUrl
import okhttp3.OkHttpClient
@@ -21,6 +23,7 @@ import org.mockito.Mockito.`when`
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import java.net.URLDecoder
+import kotlin.random.Random
@RunWith(RobolectricTestRunner::class)
@Config(constants = BuildConfig::class, sdk = [23], application = TestCommonsApplication::class)
@@ -130,6 +133,48 @@ class OkHttpJsonApiClientTest {
assertEquals(categoryImagesContinued.size, 2)
}
+ @Test
+ fun getMedia() {
+ server.enqueue(getMediaList("", "", "", 1))
+
+ val media = testObject.getMedia("Test.jpg", false)!!.blockingGet()
+
+ assertBasicRequestParameters(server, "GET").let { request ->
+ parseQueryParams(request).let { body ->
+ Assert.assertEquals("json", body["format"])
+ Assert.assertEquals("query", body["action"])
+ Assert.assertEquals("Test.jpg", body["titles"])
+ Assert.assertEquals("imageinfo", body["prop"])
+ Assert.assertEquals("url|extmetadata", body["iiprop"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ }
+ }
+
+ assert(media is Media)
+ }
+
+ @Test
+ fun getPictureOfTheDay() {
+ val template = "Template:Potd/" + DateUtils.getCurrentDate()
+ server.enqueue(getMediaList("", "", "", 1))
+
+ val media = testObject.getMedia(template, true)!!.blockingGet()
+
+ assertBasicRequestParameters(server, "GET").let { request ->
+ parseQueryParams(request).let { body ->
+ Assert.assertEquals("json", body["format"])
+ Assert.assertEquals("query", body["action"])
+ Assert.assertEquals(template, body["titles"])
+ Assert.assertEquals("images", body["generator"])
+ Assert.assertEquals("imageinfo", body["prop"])
+ Assert.assertEquals("url|extmetadata", body["iiprop"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ }
+ }
+
+ assert(media is Media)
+ }
+
private fun testFirstPageSearchQuery() {
val categoryImages = testObject.getMediaList("search", "Watercraft moored off shore")!!.blockingGet()
@@ -171,33 +216,55 @@ class OkHttpJsonApiClientTest {
}
private fun getFirstPageOfImages(): MockResponse {
- val mockResponse = MockResponse()
- mockResponse.setResponseCode(200)
- mockResponse.setBody("{\"batchcomplete\":\"\",\"continue\":{\"gcmcontinue\":\"testvalue\",\"continue\":\"gcmcontinue||\"},\"query\":{\"pages\":{\"4406048\":{\"pageid\":4406048,\"ns\":6,\"title\":\"File:test1.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test1.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test1.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat1|cat2\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]},\"24259710\":{\"pageid\":24259710,\"ns\":6,\"title\":\"File:test2.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test2.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test2.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat3|cat4\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}}}}")
- return mockResponse
+ return getMediaList("gcmcontinue", "testvalue", "gcmcontinue||", 2)
}
private fun getSecondPageOfImages(): MockResponse {
- val mockResponse = MockResponse()
- mockResponse.setResponseCode(200)
- mockResponse.setBody("{\"batchcomplete\":\"\",\"continue\":{\"gcmcontinue\":\"testvalue2\",\"continue\":\"gcmcontinue||\"},\"query\":{\"pages\":{\"4406048\":{\"pageid\":4406048,\"ns\":6,\"title\":\"File:test3.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test3.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test3.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat5|cat6\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]},\"24259710\":{\"pageid\":24259710,\"ns\":6,\"title\":\"File:test4.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test4.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test4.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat7\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}}}}")
- return mockResponse
+ return getMediaList("gcmcontinue", "testvalue2", "gcmcontinue||", 2)
}
private fun getFirstPageOfSearchImages(): MockResponse {
- val mockResponse = MockResponse()
- mockResponse.setResponseCode(200)
- mockResponse.setBody("{\"batchcomplete\":\"\",\"continue\":{\"continue\":\"gsroffset||\",\"gsroffset\":\"25\"},\"query\":{\"pages\":{\"4406048\":{\"pageid\":4406048,\"ns\":6,\"title\":\"File:test1.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test1.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test1.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat1|cat2\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]},\"24259710\":{\"pageid\":24259710,\"ns\":6,\"title\":\"File:test2.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test2.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test2.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat3|cat4\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}}}}")
- return mockResponse
+ return getMediaList("gsroffset", "25", "gsroffset||", 2)
}
private fun getSecondPageOfSearchImages(): MockResponse {
+ return getMediaList("gsroffset", "25", "gsroffset||", 2)
+ }
+
+ private fun getMediaList(queryContinueType: String,
+ queryContinueValue: String,
+ continueVal: String,
+ numberOfPages: Int): MockResponse {
val mockResponse = MockResponse()
mockResponse.setResponseCode(200)
- mockResponse.setBody("{\"batchcomplete\":\"\",\"continue\":{\"continue\":\"gsroffset||\",\"gsroffset\":\"50\"},\"query\":{\"pages\":{\"4406048\":{\"pageid\":4406048,\"ns\":6,\"title\":\"File:test3.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test3.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test3.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat5|cat6\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]},\"24259710\":{\"pageid\":24259710,\"ns\":6,\"title\":\"File:test4.jpg\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/test4.jpg\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:test4.jpg\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"cat7\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}}}}")
+ var continueJson = ""
+
+ if (queryContinueType != "" && queryContinueValue != "" && continueVal != "") {
+ continueJson = ",\"continue\":{\"$queryContinueType\":\"$queryContinueValue\",\"continue\":\"$continueVal\"}"
+ }
+
+ val mediaList = mutableListOf()
+ val random = Random(1000)
+ for (i in 0 until numberOfPages) {
+ mediaList.add(getMediaPage(random))
+ }
+
+ val pagesString = mediaList.joinToString()
+ val responseBody = "{\"batchcomplete\":\"\"$continueJson,\"query\":{\"pages\":{$pagesString}}}"
+ mockResponse.setBody(responseBody)
return mockResponse
}
+ private fun getMediaPage(random: Random): String {
+ val pageID = random.nextInt()
+ val id = random.nextInt()
+ val fileName = "Test$id"
+ val id1 = random.nextInt()
+ val id2 = random.nextInt()
+ val categories = "cat$id1|cat$id2"
+ return "\"$pageID\":{\"pageid\":$pageID,\"ns\":6,\"title\":\"File:$fileName\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/$fileName\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:$fileName\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"$categories\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}"
+ }
+
private fun assertBasicRequestParameters(server: MockWebServer, method: String): RecordedRequest = server.takeRequest().let {
Assert.assertEquals("/", it.requestUrl.encodedPath())
Assert.assertEquals(method, it.method)
From 095de86d1a8e46b82d364566f17b85f9ccf5d1b8 Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Wed, 27 Mar 2019 12:01:46 +0530
Subject: [PATCH 08/14] Add more javadocs
---
.../nrw/commons/notification/NotificationHelper.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java
index b5d53a8de3..f558df9918 100644
--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationHelper.java
@@ -15,6 +15,10 @@
import static androidx.core.app.NotificationCompat.DEFAULT_ALL;
import static androidx.core.app.NotificationCompat.PRIORITY_HIGH;
+/**
+ * Helper class that can be used to build a generic notification
+ * Going forward all notifications should be built using this helper class
+ */
@Singleton
public class NotificationHelper {
@@ -31,6 +35,14 @@ public NotificationHelper(Context context) {
.setOnlyAlertOnce(true);
}
+ /**
+ * Public interface to build and show a notification in the notification bar
+ * @param context passed context
+ * @param notificationTitle title of the notification
+ * @param notificationMessage message to be displayed in the notification
+ * @param notificationId the notificationID
+ * @param intent the intent to be fired when the notification is clicked
+ */
public void showNotification(Context context,
String notificationTitle,
String notificationMessage,
From 791f57fbe0057e50cb9b172440501b3459a50dbe Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Wed, 27 Mar 2019 23:12:43 +0530
Subject: [PATCH 09/14] With more tests
---
app/build.gradle | 5 ----
.../main/java/fr/free/nrw/commons/Media.java | 8 ++++++-
.../free/nrw/commons/delete/DeleteHelper.java | 7 ++++--
.../fr/free/nrw/commons/utils/ViewUtil.java | 19 ++++++++++-----
.../nrw/commons/delete/DeleteHelperTest.kt | 23 ++++++++-----------
.../nrw/commons/upload/UploadModelTest.kt | 1 -
6 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index d28963f557..84f929c361 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,11 +64,6 @@ dependencies {
testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
- testImplementation 'org.powermock:powermock-api-mockito:1.6.2'
- testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.6.2'
- testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.2'
- testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
-
// Android testing
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java
index 3ca6920b9e..ac863120f7 100644
--- a/app/src/main/java/fr/free/nrw/commons/Media.java
+++ b/app/src/main/java/fr/free/nrw/commons/Media.java
@@ -9,6 +9,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -485,7 +486,12 @@ public static Media from(MwQueryPage page) {
StringUtils.getParsedStringFromHtml(metadata.artist().value())
);
- media.setDescriptions(Collections.singletonMap("default", metadata.imageDescription().value()));
+ String language = Locale.getDefault().getLanguage();
+ if (StringUtils.isNullOrWhiteSpace(language)) {
+ language = "default";
+ }
+
+ media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
String latitude = metadata.gpsLatitude().value();
String longitude = metadata.gpsLongitude().value();
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
index 28d2249896..f666759e12 100644
--- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
+++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
@@ -33,14 +33,17 @@ public class DeleteHelper {
private final MediaWikiApi mwApi;
private final SessionManager sessionManager;
private final NotificationHelper notificationHelper;
+ private final ViewUtil viewUtil;
@Inject
public DeleteHelper(MediaWikiApi mwApi,
SessionManager sessionManager,
- NotificationHelper notificationHelper) {
+ NotificationHelper notificationHelper,
+ ViewUtil viewUtil) {
this.mwApi = mwApi;
this.sessionManager = sessionManager;
this.notificationHelper = notificationHelper;
+ this.viewUtil = viewUtil;
}
/**
@@ -51,7 +54,7 @@ public DeleteHelper(MediaWikiApi mwApi,
* @return
*/
public Single makeDeletion(Context context, Media media, String reason) {
- ViewUtil.showShortToast(context, "Trying to nominate " + media.getDisplayTitle() + " for deletion");
+ viewUtil.showShortToast(context, "Trying to nominate " + media.getDisplayTitle() + " for deletion");
return Single.fromCallable(() -> delete(media, reason))
.flatMap(result -> Single.fromCallable(() ->
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
index f9a246a8b4..096e436137 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java
@@ -2,18 +2,25 @@
import android.app.Activity;
import android.content.Context;
-import androidx.annotation.StringRes;
-import com.google.android.material.snackbar.Snackbar;
import android.view.Display;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;
+import com.google.android.material.snackbar.Snackbar;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import androidx.annotation.StringRes;
+
+@Singleton
public class ViewUtil {
- public static final String SHOWCASE_VIEW_ID_1 = "SHOWCASE_VIEW_ID_1";
- public static final String SHOWCASE_VIEW_ID_2 = "SHOWCASE_VIEW_ID_2";
- public static final String SHOWCASE_VIEW_ID_3 = "SHOWCASE_VIEW_ID_3";
+ @Inject
+ public ViewUtil() {
+
+ }
/**
* Utility function to show short snack bar
@@ -44,7 +51,7 @@ public static void showLongToast(Context context, @StringRes int stringResourceI
ExecutorUtils.uiExecutor().execute(() -> Toast.makeText(context, context.getString(stringResourceId), Toast.LENGTH_LONG).show());
}
- public static void showShortToast(Context context, String text) {
+ public void showShortToast(Context context, String text) {
if (context == null) {
return;
}
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
index 24de836d6d..c3bbc0f948 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
@@ -9,18 +9,13 @@ import fr.free.nrw.commons.notification.NotificationHelper
import fr.free.nrw.commons.utils.ViewUtil
import junit.framework.Assert.assertFalse
import junit.framework.Assert.assertTrue
+import org.junit.Before
import org.junit.Test
-import org.junit.runner.RunWith
import org.mockito.InjectMocks
import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ViewUtil::class)
class DeleteHelperTest {
@Mock
@@ -35,21 +30,25 @@ class DeleteHelperTest {
@Mock
internal var context: Context? = null
+ @Mock
+ internal var viewUtil: ViewUtil? = null
+
@Mock
internal var media: Media? = null
@InjectMocks
var deleteHelper: DeleteHelper? = null
+ @Before
+ fun setup() {
+ MockitoAnnotations.initMocks(this)
+ }
+
@Test
fun makeDeletion() {
`when`(mwApi!!.editToken).thenReturn("token")
`when`(sessionManager!!.authCookie).thenReturn("Mock cookie")
`when`(sessionManager!!.currentAccount).thenReturn(Account("TestUser", "Test"))
-
- MockitoAnnotations.initMocks(this)
- PowerMockito.mockStatic(ViewUtil::class.java)
-
`when`(media!!.displayTitle).thenReturn("Test file")
`when`(media!!.filename).thenReturn("Test file.jpg")
@@ -62,10 +61,6 @@ class DeleteHelperTest {
`when`(mwApi!!.editToken).thenReturn(null)
`when`(sessionManager!!.authCookie).thenReturn("Mock cookie")
`when`(sessionManager!!.currentAccount).thenReturn(Account("TestUser", "Test"))
-
- MockitoAnnotations.initMocks(this)
- PowerMockito.mockStatic(ViewUtil::class.java)
-
`when`(media!!.displayTitle).thenReturn("Test file")
`when`(media!!.filename).thenReturn("Test file.jpg")
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt
index 3bb29fbb22..ca7a562e61 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadModelTest.kt
@@ -4,7 +4,6 @@ import android.app.Application
import android.content.Context
import fr.free.nrw.commons.auth.SessionManager
import fr.free.nrw.commons.filepicker.UploadableFile
-import fr.free.nrw.commons.kvstore.BasicKvStore
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.mwapi.MediaWikiApi
import fr.free.nrw.commons.nearby.Place
From f3b170087ce7f65f6233e20a40be46bcba4a2018 Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Wed, 27 Mar 2019 23:46:11 +0530
Subject: [PATCH 10/14] With review helper test
---
.../media/RecentChangesImageUtils.java | 49 ----------------
.../free/nrw/commons/review/ReviewHelper.java | 48 ++++++++++++++--
.../nrw/commons/review/ReviewHelperTest.kt | 57 +++++++++++++++++++
3 files changed, 101 insertions(+), 53 deletions(-)
delete mode 100644 app/src/main/java/fr/free/nrw/commons/media/RecentChangesImageUtils.java
create mode 100644 app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
diff --git a/app/src/main/java/fr/free/nrw/commons/media/RecentChangesImageUtils.java b/app/src/main/java/fr/free/nrw/commons/media/RecentChangesImageUtils.java
deleted file mode 100644
index 4a00abc3fb..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/media/RecentChangesImageUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.free.nrw.commons.media;
-
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Nullable;
-
-import fr.free.nrw.commons.mwapi.model.RecentChange;
-
-public class RecentChangesImageUtils {
-
- private static final String[] imageExtensions = new String[]
- {".jpg", ".jpeg", ".png"};
-
- @Nullable
- public static String findImageInRecentChanges(List recentChanges) {
- String imageTitle;
- Random r = new Random();
- int count = recentChanges.size();
- // Build a range array
- int[] randomIndexes = new int[count];
- for (int i = 0; i < count; i++) {
- randomIndexes[i] = i;
- }
- // Then shuffle it
- for (int i = 0; i < count; i++) {
- int swapIndex = r.nextInt(count);
- int temp = randomIndexes[i];
- randomIndexes[i] = randomIndexes[swapIndex];
- randomIndexes[swapIndex] = temp;
- }
- for (int i = 0; i < count; i++) {
- int randomIndex = randomIndexes[i];
- RecentChange recentChange = recentChanges.get(randomIndex);
- if (recentChange.getType().equals("log") && !recentChange.getOldRevisionId().equals("0")) {
- // For log entries, we only want ones where old_revid is zero, indicating a new file
- continue;
- }
- imageTitle = recentChange.getTitle();
-
- for (String imageExtension : imageExtensions) {
- if (imageTitle.toLowerCase().endsWith(imageExtension)) {
- return imageTitle;
- }
- }
- }
- return null;
- }
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.java
index ed6bb73e28..4aa1ecf22e 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.java
@@ -1,21 +1,26 @@
package fr.free.nrw.commons.review;
-import android.util.Pair;
+import java.util.List;
+import java.util.Random;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import androidx.core.util.Pair;
import fr.free.nrw.commons.Media;
-import fr.free.nrw.commons.media.RecentChangesImageUtils;
import fr.free.nrw.commons.media.model.MwQueryPage;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
+import fr.free.nrw.commons.mwapi.model.RecentChange;
import io.reactivex.Single;
@Singleton
public class ReviewHelper {
private static final int MAX_RANDOM_TRIES = 5;
+ private static final String[] imageExtensions = new String[]{".jpg", ".jpeg", ".png"};
+
private final OkHttpJsonApiClient okHttpJsonApiClient;
private final MediaWikiApi mediaWikiApi;
@@ -35,11 +40,11 @@ public ReviewHelper(OkHttpJsonApiClient okHttpJsonApiClient, MediaWikiApi mediaW
*/
Single getRandomMedia() {
return okHttpJsonApiClient.getRecentFileChanges()
- .map(RecentChangesImageUtils::findImageInRecentChanges)
+ .map(this::findImageInRecentChanges)
.flatMap(title -> mediaWikiApi.pageExists("Commons:Deletion_requests/" + title)
.map(pageExists -> new Pair<>(title, pageExists)))
.map((Pair pair) -> {
- if (!pair.second) {
+ if (pair.second) {
return new Media(pair.first.replace("File:", ""));
}
throw new Exception("Page does not exist");
@@ -49,4 +54,39 @@ Single getRandomMedia() {
Single getFirstRevisionOfFile(String fileName) {
return okHttpJsonApiClient.getFirstRevisionOfFile(fileName);
}
+
+ @Nullable
+ public String findImageInRecentChanges(List recentChanges) {
+ String imageTitle;
+ Random r = new Random();
+ int count = recentChanges.size();
+ // Build a range array
+ int[] randomIndexes = new int[count];
+ for (int i = 0; i < count; i++) {
+ randomIndexes[i] = i;
+ }
+ // Then shuffle it
+ for (int i = 0; i < count; i++) {
+ int swapIndex = r.nextInt(count);
+ int temp = randomIndexes[i];
+ randomIndexes[i] = randomIndexes[swapIndex];
+ randomIndexes[swapIndex] = temp;
+ }
+ for (int i = 0; i < count; i++) {
+ int randomIndex = randomIndexes[i];
+ RecentChange recentChange = recentChanges.get(randomIndex);
+ if (recentChange.getType().equals("log") && !recentChange.getOldRevisionId().equals("0")) {
+ // For log entries, we only want ones where old_revid is zero, indicating a new file
+ continue;
+ }
+ imageTitle = recentChange.getTitle();
+
+ for (String imageExtension : imageExtensions) {
+ if (imageTitle.toLowerCase().endsWith(imageExtension)) {
+ return imageTitle;
+ }
+ }
+ }
+ return null;
+ }
}
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
new file mode 100644
index 0000000000..d967b8fca9
--- /dev/null
+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
@@ -0,0 +1,57 @@
+package fr.free.nrw.commons.review
+
+import fr.free.nrw.commons.Media
+import fr.free.nrw.commons.media.model.MwQueryPage
+import fr.free.nrw.commons.mwapi.MediaWikiApi
+import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
+import fr.free.nrw.commons.mwapi.model.RecentChange
+import io.reactivex.Single
+import junit.framework.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+import org.mockito.MockitoAnnotations
+
+class ReviewHelperTest {
+
+ @Mock
+ internal var okHttpJsonApiClient: OkHttpJsonApiClient? = null
+ @Mock
+ internal var mediaWikiApi: MediaWikiApi? = null
+
+ @InjectMocks
+ var reviewHelper: ReviewHelper? = null
+
+ @Before
+ @Throws(Exception::class)
+ fun setUp() {
+ MockitoAnnotations.initMocks(this)
+ }
+
+ @Test
+ fun getRandomMedia() {
+ `when`(okHttpJsonApiClient!!.recentFileChanges)
+ .thenReturn(Single.just(listOf(RecentChange("test", "File:Test1.jpeg", "0"),
+ RecentChange("test", "File:Test2.png", "0"),
+ RecentChange("test", "File:Test3.jpg", "0"))))
+
+ `when`(mediaWikiApi!!.pageExists(ArgumentMatchers.anyString()))
+ .thenReturn(Single.just(true))
+ val randomMedia = reviewHelper!!.randomMedia.blockingGet()
+
+ assertTrue(randomMedia is Media)
+ }
+
+ @Test
+ fun getFirstRevisionOfFile() {
+ `when`(okHttpJsonApiClient!!.getFirstRevisionOfFile(ArgumentMatchers.anyString()))
+ .thenReturn(Single.just(mock(MwQueryPage.Revision::class.java)))
+ val firstRevisionOfFile = reviewHelper!!.getFirstRevisionOfFile("Test.jpg").blockingGet()
+
+ assertTrue(firstRevisionOfFile is MwQueryPage.Revision)
+ }
+}
\ No newline at end of file
From 7dc244b09998446084a3458752c88eaa4e812052 Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Thu, 28 Mar 2019 11:50:21 +0530
Subject: [PATCH 11/14] With suggested changes and java docs
---
.../java/fr/free/nrw/commons/LicenseList.java | 127 ------------------
.../main/java/fr/free/nrw/commons/Media.java | 105 ++++++++-------
.../commons/media/MediaDetailFragment.java | 52 ++-----
.../commons/mwapi/OkHttpJsonApiClient.java | 20 ++-
.../commons/settings/SettingsFragment.java | 1 -
.../main/res/layout/fragment_media_detail.xml | 2 +-
.../nrw/commons/MediaDataExtractorTest.kt | 19 ++-
.../nrw/commons/delete/DeleteHelperTest.kt | 44 +++---
.../commons/mwapi/OkHttpJsonApiClientTest.kt | 80 +++++++++--
9 files changed, 202 insertions(+), 248 deletions(-)
delete mode 100644 app/src/main/java/fr/free/nrw/commons/LicenseList.java
diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java
deleted file mode 100644
index a6c6f9cad6..0000000000
--- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package fr.free.nrw.commons;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import androidx.annotation.Nullable;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Represents a list of Licenses
- */
-public class LicenseList {
- private Map licenses = new HashMap<>();
- private Resources res;
-
- /**
- * Constructs new instance of LicenceList
- *
- * @param activity License activity
- */
- public LicenseList(Activity activity) {
- res = activity.getResources();
- XmlPullParser parser = res.getXml(R.xml.wikimedia_licenses);
- String namespace = "https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses";
- while (xmlFastForward(parser, namespace, "license")) {
- String id = parser.getAttributeValue(null, "id");
- String template = parser.getAttributeValue(null, "template");
- String url = parser.getAttributeValue(null, "url");
- String name = nameForTemplate(template);
- License license = new License(id, template, url, name);
- licenses.put(id, license);
- }
- }
-
- /**
- * Gets a collection of licenses
- * @return License values
- */
- public Collection values() {
- return licenses.values();
- }
-
- /**
- * Gets license
- * @param key License key
- * @return License that matches key
- */
- public License get(String key) {
- return licenses.get(key);
- }
-
- /**
- * Creates a license from template
- * @param template License template
- * @return null
- */
- @Nullable
- License licenseForTemplate(String template) {
- String ucTemplate = new PageTitle(template).getDisplayText();
- for (License license : values()) {
- if (ucTemplate.equals(new PageTitle(license.getTemplate()).getDisplayText())) {
- return license;
- }
- }
- return null;
- }
-
- /**
- * Gets template name id
- * @param template License template
- * @return name id of template
- */
- private String nameIdForTemplate(String template) {
- // hack :D (converts dashes and periods to underscores)
- // cc-by-sa-3.0 -> cc_by_sa_3_0
- return "license_name_" + template.toLowerCase(Locale.ENGLISH).replace("-",
- "_").replace(".", "_");
- }
-
- /**
- * Gets name of given template
- * @param template License template
- * @return name of template
- */
- private String nameForTemplate(String template) {
- int nameId = res.getIdentifier("fr.free.nrw.commons:string/"
- + nameIdForTemplate(template), null, null);
- return (nameId != 0) ? res.getString(nameId) : template;
- }
-
- /**
- * Fast-forward an XmlPullParser to the next instance of the given element
- * in the input stream (namespaced).
- *
- * @param parser
- * @param namespace
- * @param element
- * @return true on match, false on failure
- */
- private boolean xmlFastForward(XmlPullParser parser, String namespace, String element) {
- try {
- while (parser.next() != XmlPullParser.END_DOCUMENT) {
- if (parser.getEventType() == XmlPullParser.START_TAG &&
- parser.getNamespace().equals(namespace) &&
- parser.getName().equals(element)) {
- // We found it!
- return true;
- }
- }
- return false;
- } catch (XmlPullParserException e) {
- e.printStackTrace();
- return false;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
- }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java
index ac863120f7..46b0bbbabb 100644
--- a/app/src/main/java/fr/free/nrw/commons/Media.java
+++ b/app/src/main/java/fr/free/nrw/commons/Media.java
@@ -50,6 +50,7 @@ public Media[] newArray(int i) {
protected int width;
protected int height;
protected String license;
+ protected String licenseUrl;
protected String creator;
protected ArrayList categories; // as loaded at runtime?
protected boolean requestedDeletion;
@@ -332,12 +333,66 @@ public String getLicense() {
return license;
}
+ /**
+ * Creating Media object from MWQueryPage.
+ * Earlier only basic details were set for the media object but going forward,
+ * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method
+ *
+ * @param page response from the API
+ * @return Media object
+ */
+ @Nullable
+ public static Media from(MwQueryPage page) {
+ ImageInfo imageInfo = page.imageInfo();
+ if(imageInfo == null) {
+ return null;
+ }
+ ExtMetadata metadata = imageInfo.getMetadata();
+ if (metadata == null) {
+ return new Media(null, imageInfo.getOriginalUrl(),
+ page.title(), "", 0, null, null, null);
+ }
+
+ Media media = new Media(null,
+ imageInfo.getOriginalUrl(),
+ page.title(),
+ "",
+ 0,
+ DateUtils.getDateFromString(metadata.dateTimeOriginal().value()),
+ DateUtils.getDateFromString(metadata.dateTime().value()),
+ StringUtils.getParsedStringFromHtml(metadata.artist().value())
+ );
+
+ String language = Locale.getDefault().getLanguage();
+ if (StringUtils.isNullOrWhiteSpace(language)) {
+ language = "default";
+ }
+
+ media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
+ media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
+ String latitude = metadata.gpsLatitude().value();
+ String longitude = metadata.gpsLongitude().value();
+
+ if(!StringUtils.isNullOrWhiteSpace(latitude) && !StringUtils.isNullOrWhiteSpace(longitude)) {
+ LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
+ media.setCoordinates(latLng);
+ }
+
+ media.setLicenseInformation(metadata.licenseShortName().value(), metadata.licenseUrl().value());
+ return media;
+ }
+
+ public String getLicenseUrl() {
+ return licenseUrl;
+ }
+
/**
* Sets the license name of the file.
* @param license license name as a String
*/
- public void setLicense(String license) {
+ public void setLicenseInformation(String license, String licenseUrl) {
this.license = license;
+ this.licenseUrl = licenseUrl;
}
/**
@@ -457,51 +512,11 @@ public boolean getRequestedDeletion(){
}
/**
- * Creating Media object from MWQueryPage.
- * Earlier only basic details were set for the media object but going forward,
- * a full media object(with categories, descriptions, coordinates etc) can be constructed using this method
+ * Sets the license name of the file.
*
- * @param page response from the API
- * @return Media object
+ * @param license license name as a String
*/
- @Nullable
- public static Media from(MwQueryPage page) {
- ImageInfo imageInfo = page.imageInfo();
- if(imageInfo == null) {
- return null;
- }
- ExtMetadata metadata = imageInfo.getMetadata();
- if (metadata == null) {
- return new Media(null, imageInfo.getOriginalUrl(),
- page.title(), "", 0, null, null, null);
- }
-
- Media media = new Media(null,
- imageInfo.getOriginalUrl(),
- page.title(),
- "",
- 0,
- DateUtils.getDateFromString(metadata.dateTimeOriginal().value()),
- DateUtils.getDateFromString(metadata.dateTime().value()),
- StringUtils.getParsedStringFromHtml(metadata.artist().value())
- );
-
- String language = Locale.getDefault().getLanguage();
- if (StringUtils.isNullOrWhiteSpace(language)) {
- language = "default";
- }
-
- media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
- media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
- String latitude = metadata.gpsLatitude().value();
- String longitude = metadata.gpsLongitude().value();
-
- if(!StringUtils.isNullOrWhiteSpace(latitude) && !StringUtils.isNullOrWhiteSpace(longitude)) {
- LatLng latLng = new LatLng(Double.parseDouble(latitude), Double.parseDouble(longitude), 0);
- media.setCoordinates(latLng);
- }
-
- media.setLicense(metadata.licenseShortName().value());
- return media;
+ public void setLicense(String license) {
+ this.license = license;
}
}
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 d297ffc167..d3f2174f4a 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
@@ -8,7 +8,6 @@
import android.os.Bundle;
import android.text.Editable;
import android.text.Html;
-import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.TypedValue;
import android.view.LayoutInflater;
@@ -30,27 +29,25 @@
import javax.inject.Inject;
-import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
-import fr.free.nrw.commons.License;
-import fr.free.nrw.commons.LicenseList;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.MediaDataExtractor;
import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.category.CategoryDetailsActivity;
import fr.free.nrw.commons.contributions.ContributionsFragment;
import fr.free.nrw.commons.delete.DeleteHelper;
import fr.free.nrw.commons.delete.ReasonBuilder;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.ui.widget.CompatTextView;
+import fr.free.nrw.commons.ui.widget.HtmlTextView;
import fr.free.nrw.commons.utils.DateUtils;
+import fr.free.nrw.commons.utils.StringUtils;
+import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@@ -92,6 +89,8 @@ public static MediaDetailFragment forMedia(int index, boolean editable, boolean
ReasonBuilder reasonBuilder;
@Inject
DeleteHelper deleteHelper;
+ @Inject
+ ViewUtil viewUtil;
private int initialListTop = 0;
@@ -102,7 +101,7 @@ public static MediaDetailFragment forMedia(int index, boolean editable, boolean
@BindView(R.id.mediaDetailTitle)
TextView title;
@BindView(R.id.mediaDetailDesc)
- TextView desc;
+ HtmlTextView desc;
@BindView(R.id.mediaDetailAuthor)
TextView author;
@BindView(R.id.mediaDetailLicense)
@@ -132,7 +131,6 @@ public static MediaDetailFragment forMedia(int index, boolean editable, boolean
private ViewTreeObserver.OnGlobalLayoutListener layoutListener; // for layout stuff, only used once!
private ViewTreeObserver.OnScrollChangedListener scrollListener;
private DataSetObserver dataObserver;
- private LicenseList licenseList;
//Had to make this class variable, to implement various onClicks, which access the media, also I fell why make separate variables when one can serve the purpose
private Media media;
@@ -194,8 +192,6 @@ && getParentFragment() instanceof MediaDetailPagerFragment) {
authorLayout.setVisibility(GONE);
}
- licenseList = new LicenseList(getActivity());
-
// Progressively darken the image in the background when we scroll detail pane up
scrollListener = this::updateTheDarkness;
view.getViewTreeObserver().addOnScrollChangedListener(scrollListener);
@@ -266,7 +262,7 @@ private void displayMediaDetails() {
//Always load image from Internet to allow viewing the desc, license, and cats
image.setMedia(media);
title.setText(media.getDisplayTitle());
- desc.setText(media.getDescription());
+ desc.setHtmlText(media.getDescription());
license.setText(media.getLicense());
Disposable disposable = mediaDataExtractor.fetchMediaDetails(media.getFilename())
@@ -294,7 +290,7 @@ public void onDestroyView() {
}
private void setTextFields(Media media) {
- desc.setText(prettyDescription(media));
+ desc.setHtmlText(prettyDescription(media));
license.setText(prettyLicense(media));
coordinates.setText(prettyCoordinates(media));
uploadedDate.setText(prettyUploadedDate(media));
@@ -322,15 +318,10 @@ private void setTextFields(Media media) {
@OnClick(R.id.mediaDetailLicense)
public void onMediaDetailLicenceClicked(){
- if (!TextUtils.isEmpty(licenseLink(media))) {
- openWebBrowser(licenseLink(media));
+ if (!StringUtils.isNullOrWhiteSpace(media.getLicenseUrl())) {
+ openWebBrowser(media.getLicenseUrl());
} else {
- if (isCategoryImage) {
- Timber.d("Unable to fetch license URL for %s", media.getLicense());
- } else {
- Toast toast = Toast.makeText(getContext(), getString(R.string.null_url), Toast.LENGTH_SHORT);
- toast.show();
- }
+ viewUtil.showShortToast(getActivity(), getString(R.string.null_url));
}
}
@@ -516,12 +507,7 @@ private String prettyLicense(Media media) {
if (licenseKey == null || licenseKey.equals("")) {
return getString(R.string.detail_license_empty);
}
- License licenseObj = licenseList.get(licenseKey);
- if (licenseObj == null) {
- return licenseKey;
- } else {
- return licenseObj.getName();
- }
+ return licenseKey;
}
private String prettyUploadedDate(Media media) {
@@ -554,20 +540,6 @@ private void checkDeletion(Media media){
}
}
- private @Nullable
- String licenseLink(Media media) {
- String licenseKey = media.getLicense();
- if (licenseKey == null || licenseKey.equals("")) {
- return null;
- }
- License licenseObj = licenseList.get(licenseKey);
- if (licenseObj == null) {
- return null;
- } else {
- return licenseObj.getUrl(Locale.getDefault().getLanguage());
- }
- }
-
private void openWebBrowser(String url) {
Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
//check if web browser available
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
index cc32b9ac8c..91e0cd2657 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
@@ -42,6 +42,9 @@
import okhttp3.Response;
import timber.log.Timber;
+/**
+ * Test methods in ok http api client
+ */
@Singleton
public class OkHttpJsonApiClient {
@@ -225,8 +228,8 @@ public Single getPictureOfTheDay() {
/**
* Fetches Media object from the imageInfo API
*
- * @param titles
- * @param useGenerator
+ * @param titles the tiles to be searched for. Can be filename or template name
+ * @param useGenerator specifies if a image generator parameter needs to be passed or not
* @return
*/
public Single getMedia(String titles, boolean useGenerator) {
@@ -267,7 +270,7 @@ public Single getMedia(String titles, boolean useGenerator) {
private HttpUrl.Builder appendMediaProperties(HttpUrl.Builder builder) {
builder.addQueryParameter("prop", "imageinfo")
.addQueryParameter("iiprop", "url|extmetadata")
- .addQueryParameter("iiextmetadatafilter", "DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName");
+ .addQueryParameter("iiextmetadatafilter", "DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl");
String language = Locale.getDefault().getLanguage();
if (!StringUtils.isNullOrWhiteSpace(language)) {
@@ -281,7 +284,7 @@ private HttpUrl.Builder appendMediaProperties(HttpUrl.Builder builder) {
* This method takes the keyword and queryType as input and returns a list of Media objects filtered using image generator query
* It uses the generator query API to get the images searched using a query, 10 at a time.
* @param queryType queryType can be "search" OR "category"
- * @param keyword
+ * @param keyword the search keyword. Can be either category name or search query
* @return
*/
@Nullable
@@ -329,8 +332,8 @@ public Single> getMediaList(String queryType, String keyword) {
/**
* Append params for search query.
- * @param query
- * @param urlBuilder
+ * @param query the search query to be sent to the API
+ * @param urlBuilder builder for HttpUrl
*/
private void appendSearchParam(String query, HttpUrl.Builder urlBuilder) {
urlBuilder.addQueryParameter("generator", "search")
@@ -354,6 +357,11 @@ private void appendQueryContinueValues(String query, HttpUrl.Builder urlBuilder)
}
}
+ /**
+ * Append parameters for category image generator
+ * @param categoryName name of the category
+ * @param urlBuilder HttpUrl builder
+ */
private void appendCategoryParams(String categoryName, HttpUrl.Builder urlBuilder) {
urlBuilder.addQueryParameter("generator", "categorymembers")
.addQueryParameter("gcmtype", "file")
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
index fd1ffc2919..abd54158b4 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
@@ -21,7 +21,6 @@
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.di.ApplicationlessInjection;
import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.logging.CommonsLogSender;
import fr.free.nrw.commons.utils.PermissionUtils;
import fr.free.nrw.commons.utils.ViewUtil;
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index 6ac2d737bf..bd1c6c89e6 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -133,7 +133,7 @@
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
-
+ parseQueryParams(request).let { body ->
+ Assert.assertEquals("json", body["format"])
+ Assert.assertEquals("query", body["action"])
+ Assert.assertEquals(template, body["titles"])
+ Assert.assertEquals("images", body["generator"])
+ Assert.assertEquals("imageinfo", body["prop"])
+ Assert.assertEquals("url|extmetadata", body["iiprop"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ }
+ }
+
+ assert(media is Media)
+ }
+
private fun testFirstPageSearchQuery() {
val categoryImages = testObject.getMediaList("search", "Watercraft moored off shore")!!.blockingGet()
@@ -209,7 +266,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("desc", body["gcmdir"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
assertEquals(categoryImages.size, 2)
@@ -231,6 +288,9 @@ class OkHttpJsonApiClientTest {
return getMediaList("gsroffset", "25", "gsroffset||", 2)
}
+ /**
+ * Generate a MockResponse object which contains a list of media pages
+ */
private fun getMediaList(queryContinueType: String,
queryContinueValue: String,
continueVal: String,
@@ -255,6 +315,9 @@ class OkHttpJsonApiClientTest {
return mockResponse
}
+ /**
+ * Generate test media json object
+ */
private fun getMediaPage(random: Random): String {
val pageID = random.nextInt()
val id = random.nextInt()
@@ -265,22 +328,23 @@ class OkHttpJsonApiClientTest {
return "\"$pageID\":{\"pageid\":$pageID,\"ns\":6,\"title\":\"File:$fileName\",\"imagerepository\":\"local\",\"imageinfo\":[{\"url\":\"https://upload.wikimedia.org/$fileName\",\"descriptionurl\":\"https://commons.wikimedia.org/wiki/File:$fileName\",\"descriptionshorturl\":\"https://commons.wikimedia.org/w/index.php?curid=4406048\",\"extmetadata\":{\"DateTime\":{\"value\":\"2013-04-13 15:12:11\",\"source\":\"mediawiki-metadata\",\"hidden\":\"\"},\"Categories\":{\"value\":\"$categories\",\"source\":\"commons-categories\",\"hidden\":\"\"},\"Artist\":{\"value\":\"Raphael\\n\",\"source\":\"commons-desc-page\"},\"ImageDescription\":{\"value\":\"test desc\",\"source\":\"commons-desc-page\"},\"DateTimeOriginal\":{\"value\":\"1511date QS:P571,+1511-00-00T00:00:00Z/9
\",\"source\":\"commons-desc-page\"},\"LicenseShortName\":{\"value\":\"Public domain\",\"source\":\"commons-desc-page\",\"hidden\":\"\"}}}]}"
}
+ /**
+ * Check request params
+ */
private fun assertBasicRequestParameters(server: MockWebServer, method: String): RecordedRequest = server.takeRequest().let {
Assert.assertEquals("/", it.requestUrl.encodedPath())
Assert.assertEquals(method, it.method)
return it
}
+
+ /**
+ * Parse query params
+ */
private fun parseQueryParams(request: RecordedRequest) = HashMap().apply {
request.requestUrl.let {
it.queryParameterNames().forEach { name -> put(name, it.queryParameter(name)) }
}
}
- private fun parseBody(body: String): Map = HashMap().apply {
- body.split("&".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray().forEach { prop ->
- val pair = prop.split("=".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
- put(pair[0], URLDecoder.decode(pair[1], "utf-8"))
- }
- }
}
\ No newline at end of file
From e3e00a3be1a58e9b4987816b5da3d34215eb73f6 Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Thu, 28 Mar 2019 15:20:50 +0530
Subject: [PATCH 12/14] Fix tests
---
.../nrw/commons/mwapi/OkHttpJsonApiClientTest.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
index a1970ce928..0a7bad2d50 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
@@ -107,7 +107,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("gcmcontinue||", body["continue"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
@@ -151,7 +151,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("gsroffset||", body["continue"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
@@ -174,7 +174,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("Test.jpg", body["titles"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
@@ -200,7 +200,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("images", body["generator"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
@@ -225,7 +225,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("images", body["generator"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
@@ -246,7 +246,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("Watercraft moored off shore", body["gsrsearch"])
Assert.assertEquals("imageinfo", body["prop"])
Assert.assertEquals("url|extmetadata", body["iiprop"])
- Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName", body["iiextmetadatafilter"])
+ Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
assertEquals(categoryImages.size, 2)
From 091a475422bb86ce5fa6f990fa290355618511fb Mon Sep 17 00:00:00 2001
From: Vivek Maskara
Date: Thu, 28 Mar 2019 20:42:33 +0530
Subject: [PATCH 13/14] Fix tests and codacy warnings
---
.../nrw/commons/delete/DeleteHelperTest.kt | 5 ++---
.../commons/mwapi/OkHttpJsonApiClientTest.kt | 6 ++---
.../nrw/commons/review/ReviewHelperTest.kt | 22 ++++++++++++++-----
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
index a8ff9ca1ed..0aad6ae448 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt
@@ -7,8 +7,7 @@ import fr.free.nrw.commons.auth.SessionManager
import fr.free.nrw.commons.mwapi.MediaWikiApi
import fr.free.nrw.commons.notification.NotificationHelper
import fr.free.nrw.commons.utils.ViewUtilWrapper
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNotNull
+import junit.framework.Assert.*
import org.junit.Before
import org.junit.Test
import org.mockito.InjectMocks
@@ -63,7 +62,7 @@ class DeleteHelperTest {
val makeDeletion = deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
assertNotNull(makeDeletion)
- assertFalse(makeDeletion!!)
+ assertTrue(makeDeletion!!)
}
/**
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
index 0a7bad2d50..4e1bd8b9c8 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/mwapi/OkHttpJsonApiClientTest.kt
@@ -215,7 +215,7 @@ class OkHttpJsonApiClientTest {
val template = "Template:Potd/" + DateUtils.getCurrentDate()
server.enqueue(getMediaList("", "", "", 1))
- val media = testObject.pictureOfTheDay!!.blockingGet()
+ val media = testObject.pictureOfTheDay?.blockingGet()
assertBasicRequestParameters(server, "GET").let { request ->
parseQueryParams(request).let { body ->
@@ -253,7 +253,7 @@ class OkHttpJsonApiClientTest {
}
private fun testFirstPageQuery() {
- val categoryImages = testObject.getMediaList("category", "Watercraft moored off shore")!!.blockingGet()
+ val categoryImages = testObject.getMediaList("category", "Watercraft moored off shore")?.blockingGet()
assertBasicRequestParameters(server, "GET").let { request ->
parseQueryParams(request).let { body ->
@@ -269,7 +269,7 @@ class OkHttpJsonApiClientTest {
Assert.assertEquals("DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName|LicenseUrl", body["iiextmetadatafilter"])
}
}
- assertEquals(categoryImages.size, 2)
+ assertEquals(categoryImages?.size, 2)
}
private fun getFirstPageOfImages(): MockResponse {
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
index d967b8fca9..2c7599b315 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
@@ -16,6 +16,9 @@ import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.MockitoAnnotations
+/**
+ * Test class for ReviewHelper
+ */
class ReviewHelperTest {
@Mock
@@ -26,31 +29,40 @@ class ReviewHelperTest {
@InjectMocks
var reviewHelper: ReviewHelper? = null
+ /**
+ * Init mocks
+ */
@Before
@Throws(Exception::class)
fun setUp() {
MockitoAnnotations.initMocks(this)
}
+ /**
+ * Test for getting random media
+ */
@Test
fun getRandomMedia() {
- `when`(okHttpJsonApiClient!!.recentFileChanges)
+ `when`(okHttpJsonApiClient?.recentFileChanges)
.thenReturn(Single.just(listOf(RecentChange("test", "File:Test1.jpeg", "0"),
RecentChange("test", "File:Test2.png", "0"),
RecentChange("test", "File:Test3.jpg", "0"))))
- `when`(mediaWikiApi!!.pageExists(ArgumentMatchers.anyString()))
+ `when`(mediaWikiApi?.pageExists(ArgumentMatchers.anyString()))
.thenReturn(Single.just(true))
- val randomMedia = reviewHelper!!.randomMedia.blockingGet()
+ val randomMedia = reviewHelper?.randomMedia?.blockingGet()
assertTrue(randomMedia is Media)
}
+ /**
+ * Test for getting first revision of file
+ */
@Test
fun getFirstRevisionOfFile() {
- `when`(okHttpJsonApiClient!!.getFirstRevisionOfFile(ArgumentMatchers.anyString()))
+ `when`(okHttpJsonApiClient?.getFirstRevisionOfFile(ArgumentMatchers.anyString()))
.thenReturn(Single.just(mock(MwQueryPage.Revision::class.java)))
- val firstRevisionOfFile = reviewHelper!!.getFirstRevisionOfFile("Test.jpg").blockingGet()
+ val firstRevisionOfFile = reviewHelper?.getFirstRevisionOfFile("Test.jpg")?.blockingGet()
assertTrue(firstRevisionOfFile is MwQueryPage.Revision)
}
From 5ca9415c0e3d10186aeb372b9c9cc5112792cccb Mon Sep 17 00:00:00 2001
From: Adam Jones
Date: Thu, 28 Mar 2019 20:37:46 +0000
Subject: [PATCH 14/14] Fix broken link on license media detail
---
app/src/main/java/fr/free/nrw/commons/Media.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java
index 46b0bbbabb..4688e54eb0 100644
--- a/app/src/main/java/fr/free/nrw/commons/Media.java
+++ b/app/src/main/java/fr/free/nrw/commons/Media.java
@@ -392,6 +392,10 @@ public String getLicenseUrl() {
*/
public void setLicenseInformation(String license, String licenseUrl) {
this.license = license;
+
+ if (!licenseUrl.startsWith("http://") && !licenseUrl.startsWith("https://")) {
+ licenseUrl = "https://" + licenseUrl;
+ }
this.licenseUrl = licenseUrl;
}