summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-14 13:15:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-14 13:15:45 +0000
commit7f46d8400a45ff2fc08e06b7fc8ea0db5e3f7e5a (patch)
tree627bbd8c5f31a2b5387dc2f8f62d0f87fe96a13c /harmony-tests
parent4adb509c309778c7fe6c7bff8b4d17d06a44aca5 (diff)
parent67b29d93704633ca6f9714e4d0a694afbf557f83 (diff)
downloadlibcore-7f46d8400a45ff2fc08e06b7fc8ea0db5e3f7e5a.zip
libcore-7f46d8400a45ff2fc08e06b7fc8ea0db5e3f7e5a.tar.gz
libcore-7f46d8400a45ff2fc08e06b7fc8ea0db5e3f7e5a.tar.bz2
Merge "Fix SerializationStressTest1#test_18_33_writeObject"
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
index df5f792..27d8b33 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
@@ -275,8 +275,6 @@ public class SerializationStressTest1 extends SerializationStressTest {
private static class MyException extends java.io.IOException {
}
- ;
-
// A primitive instance variable exposes a bug in the serialization
// spec.
// Primitive instance variables are written without primitive data tags
@@ -347,8 +345,6 @@ public class SerializationStressTest1 extends SerializationStressTest {
private Object notSerializable = new Object();
}
- ;
-
public boolean anInstanceVar = false;
public MyUnserializableExceptionWhenDumping() {
@@ -1436,10 +1432,10 @@ public class SerializationStressTest1 extends SerializationStressTest {
boolean causedException = false;
try {
dump(objToSave);
- } catch (java.io.StreamCorruptedException e) {
+ } catch (MyUnserializableExceptionWhenDumping.MyException e) {
causedException = true;
}
- ;
+
assertTrue("Should have caused an exception when dumping",
causedException);
// As the stream is corrupted, reading the stream will have