mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-02 15:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

work in progress

Browse source
This commit is contained in:
Paul Hawke 2024-12-01 20:50:37 -06:00
parent 67653f198c
commit aa05bce593
3 changed files with 24 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/UserInfo.java
View file

@ -1,34 +0,0 @@
package fr.free.nrw.commons.wikidata.mwapi;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Map;
public class UserInfo {
@NonNull private String name;
@NonNull private int id;
//Block information
private int blockid;
private String blockedby;
private int blockedbyid;
private String blockreason;
private String blocktimestamp;
private String blockexpiry;
// Object type is any JSON type.
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
@Nullable private Map<String, ?> options;
public int id() {
return id;
}
@NonNull
public String blockexpiry() {
if (blockexpiry != null)
return blockexpiry;
else return "";
}
}

21
app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/UserInfo.kt Normal file
View file

@ -0,0 +1,21 @@
package fr.free.nrw.commons.wikidata.mwapi
data class UserInfo(
val name: String = "",
val id: Int = 0,
//Block information
val blockid: Int = 0,
val blockedby: String? = null,
val blockedbyid: Int = 0,
val blockreason: String? = null,
val blocktimestamp: String? = null,
val blockexpiry: String? = null,
// Object type is any JSON type.
val options: Map<String, *>? = null
) {
fun id(): Int = id
fun blockexpiry(): String = blockexpiry ?: ""
}

9
app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt
View file

@ -30,8 +30,7 @@ class UserClientTest {
@Test @Test
fun isUserBlockedFromCommonsForInfinitelyBlockedUser() { fun isUserBlockedFromCommonsForInfinitelyBlockedUser() {
val userInfo = Mockito.mock(UserInfo::class.java) val userInfo = UserInfo(blockexpiry = "infinite")
Mockito.`when`(userInfo.blockexpiry()).thenReturn("infinite")
val mwQueryResult = Mockito.mock(MwQueryResult::class.java) val mwQueryResult = Mockito.mock(MwQueryResult::class.java)
Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo) Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)
val mockResponse = Mockito.mock(MwQueryResponse::class.java) val mockResponse = Mockito.mock(MwQueryResponse::class.java)
@ -49,8 +48,7 @@ class UserClientTest {
val currentDate = Date() val currentDate = Date()
val expiredDate = Date(currentDate.time + 10000) val expiredDate = Date(currentDate.time + 10000)
val userInfo = Mockito.mock(UserInfo::class.java) val userInfo = UserInfo(blockexpiry = DateUtil.iso8601DateFormat(expiredDate))
Mockito.`when`(userInfo.blockexpiry()).thenReturn(DateUtil.iso8601DateFormat(expiredDate))
val mwQueryResult = Mockito.mock(MwQueryResult::class.java) val mwQueryResult = Mockito.mock(MwQueryResult::class.java)
Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo) Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)
val mockResponse = Mockito.mock(MwQueryResponse::class.java) val mockResponse = Mockito.mock(MwQueryResponse::class.java)
@ -65,8 +63,7 @@ class UserClientTest {
@Test @Test
fun isUserBlockedFromCommonsForNeverBlockedUser() { fun isUserBlockedFromCommonsForNeverBlockedUser() {
val userInfo = Mockito.mock(UserInfo::class.java) val userInfo = UserInfo(blockexpiry = "")
Mockito.`when`(userInfo.blockexpiry()).thenReturn("")
val mwQueryResult = Mockito.mock(MwQueryResult::class.java) val mwQueryResult = Mockito.mock(MwQueryResult::class.java)
Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo) Mockito.`when`(mwQueryResult.userInfo()).thenReturn(userInfo)
val mockResponse = Mockito.mock(MwQueryResponse::class.java) val mockResponse = Mockito.mock(MwQueryResponse::class.java)