Removing unused method - DownloadContentCatalog: markAsIgnored() draft
authorKrishna <k.krish@yahoo.com>
Thu, 12 May 2016 19:47:50 +0800
changeset 372938 8cf363b38e8d31f0a17de53ef3ec822d2845e947
parent 366346 c3f5e6079284a7b7053c41f05d0fe06ff031db03
child 372939 b9d5eaaeb2ed2d60d7370587ce58424c8d742ff0
push id19645
push userk.krish@yahoo.com
push dateMon, 30 May 2016 17:45:06 +0000
milestone49.0a1
Removing unused method - DownloadContentCatalog: markAsIgnored() MozReview-Commit-ID: KU202Ksx9ib
mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContent.java
mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
--- a/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContent.java
+++ b/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContent.java
@@ -6,25 +6,24 @@
 package org.mozilla.gecko.dlc.catalog;
 
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringDef;
 
 public class DownloadContent {
-    @IntDef({STATE_NONE, STATE_SCHEDULED, STATE_DOWNLOADED, STATE_FAILED, STATE_IGNORED, STATE_UPDATED, STATE_DELETED})
+    @IntDef({STATE_NONE, STATE_SCHEDULED, STATE_DOWNLOADED, STATE_FAILED, STATE_UPDATED, STATE_DELETED})
     public @interface State {}
     public static final int STATE_NONE = 0;
     public static final int STATE_SCHEDULED = 1;
     public static final int STATE_DOWNLOADED = 2;
     public static final int STATE_FAILED = 3; // Permanently failed for this version of the content
-    public static final int STATE_IGNORED = 4;
-    public static final int STATE_UPDATED = 5;
-    public static final int STATE_DELETED = 6;
+    public static final int STATE_UPDATED = 4;
+    public static final int STATE_DELETED = 5;
 
     @StringDef({TYPE_ASSET_ARCHIVE})
     public @interface Type {}
     public static final String TYPE_ASSET_ARCHIVE = "asset-archive";
 
     @StringDef({KIND_FONT})
     public @interface Kind {}
     public static final String KIND_FONT = "font";
--- a/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
+++ b/mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
@@ -152,21 +152,16 @@ public class DownloadContentCatalog {
         hasCatalogChanged = true;
     }
 
     public synchronized void markAsPermanentlyFailed(DownloadContent content) {
         content.setState(DownloadContent.STATE_FAILED);
         hasCatalogChanged = true;
     }
 
-    public synchronized void markAsIgnored(DownloadContent content) {
-        content.setState(DownloadContent.STATE_IGNORED);
-        hasCatalogChanged = true;
-    }
-
     public synchronized void markAsDeleted(DownloadContent content) {
         content.setState(DownloadContent.STATE_DELETED);
         hasCatalogChanged = true;
     }
 
     public synchronized void rememberFailure(DownloadContent content, int failureType) {
         if (content.getFailures() >= MAX_FAILURES_UNTIL_PERMANENTLY_FAILED) {
             Log.d(LOGTAG, "Maximum number of failures reached. Marking content has permanently failed.");
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/dlc/catalog/TestDownloadContentCatalog.java
@@ -12,19 +12,16 @@ import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.background.testhelpers.TestRunner;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
@@ -128,35 +125,16 @@ public class TestDownloadContentCatalog 
         Assert.assertFalse("Catalog has not changed", catalog.hasCatalogChanged());
 
         catalog.markAsPermanentlyFailed(content);
 
         Assert.assertTrue("Catalog has changed", catalog.hasCatalogChanged());
     }
 
     /**
-     * Scenario: Mark an item in the catalog as ignored.
-     *
-     * Verify that:
-     *  * Catalog has changed
-     */
-    @Test
-    public void testCatalogHasChangedIfContentIsIgnored() throws Exception {
-        DownloadContentCatalog catalog = spy(new DownloadContentCatalog(mock(AtomicFile.class)));
-        DownloadContent content = new DownloadContentBuilder().build();
-        catalog.onCatalogLoaded(createMapOfContent(content));
-
-        Assert.assertFalse("Catalog has not changed", catalog.hasCatalogChanged());
-
-        catalog.markAsIgnored(content);
-
-        Assert.assertTrue("Catalog has changed", catalog.hasCatalogChanged());
-    }
-
-    /**
      * Scenario: A changed catalog is written to disk.
      *
      * Verify that:
      *  * Before write: Catalog has changed
      *  * After write: Catalog has not changed.
      */
     @Test
     public void testCatalogHasNotChangedAfterWritingToDisk() throws Exception {
@@ -189,44 +167,42 @@ public class TestDownloadContentCatalog 
 
         DownloadContent content1 = new DownloadContentBuilder().setId("A").setState(DownloadContent.STATE_NONE).build();
         DownloadContent content2 = new DownloadContentBuilder().setId("B").setState(DownloadContent.STATE_NONE).build();
         DownloadContent content3 = new DownloadContentBuilder().setId("C").setState(DownloadContent.STATE_SCHEDULED).build();
         DownloadContent content4 = new DownloadContentBuilder().setId("D").setState(DownloadContent.STATE_SCHEDULED).build();
         DownloadContent content5 = new DownloadContentBuilder().setId("E").setState(DownloadContent.STATE_SCHEDULED).build();
         DownloadContent content6 = new DownloadContentBuilder().setId("F").setState(DownloadContent.STATE_DOWNLOADED).build();
         DownloadContent content7 = new DownloadContentBuilder().setId("G").setState(DownloadContent.STATE_FAILED).build();
-        DownloadContent content8 = new DownloadContentBuilder().setId("H").setState(DownloadContent.STATE_IGNORED).build();
-        DownloadContent content9 = new DownloadContentBuilder().setId("I").setState(DownloadContent.STATE_IGNORED).build();
-        DownloadContent content10 = new DownloadContentBuilder().setId("J").setState(DownloadContent.STATE_UPDATED).build();
-        DownloadContent content11 = new DownloadContentBuilder().setId("K").setState(DownloadContent.STATE_DELETED).build();
-        DownloadContent content12 = new DownloadContentBuilder().setId("L").setState(DownloadContent.STATE_DELETED).build();
+        DownloadContent content8 = new DownloadContentBuilder().setId("H").setState(DownloadContent.STATE_UPDATED).build();
+        DownloadContent content9 = new DownloadContentBuilder().setId("I").setState(DownloadContent.STATE_DELETED).build();
+        DownloadContent content10 = new DownloadContentBuilder().setId("J").setState(DownloadContent.STATE_DELETED).build();
 
         catalog.onCatalogLoaded(createMapOfContent(content1, content2, content3, content4, content5, content6,
-                content7, content8, content9, content10, content11, content12));
+                content7, content8, content9, content10));
 
         Assert.assertTrue(catalog.hasScheduledDownloads());
 
         Assert.assertEquals(3, catalog.getContentToStudy().size());
         Assert.assertEquals(1, catalog.getDownloadedContent().size());
         Assert.assertEquals(3, catalog.getScheduledDownloads().size());
         Assert.assertEquals(2, catalog.getContentToDelete().size());
 
         Assert.assertTrue(catalog.getContentToStudy().contains(content1));
         Assert.assertTrue(catalog.getContentToStudy().contains(content2));
-        Assert.assertTrue(catalog.getContentToStudy().contains(content10));
+        Assert.assertTrue(catalog.getContentToStudy().contains(content8));
 
         Assert.assertTrue(catalog.getDownloadedContent().contains(content6));
 
         Assert.assertTrue(catalog.getScheduledDownloads().contains(content3));
         Assert.assertTrue(catalog.getScheduledDownloads().contains(content4));
         Assert.assertTrue(catalog.getScheduledDownloads().contains(content5));
 
-        Assert.assertTrue(catalog.getContentToDelete().contains(content11));
-        Assert.assertTrue(catalog.getContentToDelete().contains(content12));
+        Assert.assertTrue(catalog.getContentToDelete().contains(content9));
+        Assert.assertTrue(catalog.getContentToDelete().contains(content10));
     }
 
     /**
      * Scenario: Calling rememberFailure() on a catalog with varying values
      */
     @Test
     public void testRememberingFailures() {
         DownloadContentCatalog catalog = new DownloadContentCatalog(mock(AtomicFile.class));