Storage: Port test changes from cr/250550507 (#485)

Author: schmidt-sebastian

firebase-database/src/androidTest/java/com/google/firebase/database/InfoTest.java

@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -150,7 +151,7 @@ public void testManualConnectionManagementWorks()
     try {
       ReadFuture.untilEquals(refDup.child(".info/connected"), true)
           .timedGet(1500, TimeUnit.MILLISECONDS);
-      assert (false); // We should never get here!
+      Assert.fail();
     } catch (TimeoutException e) { //
     }
 

firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java

@@ -30,7 +30,7 @@
 
 /** Tests for {@link AdaptiveStreamBuffer}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class AdaptiveStreamBufferTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/DeleteTest.java

@@ -23,6 +23,7 @@
 import com.google.firebase.storage.network.NetworkLayerMock;
 import com.google.firebase.testing.FirebaseAppRule;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,7 +34,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class DeleteTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
@@ -71,6 +72,6 @@ public void deleteBlob() throws Exception {
       }
       Thread.sleep(1);
     }
-    assert (false);
+    Assert.fail();
   }
 }

firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java

@@ -29,7 +29,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class DependencyTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/DownloadTest.java

@@ -47,7 +47,7 @@
 /** Tests for {@link FirebaseStorage}. */
 @SuppressWarnings("ConstantConditions")
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class DownloadTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/ListTest.java

@@ -34,7 +34,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class ListTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/MetadataTest.java

@@ -22,8 +22,8 @@
 import com.google.firebase.storage.network.MockConnectionFactory;
 import com.google.firebase.storage.network.NetworkLayerMock;
 import com.google.firebase.testing.FirebaseAppRule;
-import junit.framework.Assert;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -34,7 +34,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class MetadataTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
@@ -71,7 +71,7 @@ public void updateMetadata() throws Exception {
       }
       Thread.sleep(1);
     }
-    assert (false);
+    Assert.fail();
   }
 
   @Test

firebase-storage/src/test/java/com/google/firebase/storage/PathingTest.java

@@ -36,7 +36,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class PathingTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);
@@ -164,7 +164,7 @@ public void dotdotTest() throws Exception {
         FirebaseStorage.getInstance()
             .getReferenceFromUrl("gs://benwu-test1" + ".storage.firebase.com/child/../");
 
-    assertEquals(ref.getName(), "..");
+    assertEquals("..", ref.getName());
   }
 
   @Test
@@ -184,7 +184,7 @@ public void nameTest() throws Exception {
         FirebaseStorage.getInstance()
             .getReferenceFromUrl("gs://benwu-test1" + ".storage.firebase.com/child/image.png");
 
-    assertEquals(ref.getName(), "image.png");
+    assertEquals("image.png", ref.getName());
   }
 
   @Test
@@ -193,7 +193,7 @@ public void nameRootTest() throws Exception {
         FirebaseStorage.getInstance()
             .getReferenceFromUrl("gs://benwu-test1" + ".storage.firebase.com/image.png");
 
-    assertEquals(ref.getName(), "image.png");
+    assertEquals("image.png", ref.getName());
   }
 
   @Test

firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java

@@ -38,7 +38,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class StorageReferenceTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java

@@ -35,7 +35,7 @@
 
 /** Tests for {@link StreamProgressWrapper}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class StreamProgressWrapperTest {
 

firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java

@@ -62,7 +62,7 @@
 /** Tests for {@link FirebaseStorage}. */
 @SuppressWarnings("ConstantConditions")
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
 public class UploadTest {
 
   private static final String TEST_ASSET_ROOT = "assets/";