Merge 28b1b98 into ac5883e

Author: maneesht

firebase-storage/src/main/java/com/google/firebase/storage/UploadTask.java

@@ -226,6 +226,7 @@ protected void schedule() {
  }
 
  if (mStorageRef.getParent() == null) {
+ System.out.println("Illegal!");
  mException =
  new IllegalArgumentException(
  "Cannot upload to getRoot. You should upload to a "
@@ -569,6 +570,7 @@ public void run() {
  @NonNull
  /*package*/ TaskSnapshot snapStateImpl() {
  Exception error = mException != null ? mException : mServerException;
+ System.out.println(error);
  return new TaskSnapshot(
  StorageException.fromExceptionAndHttpCode(error, mResultCode),
  mBytesUploaded.get(),

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

@@ -141,17 +141,20 @@ public void cantUploadToRoot() throws Exception {
 
  final UploadTask task = storage.putBytes(new byte[] {});
 
+ // This is a bad test. We assume at this stage that the task isn't done yet.
  try {
  task.getResult();
  Assert.fail();
- } catch (IllegalStateException ignore) {
+ } catch (Exception notIgnore) {
+ System.out.println("MTEWANI: EXCEPTION: " + notIgnore);
  // Task is not yet done.
  }
 
  Assert.assertNull(task.getException());
 
  task.addOnFailureListener(
  (exception) -> {
+ System.out.println("e:" + exception);
  Assert.assertEquals(
  "Cannot upload to getRoot. You should upload to a storage location such as "
  + ".getReference('image.png').putFile...",

firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java

@@ -696,6 +696,7 @@ private static void verifyTaskCount(StorageReference reference, int expectedTask
  "Expected active upload task at location %s to contain %s item(s), "
  + "but contained %s item(s)",
  reference.getParent(),
+ expectedTasks,
  uploadTasksAtParent.size());
  }