AVRO-2117: Cleanup Java - Cleanup tests
Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/6a4dd09b Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/6a4dd09b Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/6a4dd09b Branch: refs/heads/master Commit: 6a4dd09b8d24c2c62420f2eaf90365789606b2e3 Parents: 61ab738 Author: Niels Basjes <[email protected]> Authored: Wed Dec 13 17:03:34 2017 +0100 Committer: Niels Basjes <[email protected]> Committed: Fri Dec 29 18:02:55 2017 +0100 ---------------------------------------------------------------------- .../apache/avro/TestSchemaNormalization.java | 2 +- .../org/apache/avro/io/TestBinaryDecoder.java | 4 +-- .../avro/reflect/TestNonStringMapKeys.java | 9 ++++--- .../test/java/org/apache/avro/TestBulkData.java | 2 +- .../org/apache/avro/TestDataFileSpecific.java | 2 +- .../org/apache/avro/TestNamespaceSpecific.java | 2 +- .../org/apache/avro/TestProtocolSpecific.java | 2 +- .../org/apache/avro/ipc/TestNettyServer.java | 8 +++--- .../specific/TestSpecificRecordBuilder.java | 20 +++++++-------- .../avro/mapred/TestAvroOutputFormat.java | 27 +++++++++----------- .../org/apache/avro/mapred/TestGenericJob.java | 2 +- .../apache/avro/mapreduce/TestWordCount.java | 4 +-- .../apache/trevni/avro/TestEvolvedSchema.java | 19 +++++++------- .../org/apache/trevni/avro/TestWordCount.java | 2 +- 14 files changed, 51 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java index 42c9080..1459b63 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java +++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaNormalization.java @@ -133,7 +133,7 @@ public class TestSchemaNormalization { private static final byte[] POSTFIX = { 0, 0, 0, 0, 0, 0, 0, 0 }; private static void assertEqHex(long expected, long actual) { - String m = format("0x%016x != 0x%016x", expected, actual).toString(); + String m = format("0x%016x != 0x%016x", expected, actual); assertTrue(m, expected == actual); } http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java index b8d18c5..96e62d7 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java +++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestBinaryDecoder.java @@ -460,11 +460,11 @@ public class TestBinaryDecoder { public void testEOF() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Encoder e = EncoderFactory.get().binaryEncoder(baos, null); - e.writeLong(0x10000000000000l); + e.writeLong(0x10000000000000L); e.flush(); Decoder d = newDecoder(new ByteArrayInputStream(baos.toByteArray())); - Assert.assertEquals(0x10000000000000l, d.readLong()); + Assert.assertEquals(0x10000000000000L, d.readLong()); d.readInt(); } http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestNonStringMapKeys.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestNonStringMapKeys.java b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestNonStringMapKeys.java index 2c949d6..458d52c 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestNonStringMapKeys.java +++ b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestNonStringMapKeys.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Map.Entry; import static org.junit.Assert.*; @@ -508,25 +509,25 @@ class SameMapSignature { LinkedHashMap<Integer, String> map3; TreeMap<Integer, String> map4; - public HashMap<Integer, String> getMap1() { + public Map<Integer, String> getMap1() { return map1; } public void setMap1(HashMap<Integer, String> map1) { this.map1 = map1; } - public ConcurrentHashMap<Integer, String> getMap2() { + public Map<Integer, String> getMap2() { return map2; } public void setMap2(ConcurrentHashMap<Integer, String> map2) { this.map2 = map2; } - public LinkedHashMap<Integer, String> getMap3() { + public Map<Integer, String> getMap3() { return map3; } public void setMap3(LinkedHashMap<Integer, String> map3) { this.map3 = map3; } - public TreeMap<Integer, String> getMap4() { + public Map<Integer, String> getMap4() { return map4; } public void setMap4(TreeMap<Integer, String> map4) { http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java b/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java index 1161466..d620e9e 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/TestBulkData.java @@ -43,7 +43,7 @@ public class TestBulkData { Integer.parseInt(System.getProperty("test.size", "65536")); private static final ByteBuffer DATA = ByteBuffer.allocate(SIZE); - { + static { Random rand = new Random(); DATA.limit(DATA.capacity()); DATA.position(0); http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/TestDataFileSpecific.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/TestDataFileSpecific.java b/lang/java/ipc/src/test/java/org/apache/avro/TestDataFileSpecific.java index ba0c3b1..19374b4 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/TestDataFileSpecific.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/TestDataFileSpecific.java @@ -65,7 +65,7 @@ public class TestDataFileSpecific { new DataFileReader<>(FILE, new SpecificDatumReader<>()); int i = 0; for (Foo f : reader) - Assert.assertEquals(""+(i++), f.getLabel().toString()); + Assert.assertEquals(""+(i++), f.getLabel()); Assert.assertEquals(10, i); reader.close(); } http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java b/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java index 3310f9d..09785c1 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/TestNamespaceSpecific.java @@ -76,7 +76,7 @@ public class TestNamespaceSpecific { error = e; } assertNotNull(error); - assertEquals("an error", error.getMessage$().toString()); + assertEquals("an error", error.getMessage$()); } @AfterClass http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java b/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java index 5e7603b..77340fc 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolSpecific.java @@ -188,7 +188,7 @@ public class TestProtocolSpecific { error = e; } assertNotNull(error); - assertEquals("an error", error.getMessage$().toString()); + assertEquals("an error", error.getMessage$()); } @Test http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java b/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java index 1cec15d..a892744 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestNettyServer.java @@ -51,9 +51,9 @@ public class TestNettyServer { // in this simple example just return details of the message public String send(Message message) { - return "Sent message to ["+ message.getTo().toString() + - "] from [" + message.getFrom().toString() + "] with body [" + - message.getBody().toString() + "]"; + return "Sent message to ["+ message.getTo() + + "] from [" + message.getFrom() + "] with body [" + + message.getBody() + "]"; } public void fireandforget(Message message) { @@ -114,7 +114,7 @@ public class TestNettyServer { private void verifyResponse(String result) { Assert.assertEquals( "Sent message to [wife] from [husband] with body [I love you!]", - result.toString()); + result); } @Test http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java b/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java index 1fbb7a2..4fa6fe0 100644 --- a/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java +++ b/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java @@ -45,39 +45,39 @@ public class TestSpecificRecordBuilder { // Create a new builder, and leave some fields with default values empty: Person.Builder builder = Person.newBuilder().setName("James Gosling").setYearOfBirth(1955).setState("CA"); Assert.assertTrue(builder.hasName()); - Assert.assertEquals("James Gosling", builder.getName().toString()); + Assert.assertEquals("James Gosling", builder.getName()); Assert.assertTrue(builder.hasYearOfBirth()); Assert.assertEquals(new Integer(1955), builder.getYearOfBirth()); Assert.assertFalse(builder.hasCountry()); Assert.assertNull(builder.getCountry()); Assert.assertTrue(builder.hasState()); - Assert.assertEquals("CA", builder.getState().toString()); + Assert.assertEquals("CA", builder.getState()); Assert.assertFalse(builder.hasFriends()); Assert.assertNull(builder.getFriends()); Assert.assertFalse(builder.hasLanguages()); Assert.assertNull(builder.getLanguages()); Person person = builder.build(); - Assert.assertEquals("James Gosling", person.getName().toString()); + Assert.assertEquals("James Gosling", person.getName()); Assert.assertEquals(new Integer(1955), person.getYearOfBirth()); - Assert.assertEquals("US", person.getCountry().toString()); // country should default to "US" - Assert.assertEquals("CA", person.getState().toString()); + Assert.assertEquals("US", person.getCountry()); // country should default to "US" + Assert.assertEquals("CA", person.getState()); Assert.assertNotNull(person.getFriends()); // friends should default to an empty list Assert.assertEquals(0, person.getFriends().size()); Assert.assertNotNull(person.getLanguages()); // Languages should now be "English" and "Java" Assert.assertEquals(2, person.getLanguages().size()); - Assert.assertEquals("English", person.getLanguages().get(0).toString()); - Assert.assertEquals("Java", person.getLanguages().get(1).toString()); + Assert.assertEquals("English", person.getLanguages().get(0)); + Assert.assertEquals("Java", person.getLanguages().get(1)); // Test copy constructors: Assert.assertEquals(builder, Person.newBuilder(builder)); Assert.assertEquals(person, Person.newBuilder(person).build()); Person.Builder builderCopy = Person.newBuilder(person); - Assert.assertEquals("James Gosling", builderCopy.getName().toString()); + Assert.assertEquals("James Gosling", builderCopy.getName()); Assert.assertEquals(new Integer(1955), builderCopy.getYearOfBirth()); - Assert.assertEquals("US", builderCopy.getCountry().toString()); // country should default to "US" - Assert.assertEquals("CA", builderCopy.getState().toString()); + Assert.assertEquals("US", builderCopy.getCountry()); // country should default to "US" + Assert.assertEquals("CA", builderCopy.getState()); Assert.assertNotNull(builderCopy.getFriends()); // friends should default to an empty list Assert.assertEquals(0, builderCopy.getFriends().size()); http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroOutputFormat.java ---------------------------------------------------------------------- diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroOutputFormat.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroOutputFormat.java index 6d1c171..d710ac1 100644 --- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroOutputFormat.java +++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestAvroOutputFormat.java @@ -17,15 +17,14 @@ */ package org.apache.avro.mapred; -import java.io.UnsupportedEncodingException; - -import junit.framework.TestCase; - import org.apache.avro.file.CodecFactory; import org.apache.hadoop.mapred.JobConf; import org.junit.Test; -public class TestAvroOutputFormat extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class TestAvroOutputFormat { @Test public void testSetSyncInterval() { JobConf jobConf = new JobConf(); @@ -37,9 +36,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testNoCodec() throws UnsupportedEncodingException { - - + public void testNoCodec() { JobConf job = new JobConf(); assertTrue(AvroOutputFormat.getCodecFactory(job) == null); @@ -55,7 +52,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testBZip2CodecUsingHadoopClass() throws UnsupportedEncodingException { + public void testBZip2CodecUsingHadoopClass() { CodecFactory avroBZip2Codec = CodecFactory.fromString("bzip2"); JobConf job = new JobConf(); @@ -67,7 +64,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testBZip2CodecUsingAvroCodec() throws UnsupportedEncodingException { + public void testBZip2CodecUsingAvroCodec() { CodecFactory avroBZip2Codec = CodecFactory.fromString("bzip2"); JobConf job = new JobConf(); @@ -79,7 +76,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testDeflateCodecUsingHadoopClass() throws UnsupportedEncodingException { + public void testDeflateCodecUsingHadoopClass() { CodecFactory avroDeflateCodec = CodecFactory.fromString("deflate"); JobConf job = new JobConf(); @@ -91,7 +88,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testDeflateCodecUsingAvroCodec() throws UnsupportedEncodingException { + public void testDeflateCodecUsingAvroCodec() { CodecFactory avroDeflateCodec = CodecFactory.fromString("deflate"); JobConf job = new JobConf(); @@ -103,7 +100,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testSnappyCodecUsingHadoopClass() throws UnsupportedEncodingException { + public void testSnappyCodecUsingHadoopClass() { CodecFactory avroSnappyCodec = CodecFactory.fromString("snappy"); JobConf job = new JobConf(); @@ -115,7 +112,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testSnappyCodecUsingAvroCodec() throws UnsupportedEncodingException { + public void testSnappyCodecUsingAvroCodec() { CodecFactory avroSnappyCodec = CodecFactory.fromString("snappy"); JobConf job = new JobConf(); @@ -127,7 +124,7 @@ public class TestAvroOutputFormat extends TestCase { } @Test - public void testGZipCodecUsingHadoopClass() throws UnsupportedEncodingException { + public void testGZipCodecUsingHadoopClass() { CodecFactory avroDeflateCodec = CodecFactory.fromString("deflate"); JobConf job = new JobConf(); http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java ---------------------------------------------------------------------- diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java index eae6160..b5ff707 100644 --- a/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java +++ b/lang/java/mapred/src/test/java/org/apache/avro/mapred/TestGenericJob.java @@ -111,7 +111,7 @@ public class TestGenericJob { Reporter reporter) throws IOException { GenericData.Record optional_entry = new GenericData.Record(createInnerSchema("optional_field_1")); - optional_entry.put("optional_field_1", 0l); + optional_entry.put("optional_field_1", 0L); GenericData.Array<GenericData.Record> array = new GenericData.Array<>(1, createArraySchema()); array.add(optional_entry); http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestWordCount.java ---------------------------------------------------------------------- diff --git a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestWordCount.java b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestWordCount.java index a9b8c7c..00d8c19 100644 --- a/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestWordCount.java +++ b/lang/java/mapred/src/test/java/org/apache/avro/mapreduce/TestWordCount.java @@ -343,7 +343,7 @@ public class TestWordCount { new ReflectDatumReader<>()); Map<String, Integer> counts = new HashMap<>(); for (ReflectStats record : reader) { - counts.put(record.name.toString(), record.count); + counts.put(record.name, record.count); } reader.close(); @@ -424,7 +424,7 @@ public class TestWordCount { new ReflectDatumReader<>()); Map<String, Integer> counts = new HashMap<>(); for (ReflectStats record : reader) { - counts.put(record.name.toString(), record.count); + counts.put(record.name, record.count); } reader.close(); http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java index 9d0c851..cbc8571 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestEvolvedSchema.java @@ -20,8 +20,6 @@ package org.apache.trevni.avro; import java.io.File; import java.io.IOException; -import junit.framework.TestCase; - import org.apache.avro.Schema; import org.apache.avro.file.DataFileReader; import org.apache.avro.file.DataFileWriter; @@ -32,10 +30,11 @@ import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumWriter; import org.apache.trevni.ColumnFileMetaData; import org.apache.trevni.avro.AvroColumnReader.Params; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class TestEvolvedSchema extends TestCase { +public class TestEvolvedSchema { private static String writerSchema = "{" + " \"namespace\": \"org.apache.avro\"," + " \"name\": \"test_evolution\"," + " \"type\": \"record\"," @@ -69,7 +68,7 @@ public class TestEvolvedSchema extends TestCase { private static final Schema inner = Schema.parse(innerSchema); @Before - public void setUp() { + public void setUp() { writtenRecord = new GenericData.Record(writer); writtenRecord.put("a", "record"); writtenRecord.put("b", 21); @@ -85,7 +84,7 @@ public class TestEvolvedSchema extends TestCase { } @Test - public void testTrevniEvolvedRead() throws IOException { + public void testTrevniEvolvedRead() throws IOException { AvroColumnWriter<GenericRecord> acw = new AvroColumnWriter<>(writer, new ColumnFileMetaData()); acw.write(writtenRecord); @@ -97,12 +96,12 @@ public class TestEvolvedSchema extends TestCase { AvroColumnReader<GenericRecord> acr = new AvroColumnReader<>(params); GenericRecord readRecord = acr.next(); - assertEquals(evolvedRecord, readRecord); - assertFalse(acr.hasNext()); + Assert.assertEquals(evolvedRecord, readRecord); + Assert.assertFalse(acr.hasNext()); } @Test - public void testAvroEvolvedRead() throws IOException { + public void testAvroEvolvedRead() throws IOException { File serializedAvro = File.createTempFile("avro", null); DatumWriter<GenericRecord> dw = new GenericDatumWriter<>(writer); @@ -119,8 +118,8 @@ public class TestEvolvedSchema extends TestCase { DataFileReader<GenericRecord> dfr = new DataFileReader<>(serializedAvro, reader); GenericRecord readRecord = dfr.next(); - assertEquals(evolvedRecord, readRecord); - assertFalse(dfr.hasNext()); + Assert.assertEquals(evolvedRecord, readRecord); + Assert.assertFalse(dfr.hasNext()); } } http://git-wip-us.apache.org/repos/asf/avro/blob/6a4dd09b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java index 871751f..8f6c9b5 100644 --- a/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java +++ b/lang/java/trevni/avro/src/test/java/org/apache/trevni/avro/TestWordCount.java @@ -49,7 +49,7 @@ public class TestWordCount { @Override public void map(String text, AvroCollector<Pair<String,Long>> collector, Reporter reporter) throws IOException { - StringTokenizer tokens = new StringTokenizer(text.toString()); + StringTokenizer tokens = new StringTokenizer(text); while (tokens.hasMoreTokens()) collector.collect(new Pair<>(tokens.nextToken(), 1L)); }
