commit 6ed308cd2347ef350f8bd26611fdc464fe944139
author Adam Lesinski <adamlesinski@google.com> Wed Sep 25 12:39:17 2013 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Sep 25 12:41:52 2013 -0700
tree f40403ee497ac720f5b18b11bd5b6b51e5a5574f
parent 1b96bce0e6e295d6d0d4a422ae835cb8d6ae2de7

Fix CTS tests depending on FileNotFoundException

After an API change to ParcelFileDescriptor, opening files with a bad
mode string results in an IllegalArgumentException rather than a
FileNotFoundException.

bug:10921418
Change-Id: I01ec59f3349e7b98860434d41c5053f5c2293fff

tests/tests/content/src/android/content/cts/ContentProviderTest.java

diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index 2312e53..5ced37c 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -201,8 +201,8 @@
         try {
             uri = Uri.parse("content://test");
             cp.openFile(uri, "wrong");
-            fail("Should throw FileNotFoundException!");
-        } catch (FileNotFoundException e) {
+            fail("Should throw IllegalArgumentException for bad mode!");
+        } catch (IllegalArgumentException e) {
         }
 
         // delete the temporary file

tests/tests/content/src/android/content/cts/ContentResolverTest.java

diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index 22c2faa..47371cc 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -642,8 +642,8 @@
 
         try {
             mContentResolver.openFileDescriptor(uri, "d");
-            fail("did not throw FileNotFoundException when mode is unknown.");
-        } catch (FileNotFoundException e) {
+            fail("did not throw IllegalArgumentException when mode is unknown.");
+        } catch (IllegalArgumentException e) {
             //expected.
         }