diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-08 14:13:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 14:13:10 +0000 |
| commit | 1303f73574986ec3a2fe5166eb0bd08476eeac2a (patch) | |
| tree | 2a1b4307635eb4a800524f22d600fa466d23008c /luni/src | |
| parent | aaff3a2b0fc4d787ba1874335002db4c60d98825 (diff) | |
| parent | 73f428dc37be1294887f4a74b46106972b6de5f0 (diff) | |
| download | libcore-1303f73574986ec3a2fe5166eb0bd08476eeac2a.zip libcore-1303f73574986ec3a2fe5166eb0bd08476eeac2a.tar.gz libcore-1303f73574986ec3a2fe5166eb0bd08476eeac2a.tar.bz2 | |
am 73f428dc: Merge "Use the right class loader in ProxyTest."
* commit '73f428dc37be1294887f4a74b46106972b6de5f0':
Use the right class loader in ProxyTest.
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/test/java/libcore/java/lang/reflect/ProxyTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/luni/src/test/java/libcore/java/lang/reflect/ProxyTest.java b/luni/src/test/java/libcore/java/lang/reflect/ProxyTest.java index bb8e989..abd5851 100644 --- a/luni/src/test/java/libcore/java/lang/reflect/ProxyTest.java +++ b/luni/src/test/java/libcore/java/lang/reflect/ProxyTest.java @@ -204,13 +204,13 @@ public final class ProxyTest extends TestCase { public void test_getProxyClass_nullInterfaces() { try { - Proxy.getProxyClass(null, new Class<?>[] { null }); + Proxy.getProxyClass(loader, new Class<?>[] { null }); fail(); } catch (NullPointerException expected) { } try { - Proxy.getProxyClass(null, Echo.class, null); + Proxy.getProxyClass(loader, Echo.class, null); fail(); } catch (NullPointerException expected) { } @@ -218,16 +218,16 @@ public final class ProxyTest extends TestCase { public void test_getProxyClass_duplicateInterfaces() { try { - Proxy.getProxyClass(null, Echo.class, Echo.class); + Proxy.getProxyClass(loader, Echo.class, Echo.class); fail(); } catch (IllegalArgumentException expected) { } } public void test_getProxyClass_caching() throws Exception { - Class<?> proxy1 = Proxy.getProxyClass(null, Echo.class, ReturnsInt.class); - Class<?> proxy2 = Proxy.getProxyClass(null, Echo.class, ReturnsInt.class); - Class<?> proxy3 = Proxy.getProxyClass(null, ReturnsInt.class, Echo.class); + Class<?> proxy1 = Proxy.getProxyClass(loader, Echo.class, ReturnsInt.class); + Class<?> proxy2 = Proxy.getProxyClass(loader, Echo.class, ReturnsInt.class); + Class<?> proxy3 = Proxy.getProxyClass(loader, ReturnsInt.class, Echo.class); assertSame(proxy1, proxy2); assertTrue(!proxy2.equals(proxy3)); |