Fix GifDrawable leaks in GifDrawableTest.

bumptech · Dec 9, 2017 · 523562c · 523562c
1 parent 7ab1621
commit 523562c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/...umentation/src/androidTest/java/com/bumptech/glide/load/resource/gif/GifDrawableTest.java b/...umentation/src/androidTest/java/com/bumptech/glide/load/resource/gif/GifDrawableTest.java
@@ -69,7 +69,6 @@ public void loadGif_withInterlacedTransparentGif_sizeOriginal_succeeds()
             .submit()
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -82,7 +81,6 @@ public void loadGif_withInterlacedTransparentGif_downsampled_succeeds()
             .submit(10, 10)
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -95,7 +93,6 @@ public void loadGif_withTransparentGif_sizeOriginal_succeeds()
             .submit()
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -108,7 +105,6 @@ public void loadGif_withTransparentGif_downsampled_succeeds()
             .submit(10, 10)
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -121,7 +117,6 @@ public void loadGif_withOpaqueGif_sizeOriginal_succeeds()
             .submit()
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -134,7 +129,6 @@ public void loadGif_withOpaqueGif_downsampled_succeeds()
             .submit(10, 10)
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -147,7 +141,6 @@ public void loadGif_withOpaqueInterlacedGif_sizeOriginal_succeeds()
             .submit()
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -160,7 +153,6 @@ public void loadGif_withOpaqueInterlacedGif_downsampled_succeeds()
             .submit(10, 10)
             .get();
     assertThat(gifDrawable).isNotNull();
-    gifDrawable.stop();
   }
 
   @Test
@@ -216,8 +208,8 @@ public void run() {
     GifDrawable drawableFromView = (GifDrawable) imageView.getDrawable();
     assertThat(drawableFromView.isRunning()).isTrue();
 
-    gifDrawable.stop();
     drawableFromView.stop();
+    gifDrawable.stop();
   }
 
   @SuppressWarnings("deprecation")

diff --git a/instrumentation/src/androidTest/java/com/bumptech/glide/test/TearDownGlide.java b/instrumentation/src/androidTest/java/com/bumptech/glide/test/TearDownGlide.java
@@ -1,6 +1,8 @@
 package com.bumptech.glide.test;
 
+import android.support.test.InstrumentationRegistry;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestManager;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -18,6 +20,15 @@ public void evaluate() throws Throwable {
         try {
           base.evaluate();
         } finally {
+          new ConcurrencyHelper().runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+              RequestManager requestManager =
+                  Glide.with(InstrumentationRegistry.getTargetContext());
+              requestManager.onStop();
+              requestManager.onDestroy();
+            }
+          });
           Glide.tearDown();
         }
       }

diff --git a/library/src/main/java/com/bumptech/glide/Glide.java b/library/src/main/java/com/bumptech/glide/Glide.java
@@ -200,6 +200,9 @@ public static synchronized void init(Context context, GlideBuilder builder) {
   @VisibleForTesting
   public static synchronized void tearDown() {
     if (glide != null) {
+      glide.getContext()
+          .getApplicationContext()
+          .unregisterComponentCallbacks(glide);
       glide.engine.shutdown();
     }
     glide = null;