4D17Y4
diff --git a/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt
+16-3 b/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/FolderFragment.kt
+16-3
diff --git a/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
+22-5 b/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
+22-5
diff --git a/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt
+4-2 b/‎app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageLoader.kt
+4-2
diff --git a/‎app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
+1-1 b/‎app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
+1-1
diff --git a/‎app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt
+96 b/‎app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivityTest.kt
+96
diff --git a/‎app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt
+41 b/‎app/src/test/kotlin/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorViewModelTest.kt
+41
@@ -4,9 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ProgressBar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.customselector.helper.ImageHelper
 import fr.free.nrw.commons.customselector.model.Result
@@ -16,7 +18,6 @@ import fr.free.nrw.commons.customselector.ui.adapter.FolderAdapter
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
 import fr.free.nrw.commons.media.MediaClient
 import fr.free.nrw.commons.upload.FileProcessor
-import kotlinx.android.synthetic.main.fragment_custom_selector.*
 import kotlinx.android.synthetic.main.fragment_custom_selector.view.*
 import javax.inject.Inject
 
@@ -27,6 +28,12 @@ class FolderFragment : CommonsDaggerSupportFragment() {
      */
     private var viewModel: CustomSelectorViewModel? = null
 
+    /**
+     * View Elements
+     */
+    private var selectorRV: RecyclerView? = null
+    private var loader: ProgressBar? = null
+
     /**
      * View Model Factory.
      */
@@ -75,6 +82,8 @@ class FolderFragment : CommonsDaggerSupportFragment() {
         val root = inflater.inflate(R.layout.fragment_custom_selector, container, false)
         folderAdapter = FolderAdapter(activity!!, activity as FolderClickListener)
         gridLayoutManager = GridLayoutManager(context, columnCount())
+        selectorRV = root.selector_rv
+        loader = root.loader
         with(root.selector_rv){
             this.layoutManager = gridLayoutManager
             setHasFixedSize(true)
@@ -96,9 +105,13 @@ class FolderFragment : CommonsDaggerSupportFragment() {
             val folders = ImageHelper.folderListFromImages(result.images)
             folderAdapter.init(folders)
             folderAdapter.notifyDataSetChanged()
-            selector_rv.visibility = View.VISIBLE
+            selectorRV?.let {
+                it.visibility = View.VISIBLE
+            }
+        }
+        loader?.let {
+            it.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
         }
-        loader.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
     }
 
     /**
 
@@ -4,9 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ProgressBar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.customselector.helper.ImageHelper
 import fr.free.nrw.commons.customselector.listeners.ImageSelectListener
@@ -28,7 +30,13 @@ class ImageFragment: CommonsDaggerSupportFragment() {
     /**
      * View model for images.
      */
-    private lateinit var  viewModel: CustomSelectorViewModel
+    private var  viewModel: CustomSelectorViewModel? = null
+
+    /**
+     * View Elements
+     */
+    private var selectorRV: RecyclerView? = null
+    private var loader: ProgressBar? = null
 
     /**
      * View model Factory.
@@ -98,10 +106,13 @@ class ImageFragment: CommonsDaggerSupportFragment() {
             this.adapter = imageAdapter
         }
 
-        viewModel.result.observe(viewLifecycleOwner, Observer{
+        viewModel?.result?.observe(viewLifecycleOwner, Observer{
             handleResult(it)
         })
 
+        selectorRV = root.selector_rv
+        loader = root.loader
+
         return root
     }
 
@@ -113,13 +124,19 @@ class ImageFragment: CommonsDaggerSupportFragment() {
             val images = result.images
             if(images.isNotEmpty()) {
                 imageAdapter.init(ImageHelper.filterImages(images,bucketId))
-                selector_rv.visibility = View.VISIBLE
+                selectorRV?.let{
+                    it.visibility = View.VISIBLE
+                }
             }
             else{
-                selector_rv.visibility = View.GONE
+                selectorRV?.let{
+                    it.visibility = View.GONE
+                }
             }
         }
-        loader.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
+        loader?.let {
+            it.visibility = if (result.status is CallbackStatus.FETCHING) View.VISIBLE else View.GONE
+        }
     }
 
     /**
 
@@ -19,6 +19,7 @@ import timber.log.Timber
 import java.io.IOException
 import java.net.UnknownHostException
 import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.collections.HashMap
 
@@ -179,7 +180,8 @@ class ImageLoader @Inject constructor(
             return Result.TRUE
         } else {
             uploadedStatus.lastUpdated?.let {
-                if (it.date >= Calendar.getInstance().time.date - INVALIDATE_DAY_COUNT) {
+                val duration = Calendar.getInstance().time.time - it.time
+                if (TimeUnit.MILLISECONDS.toDays(duration) < INVALIDATE_DAY_COUNT) {
                     return Result.FALSE
                 }
             }
@@ -218,7 +220,7 @@ class ImageLoader @Inject constructor(
     }
 
     companion object {
-        const val INVALIDATE_DAY_COUNT: Int = 7
+        const val INVALIDATE_DAY_COUNT: Long = 7
     }
 
 }
@@ -40,7 +40,7 @@ public ExploreListRootFragment(Bundle bundle) {
         featuredArguments.putString("categoryName", title);
         listFragment.setArguments(featuredArguments);
     }
-
+  
     @Nullable
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
 
@@ -0,0 +1,96 @@
+package fr.free.nrw.commons.customselector.ui.selector
+
+import android.net.Uri
+import android.os.Bundle
+import fr.free.nrw.commons.TestCommonsApplication
+import fr.free.nrw.commons.customselector.model.Folder
+import fr.free.nrw.commons.customselector.model.Image
+import org.junit.Before
+import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.runner.RunWith
+import org.mockito.MockitoAnnotations
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * Custom Selector Activity Test
+ */
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
+class CustomSelectorActivityTest {
+
+    private lateinit var activity: CustomSelectorActivity
+
+    /**
+     * Set up the tests.
+     */
+    @Before
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+        activity = Robolectric.buildActivity(CustomSelectorActivity::class.java)
+            .get()
+        val onCreate = activity.javaClass.getDeclaredMethod("onCreate", Bundle::class.java)
+        onCreate.isAccessible = true
+        onCreate.invoke(activity, null)
+    }
+
+    /**
+     * Test activity not null.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testActivityNotNull() {
+        assertNotNull(activity)
+    }
+
+    /**
+     * Test changeTitle function.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testChangeTitle() {
+        val func = activity.javaClass.getDeclaredMethod("changeTitle", String::class.java)
+        func.isAccessible = true
+        func.invoke(activity, "test")
+    }
+
+    /**
+     * Test onFolderClick function.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testOnFolderClick() {
+        activity.onFolderClick(Folder(1, "test", arrayListOf()));
+    }
+
+    /**
+     * Test selectedImagesChanged function.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testOnSelectedImagesChanged() {
+        activity.onSelectedImagesChanged(ArrayList())
+    }
+
+    /**
+     * Test onDone function.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testOnDone() {
+        activity.onDone()
+        activity.onSelectedImagesChanged(ArrayList(arrayListOf(Image(1, "test", Uri.parse("test"), "test", 1))));
+        activity.onDone()
+    }
+
+    /**
+     * Test onBackPressed Function.
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testOnBackPressed() {
+        activity.onBackPressed()
+    }
+}
@@ -0,0 +1,41 @@
+package fr.free.nrw.commons.customselector.ui.selector
+
+import android.content.Context
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+
+/**
+ * Custom Selector View Model test.
+ */
+class CustomSelectorViewModelTest {
+
+    private lateinit var viewModel: CustomSelectorViewModel
+
+    @Mock
+    private lateinit var imageFileLoader: ImageFileLoader
+
+    @Mock
+    private lateinit var context: Context
+
+    /**
+     * Set up the test.
+     */
+    @Before
+    fun setUp(){
+        MockitoAnnotations.initMocks(this)
+        viewModel = CustomSelectorViewModel(context, imageFileLoader);
+    }
+
+    /**
+     * Test onCleared();
+     */
+    @Test
+    fun testOnCleared(){
+        val func = viewModel.javaClass.getDeclaredMethod("onCleared")
+        func.isAccessible = true
+        func.invoke(viewModel);
+    }
+
+}
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import timber.log.Timber`
`19`	`19`	`import java.io.IOException`
`20`	`20`	`import java.net.UnknownHostException`
`21`	`21`	`import java.util.*`
	`22`	`+import java.util.concurrent.TimeUnit`
`22`	`23`	`import javax.inject.Inject`
`23`	`24`	`import kotlin.collections.HashMap`
`24`	`25`
`@@ -179,7 +180,8 @@ class ImageLoader @Inject constructor(`
`179`	`180`	`return Result.TRUE`
`180`	`181`	`} else {`
`181`	`182`	`uploadedStatus.lastUpdated?.let {`
`182`		`- if (it.date >= Calendar.getInstance().time.date - INVALIDATE_DAY_COUNT) {`
	`183`	`+ val duration = Calendar.getInstance().time.time - it.time`
	`184`	`+ if (TimeUnit.MILLISECONDS.toDays(duration) < INVALIDATE_DAY_COUNT) {`
`183`	`185`	`return Result.FALSE`
`184`	`186`	`}`
`185`	`187`	`}`
`@@ -218,7 +220,7 @@ class ImageLoader @Inject constructor(`
`218`	`220`	`}`
`219`	`221`
`220`	`222`	`companion object {`
`221`		`- const val INVALIDATE_DAY_COUNT: Int = 7`
	`223`	`+ const val INVALIDATE_DAY_COUNT: Long = 7`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public ExploreListRootFragment(Bundle bundle) {`
`40`	`40`	`featuredArguments.putString("categoryName", title);`
`41`	`41`	`listFragment.setArguments(featuredArguments);`
`42`	`42`	`}`
`43`		`-`
	`43`	`+`
`44`	`44`	`@Nullable`
`45`	`45`	`@Override`
`46`	`46`	`public View onCreateView(@NonNull final LayoutInflater inflater,`