[Android Crash Reporting] Allow uploading minidumps via the JobScheduler

components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.minidump_uploader;
 
 import static org.junit.Assert.assertArrayEquals;
 
 import android.os.ParcelFileDescriptor;
 import android.support.test.filters.MediumTest;
@@ skipping 175 matching lines @@
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testDeleteFile() {
         assertTrue(mTmpFile1.exists());
         assertTrue(CrashFileManager.deleteFile(mTmpFile1));
         assertFalse(mTmpFile1.exists());
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
-    public void testGetAllMinidumpFiles() {
+    @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
+    public void testGetAllMinidumpFiles() throws IOException {
+        File forcedFile = new File(mCrashDir, "456_def.forced" + TEST_PID + ".try2");
+        forcedFile.createNewFile();
+        forcedFile.setLastModified(mModificationTimestamp);
+        mModificationTimestamp += 1000;
+
         CrashFileManager crashFileManager = new CrashFileManager(mCacheDir);
-        File[] expectedFiles = new File[] {mOneBelowMaxTriesFile, mDmpFile2, mDmpFile1};
+        File[] expectedFiles = new File[] {forcedFile, mOneBelowMaxTriesFile, mDmpFile2, mDmpFile1};
         File[] actualFiles = crashFileManager.getAllMinidumpFiles(MAX_TRIES_ALLOWED);
         assertNotNull(actualFiles);
         MoreAsserts.assertEquals("Failed to get the correct minidump files in directory",
                 expectedFiles, actualFiles);
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testGetAllMinidumpFilesMultiDigitMaxTries() {
         CrashFileManager crashFileManager = new CrashFileManager(mCacheDir);
@@ skipping 28 matching lines @@
         CrashFileManager crashFileManager = new CrashFileManager(mCacheDir);
         File[] expectedFiles = new File[] { mUpFile2, mUpFile1 };
         File[] actualFiles = crashFileManager.getAllUploadedFiles();
         assertNotNull(actualFiles);
         MoreAsserts.assertEquals("Failed to get the correct uploaded files in directory",
                 expectedFiles, actualFiles);
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
-    public void testAttemptNumber() {
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.dmp"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber(".try"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("try1"));
+    public void testReadAttemptNumber() {
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.dmp"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.dmp"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber(".try"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal(".try"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("try1"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("try1"));
+
         assertEquals(1, CrashFileManager.readAttemptNumber("file.try1.dmp"));
+        assertEquals(1, CrashFileManager.readAttemptNumberInternal("file.try1.dmp"));
+
         assertEquals(1, CrashFileManager.readAttemptNumber("file.dmp.try1"));
+        assertEquals(1, CrashFileManager.readAttemptNumberInternal("file.dmp.try1"));
+
         assertEquals(2, CrashFileManager.readAttemptNumber(".try2"));
+        assertEquals(2, CrashFileManager.readAttemptNumberInternal(".try2"));
+
         assertEquals(2, CrashFileManager.readAttemptNumber("file.try2.dmp"));
+        assertEquals(2, CrashFileManager.readAttemptNumberInternal("file.try2.dmp"));
+
         assertEquals(2, CrashFileManager.readAttemptNumber("file.dmp.try2"));
+        assertEquals(2, CrashFileManager.readAttemptNumberInternal("file.dmp.try2"));
+
         assertEquals(2, CrashFileManager.readAttemptNumber(".try2"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.tryN.dmp"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.tryN.dmp1"));
+        assertEquals(2, CrashFileManager.readAttemptNumberInternal(".try2"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.tryN.dmp"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.tryN.dmp"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.tryN.dmp1"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.tryN.dmp1"));
+
         assertEquals(9, CrashFileManager.readAttemptNumber("file.try9.dmp"));
+        assertEquals(9, CrashFileManager.readAttemptNumberInternal("file.try9.dmp"));
+
         assertEquals(10, CrashFileManager.readAttemptNumber("file.try10.dmp"));
+        assertEquals(10, CrashFileManager.readAttemptNumberInternal("file.try10.dmp"));
+
         assertEquals(9, CrashFileManager.readAttemptNumber("file.dmp.try9"));
+        assertEquals(9, CrashFileManager.readAttemptNumberInternal("file.dmp.try9"));
+
         assertEquals(10, CrashFileManager.readAttemptNumber("file.dmp.try10"));
+        assertEquals(10, CrashFileManager.readAttemptNumberInternal("file.dmp.try10"));
+
         assertEquals(300, CrashFileManager.readAttemptNumber("file.dmp.try300"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.dmp202.try"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.try.dmp1"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.try-2.dmp1"));
-        assertEquals(-1, CrashFileManager.readAttemptNumber("file.try-20.dmp1"));
+        assertEquals(300, CrashFileManager.readAttemptNumberInternal("file.dmp.try300"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.dmp202.try"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.dmp202.try"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.try.dmp1"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.try.dmp1"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.try-2.dmp1"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.try-2.dmp1"));
+
+        assertEquals(0, CrashFileManager.readAttemptNumber("file.try-20.dmp1"));
+        assertEquals(-1, CrashFileManager.readAttemptNumberInternal("file.try-20.dmp1"));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testAttemptNumberRename() {
         assertEquals("file.dmp.try1",
                 CrashFileManager.filenameWithIncrementedAttemptNumber("file.dmp"));
         assertEquals("f.dmp.try2",
                 CrashFileManager.filenameWithIncrementedAttemptNumber("f.dmp.try1"));
         assertEquals(
@@ skipping 358 matching lines @@
         assertFalse(mMultiDigitMaxTriesFile.exists());
         assertFalse(mUpFile1.exists());
         assertFalse(mUpFile2.exists());
         assertFalse(temp1.exists());
         assertFalse(temp2.exists());
         assertFalse(success1.exists());
         assertFalse(success2.exists());
         assertFalse(success3.exists());
     }
 }