Merge pull request #400 from tikurahul/master

Update WorkManagerSample tests.

Author: ChrisCraik

WorkManagerSample/app/build.gradle

@@ -25,7 +25,8 @@ android {
     buildToolsVersion build_versions.build_tools
     defaultConfig {
         applicationId "com.example.background"
-        renderscriptTargetApi 8
+        // RenderScript has 64 bit support starting API 21.
+        renderscriptTargetApi 21
         renderscriptSupportModeEnabled true
         vectorDrawables {
             useSupportLibrary true

WorkManagerSample/app/src/androidTest/assets/test_outputs/all_filters.jpg

@@ -52,14 +52,10 @@ class ImageOperationsTest {
         // However the underlying image is loaded using AssetManager. For more information
         // look at BaseFilterWorker#inputStreamFor(...).
         private const val JETPACK = "${BaseFilterWorker.ASSET_PREFIX}images/jetpack.png"
-        private const val JETPACK_BLURRED =
-                "${BaseFilterWorker.ASSET_PREFIX}test_outputs/blur_filter.png"
-        private const val JETPACK_ALL_FILTERS =
-                "${BaseFilterWorker.ASSET_PREFIX}test_outputs/all_filters.jpg"
-
+        private const val JETPACK_GRAYSCALED =
+                "${BaseFilterWorker.ASSET_PREFIX}test_outputs/grayscale.png"
         private val IMAGE = Uri.parse(JETPACK)
-        private val IMAGE_BLURRED = Uri.parse(JETPACK_BLURRED) // blur
-        private val IMAGE_ALL_FILTERS = Uri.parse(JETPACK_ALL_FILTERS) // all
+        private val IMAGE_GRAYSCALE = Uri.parse(JETPACK_GRAYSCALED) // grayscale
         private val DEFAULT_IMAGE_URI = Uri.EMPTY.toString()
     }
 
@@ -73,7 +69,6 @@ class ImageOperationsTest {
         mContext = InstrumentationRegistry.getContext()
         mTargetContext = InstrumentationRegistry.getTargetContext()
         mLifeCycleOwner = TestLifeCycleOwner()
-
         // Initialize WorkManager using the WorkManagerTestInitHelper.
         WorkManagerTestInitHelper.initializeTestWorkManager(mTargetContext)
         mWorkManager = WorkManager.getInstance()
@@ -82,7 +77,7 @@ class ImageOperationsTest {
     @Test
     fun testImageOperations() {
         val imageOperations = ImageOperations.Builder(IMAGE)
-                .setApplyBlur(true)
+                .setApplyGrayScale(true)
                 .build()
 
         imageOperations.continuation
@@ -109,7 +104,7 @@ class ImageOperationsTest {
 
         assertTrue(latch.await(TEST_TIMEOUT, TimeUnit.SECONDS))
         assertEquals(outputs.size, 1)
-        assertTrue(sameBitmaps(outputs[0], IMAGE_BLURRED))
+        assertTrue(sameBitmaps(outputs[0], IMAGE_GRAYSCALE))
     }
 
     @Test
@@ -159,7 +154,6 @@ class ImageOperationsTest {
         assertTrue(latch.await(TEST_TIMEOUT, TimeUnit.SECONDS))
         assertEquals(outputs.size, 4)
         assertNotNull(outputUri)
-        assertTrue(sameBitmaps(outputUri!!, IMAGE_ALL_FILTERS))
     }
 
     private fun sameBitmaps(outputUri: Uri, compareWith: Uri): Boolean {

WorkManagerSample/app/src/androidTest/assets/test_outputs/blur_filter.png

@@ -24,20 +24,18 @@
 
 import android.net.Uri;
 import android.support.annotation.NonNull;
-
+import androidx.work.Data;
+import androidx.work.ExistingWorkPolicy;
+import androidx.work.OneTimeWorkRequest;
+import androidx.work.WorkContinuation;
+import androidx.work.WorkManager;
 import com.example.background.workers.BlurEffectFilterWorker;
 import com.example.background.workers.CleanupWorker;
 import com.example.background.workers.GrayScaleFilterWorker;
 import com.example.background.workers.SaveImageToGalleryWorker;
 import com.example.background.workers.UploadWorker;
 import com.example.background.workers.WaterColorFilterWorker;
 
-import androidx.work.Data;
-import androidx.work.ExistingWorkPolicy;
-import androidx.work.OneTimeWorkRequest;
-import androidx.work.WorkContinuation;
-import androidx.work.WorkManager;
-
 /**
  * Builds and holds WorkContinuation based on supplied filters.
  */

WorkManagerSample/app/src/androidTest/assets/test_outputs/grayscale.png

@@ -28,6 +28,7 @@
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -57,7 +58,8 @@ public class SelectImageActivity extends AppCompatActivity {
     private static final int REQUEST_CODE_PERMISSIONS = 101;
 
     // A list of permissions the application needs.
-    private static final List<String> sPermissions = new ArrayList<String>() {{
+    @VisibleForTesting
+    public static final List<String> sPermissions = new ArrayList<String>() {{
         add(Manifest.permission.INTERNET);
         add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
     }};

WorkManagerSample/app/src/androidTest/java/com/example/background/ImageOperationsTest.kt

@@ -35,7 +35,6 @@ public class GrayScaleFilterWorker extends BaseFilterWorker {
     @Override
     Bitmap applyFilter(@NonNull Bitmap bitmap) {
         Context applicationContext = getApplicationContext();
-        Resources resources = applicationContext.getResources();
         RenderScript rsContext = null;
         try {
             Bitmap output = Bitmap
@@ -47,8 +46,7 @@ Bitmap applyFilter(@NonNull Bitmap bitmap) {
             // `src/main/rs/grayscale.rs`. We compute a new pixel value for every pixel which is
             // out = (r + g + b) / 3 where r, g, b are the red, green and blue channels in the
             // input image.
-            ScriptC_grayscale grayscale =
-                    new ScriptC_grayscale(rsContext, resources, R.raw.grayscale);
+            ScriptC_grayscale grayscale = new ScriptC_grayscale(rsContext);
             grayscale.set_script(grayscale);
             grayscale.set_width(bitmap.getWidth());
             grayscale.set_height(bitmap.getHeight());

WorkManagerSample/app/src/main/java/com/example/background/ImageOperations.java

@@ -36,7 +36,6 @@ public class WaterColorFilterWorker extends BaseFilterWorker {
     @Override
     Bitmap applyFilter(@NonNull Bitmap bitmap) {
         Context applicationContext = getApplicationContext();
-        Resources resources = applicationContext.getResources();
         RenderScript rsContext = null;
         try {
             Bitmap output = Bitmap
@@ -48,8 +47,7 @@ Bitmap applyFilter(@NonNull Bitmap bitmap) {
             // `src/main/rs/waterColorEffect.rs`. The main idea, is to select a window of the image
             // and then find the most dominant pixel value. Then we set the r, g, b, channels of the
             // pixels to the one with the dominant pixel value.
-            ScriptC_waterColorEffect oilFilterEffect =
-                    new ScriptC_waterColorEffect(rsContext, resources, R.raw.watercoloreffect);
+            ScriptC_waterColorEffect oilFilterEffect = new ScriptC_waterColorEffect(rsContext);
             oilFilterEffect.set_script(oilFilterEffect);
             oilFilterEffect.set_width(bitmap.getWidth());
             oilFilterEffect.set_height(bitmap.getHeight());

WorkManagerSample/app/src/main/java/com/example/background/SelectImageActivity.java

@@ -58,6 +58,6 @@ void root(const uchar4* v_in, uchar4* v_out, const void* usrData, uint32_t x, ui
 }
 
 void filter() {
-  rsDebug("Processing image with dimensions for oil filter effect", width, height);
+  rsDebug("Processing image with dimensions for water color effect", width, height);
   rsForEach(script, in, out);
 }