Exclude the test for the internal serialization
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/fb7c0269 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/fb7c0269 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/fb7c0269 Branch: refs/heads/REEF-395 Commit: fb7c0269d0b784397d9bfa447decafd0e2d60c8c Parents: 1441812 Author: Yunseong Lee <[email protected]> Authored: Mon Jun 22 22:08:07 2015 +0900 Committer: Yunseong Lee <[email protected]> Committed: Mon Jun 22 22:08:07 2015 +0900 ---------------------------------------------------------------------- .../formats/AvroClassHierarchySerializer.java | 6 +- .../formats/TestClassHierarchyRoundTrip.java | 96 +------------------- 2 files changed, 7 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/fb7c0269/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java index 2f5c0d8..07804e4 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/AvroClassHierarchySerializer.java @@ -36,19 +36,17 @@ public class AvroClassHierarchySerializer implements ClassHierarchySerializer { /** * Serialize the ClassHierarchy into the AvroNode. - * This method is set to be Package private for testing. * @param ch ClassHierarchy to serialize */ - static AvroNode toAvro(final ClassHierarchy ch) { + private static AvroNode toAvro(final ClassHierarchy ch) { return newAvroNode(ch.getNamespace()); } /** * Deserialize the ClassHierarchy from the AvroNode. - * This method is set to be Package private for testing. * @param n AvroNode to deserialize */ - static ClassHierarchy fromAvro(final AvroNode n) { + private static ClassHierarchy fromAvro(final AvroNode n) { return new AvroClassHierarchy(n); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/fb7c0269/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java index 9a06531..b49de46 100644 --- a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java +++ b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestClassHierarchyRoundTrip.java @@ -30,7 +30,7 @@ import java.io.File; import java.io.IOException; public class TestClassHierarchyRoundTrip extends TestClassHierarchy { - final AvroClassHierarchySerializer serializer = new AvroClassHierarchySerializer(); + final ClassHierarchySerializer serializer = new AvroClassHierarchySerializer(); // The original ClassHierarchy private void setup0() { @@ -38,14 +38,8 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { ns = Tang.Factory.getTang().getDefaultClassHierarchy(); } - // Serializes ClassHierarchy to AvroClassHierarchy - private void setup1() { - TangImpl.reset(); - ns = serializer.fromAvro(serializer.toAvro(ns)); - } - // Serializes ClassHierarchy to file - private void setup2() { + private void setup1() { TangImpl.reset(); try { final File file = java.io.File.createTempFile("TangTest", "avroch"); @@ -58,7 +52,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { } // Serializes ClassHierarchy to TextFile - private void setup3() { + private void setup2() { TangImpl.reset(); try { final File textFile = java.io.File.createTempFile("TangTest", "avroch"); @@ -71,7 +65,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { } // Serializes ClassHierarchy to byte[] - private void setup4() { + private void setup3() { TangImpl.reset(); try { ns = serializer.fromByteArray(serializer.toByteArray(ns)); @@ -81,7 +75,7 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { } // Serializes ClassHierarchy to String - private void setup5() { + private void setup4() { TangImpl.reset(); try { ns = serializer.fromString(serializer.toString(ns)); @@ -103,8 +97,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testJavaString(); setup4(); super.testJavaString(); - setup5(); - super.testJavaString(); } @Test @@ -120,8 +112,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testSimpleConstructors(); setup4(); super.testSimpleConstructors(); - setup5(); - super.testSimpleConstructors(); } @Test @@ -137,8 +127,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testNamedParameterConstructors(); setup4(); super.testNamedParameterConstructors(); - setup5(); - super.testNamedParameterConstructors(); } @Test @@ -154,8 +142,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testArray(); setup4(); super.testArray(); - setup5(); - super.testArray(); } @Test @@ -171,8 +157,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testRepeatConstructorArg(); setup4(); super.testRepeatConstructorArg(); - setup5(); - super.testRepeatConstructorArg(); } @Test @@ -188,8 +172,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testRepeatConstructorArgClasses(); setup4(); super.testRepeatConstructorArgClasses(); - setup5(); - super.testRepeatConstructorArgClasses(); } @Test @@ -205,8 +187,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testLeafRepeatedConstructorArgClasses(); setup4(); super.testLeafRepeatedConstructorArgClasses(); - setup5(); - super.testLeafRepeatedConstructorArgClasses(); } @Test @@ -222,8 +202,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testNamedRepeatConstructorArgClasses(); setup4(); super.testNamedRepeatConstructorArgClasses(); - setup5(); - super.testNamedRepeatConstructorArgClasses(); } @Test @@ -239,8 +217,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testResolveDependencies(); setup4(); super.testResolveDependencies(); - setup5(); - super.testResolveDependencies(); } @Test @@ -256,8 +232,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testDocumentedLocalNamedParameter(); setup4(); super.testDocumentedLocalNamedParameter(); - setup5(); - super.testDocumentedLocalNamedParameter(); } @Test @@ -273,8 +247,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testNamedParameterTypeMismatch(); setup4(); super.testNamedParameterTypeMismatch(); - setup5(); - super.testNamedParameterTypeMismatch(); } @Test @@ -290,8 +262,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testUnannotatedName(); setup4(); super.testUnannotatedName(); - setup5(); - super.testUnannotatedName(); } @Test @@ -307,8 +277,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testAnnotatedNotName(); setup4(); super.testAnnotatedNotName(); - setup5(); - super.testAnnotatedNotName(); } @Test @@ -324,25 +292,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture1(); setup4(); super.testGenericTorture1(); - setup5(); - super.testGenericTorture1(); - } - - @Test - @Override - public void testGenericTorture2() throws NameResolutionException { - setup0(); - super.testGenericTorture2(); - setup1(); - super.testGenericTorture2(); - setup2(); - super.testGenericTorture2(); - setup3(); - super.testGenericTorture2(); - setup4(); - super.testGenericTorture2(); - setup5(); - super.testGenericTorture2(); } @Test @@ -358,8 +307,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture3(); setup4(); super.testGenericTorture3(); - setup5(); - super.testGenericTorture3(); } @Test @@ -375,8 +322,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture4(); setup4(); super.testGenericTorture4(); - setup5(); - super.testGenericTorture4(); } @Test @@ -392,8 +337,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture5(); setup4(); super.testGenericTorture5(); - setup5(); - super.testGenericTorture5(); } @Test @@ -409,8 +352,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture6(); setup4(); super.testGenericTorture6(); - setup5(); - super.testGenericTorture6(); } @Test @@ -426,8 +367,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture7(); setup4(); super.testGenericTorture7(); - setup5(); - super.testGenericTorture7(); } @Test @@ -443,8 +382,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture8(); setup4(); super.testGenericTorture8(); - setup5(); - super.testGenericTorture8(); } @Test @@ -460,8 +397,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture9(); setup4(); super.testGenericTorture9(); - setup5(); - super.testGenericTorture9(); } @Test @@ -477,8 +412,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture10(); setup4(); super.testGenericTorture10(); - setup5(); - super.testGenericTorture10(); } @Test @@ -494,8 +427,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture11(); setup4(); super.testGenericTorture11(); - setup5(); - super.testGenericTorture11(); } @Test @@ -511,8 +442,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testGenericTorture12(); setup4(); super.testGenericTorture12(); - setup5(); - super.testGenericTorture12(); } @Test @@ -528,9 +457,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testInjectNonStaticLocalArgClass(); setup4(); super.testInjectNonStaticLocalArgClass(); - setup5(); - super.testInjectNonStaticLocalArgClass(); - } @Test @@ -546,8 +472,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testOKShortNames(); setup4(); super.testOKShortNames(); - setup5(); - super.testOKShortNames(); } @Test @@ -563,8 +487,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testRoundTripInnerClassNames(); setup4(); super.testRoundTripInnerClassNames(); - setup5(); - super.testRoundTripInnerClassNames(); } @Test @@ -580,8 +502,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testUnitIsInjectable(); setup4(); super.testUnitIsInjectable(); - setup5(); - super.testUnitIsInjectable(); } @Test @@ -597,8 +517,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.testBadUnitDecl(); setup4(); super.testBadUnitDecl(); - setup5(); - super.testBadUnitDecl(); } @Test @@ -614,8 +532,6 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.nameCantBindWrongSubclassAsDefault(); setup4(); super.nameCantBindWrongSubclassAsDefault(); - setup5(); - super.nameCantBindWrongSubclassAsDefault(); } @Test @@ -631,7 +547,5 @@ public class TestClassHierarchyRoundTrip extends TestClassHierarchy { super.ifaceCantBindWrongImplAsDefault(); setup4(); super.ifaceCantBindWrongImplAsDefault(); - setup5(); - super.ifaceCantBindWrongImplAsDefault(); } }
