You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2019/05/24 18:20:32 UTC
[beam] branch master updated: Replace assertEquals(boolean,
xyz) with assertBoolean(xyz) (#8037)
This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 7b851e6 Replace assertEquals(boolean, xyz) with assertBoolean(xyz) (#8037)
7b851e6 is described below
commit 7b851e6c28370d24b64d3e3adf1f1f38c9bdde6b
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Fri May 24 19:20:18 2019 +0100
Replace assertEquals(boolean, xyz) with assertBoolean(xyz) (#8037)
---
.../beam/runners/dataflow/DataflowRunnerTest.java | 3 +-
.../beam/runners/dataflow/util/StructsTest.java | 4 +--
.../dataflow/worker/counters/CounterTest.java | 32 +++++++++++-----------
.../beam/sdk/schemas/AutoValueSchemaTest.java | 5 ++--
.../beam/sdk/schemas/JavaBeanSchemaTest.java | 11 ++++----
.../beam/sdk/schemas/JavaFieldSchemaTest.java | 9 +++---
.../beam/sdk/schemas/utils/JavaBeanUtilsTest.java | 8 +++---
.../beam/sdk/schemas/utils/POJOUtilsTest.java | 8 +++---
.../org/apache/beam/sdk/testing/PAssertTest.java | 3 +-
.../org/apache/beam/sdk/util/ZipFilesTest.java | 2 +-
.../java/org/apache/beam/sdk/values/RowTest.java | 5 ++--
.../sdk/io/gcp/bigquery/BigQueryIOWriteTest.java | 2 +-
.../sdk/io/gcp/bigtable/BigtableConfigTest.java | 4 +--
.../beam/sdk/io/gcp/bigtable/BigtableIOTest.java | 3 +-
.../io/hadoop/format/HadoopFormatIOReadTest.java | 14 ++++++----
15 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java
index 9214ecf..c84eba8 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java
@@ -28,6 +28,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
@@ -765,7 +766,7 @@ public class DataflowRunnerTest implements Serializable {
DataflowPipelineOptions options = buildPipelineOptions();
options.setFilesToStage(null);
DataflowRunner.fromOptions(options);
- assertTrue(!options.getFilesToStage().isEmpty());
+ assertFalse(options.getFilesToStage().isEmpty());
}
@Test
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/StructsTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/StructsTest.java
index 8c88a43..91804ab 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/StructsTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/StructsTest.java
@@ -126,8 +126,8 @@ public class StructsTest {
public void testGetBooleanParameter() throws Exception {
Map<String, Object> o = makeCloudDictionary();
- Assert.assertEquals(true, getBoolean(o, "singletonBooleanKey", false));
- Assert.assertEquals(false, getBoolean(o, "missingKey", false));
+ Assert.assertTrue(getBoolean(o, "singletonBooleanKey", false));
+ Assert.assertFalse(getBoolean(o, "missingKey", false));
try {
getBoolean(o, "emptyKey", false);
diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/counters/CounterTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/counters/CounterTest.java
index 64b2a7a..ef825e9 100644
--- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/counters/CounterTest.java
+++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/counters/CounterTest.java
@@ -335,51 +335,51 @@ public class CounterTest {
@Test
public void testBoolAnd() {
Counter<Boolean, Boolean> c = counters.booleanAnd(name);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
c.addValue(true);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
c.addValue(false);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
c.getAndReset();
c.addValue(true).addValue(true);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
c.addValue(false);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
- assertEquals(false, c.getAndReset());
- assertEquals(true, c.getAggregate());
+ assertFalse(c.getAndReset());
+ assertTrue(c.getAggregate());
c.addValue(false);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
}
@Test
public void testBoolOr() {
Counter<Boolean, Boolean> c = counters.booleanOr(name);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
c.addValue(false);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
c.addValue(true);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
c.getAndReset();
c.addValue(false).addValue(false);
- assertEquals(false, c.getAggregate());
+ assertFalse(c.getAggregate());
c.addValue(true);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
- assertEquals(true, c.getAndReset());
- assertEquals(false, c.getAggregate());
+ assertTrue(c.getAndReset());
+ assertFalse(c.getAggregate());
c.addValue(true);
- assertEquals(true, c.getAggregate());
+ assertTrue(c.getAggregate());
}
@Test
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
index 6f350f1..06b2f9a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
@@ -19,6 +19,7 @@ package org.apache.beam.sdk.schemas;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import com.google.auto.value.AutoValue;
import java.math.BigDecimal;
@@ -219,7 +220,7 @@ public class AutoValueSchemaTest {
assertEquals((short) 2, (Object) row.getInt16("aShort"));
assertEquals((int) 3, (Object) row.getInt32("anInt"));
assertEquals((long) 4, (Object) row.getInt64("aLong"));
- assertEquals(true, (Object) row.getBoolean("aBoolean"));
+ assertTrue(row.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), row.getDateTime("dateTime"));
assertEquals(DATE.toInstant(), row.getDateTime("instant"));
assertArrayEquals(BYTE_ARRAY, row.getBytes("bytes"));
@@ -234,7 +235,7 @@ public class AutoValueSchemaTest {
assertEquals((short) 2, value.getaShort());
assertEquals((int) 3, value.getAnInt());
assertEquals((long) 4, value.getaLong());
- assertEquals(true, value.isaBoolean());
+ assertTrue(value.isaBoolean());
assertEquals(DATE, value.getDateTime());
assertEquals(DATE.toInstant(), value.getInstant());
assertArrayEquals("not equal", BYTE_ARRAY, value.getBytes());
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
index d5df895..8df5b301 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
@@ -26,6 +26,7 @@ import static org.apache.beam.sdk.schemas.utils.TestJavaBeans.SIMPLE_BEAN_SCHEMA
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.nio.charset.Charset;
@@ -123,7 +124,7 @@ public class JavaBeanSchemaTest {
assertEquals((short) 2, (Object) row.getInt16("aShort"));
assertEquals((int) 3, (Object) row.getInt32("anInt"));
assertEquals((long) 4, (Object) row.getInt64("aLong"));
- assertEquals(true, (Object) row.getBoolean("aBoolean"));
+ assertTrue(row.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), row.getDateTime("dateTime"));
assertEquals(DATE.toInstant(), row.getDateTime("instant"));
assertArrayEquals(BYTE_ARRAY, row.getBytes("bytes"));
@@ -143,7 +144,7 @@ public class JavaBeanSchemaTest {
assertEquals((short) 2, bean.getaShort());
assertEquals((int) 3, bean.getAnInt());
assertEquals((long) 4, bean.getaLong());
- assertEquals(true, bean.isaBoolean());
+ assertTrue(bean.isaBoolean());
assertEquals(DATE, bean.getDateTime());
assertEquals(DATE.toInstant(), bean.getInstant());
assertArrayEquals("not equal", BYTE_ARRAY, bean.getBytes());
@@ -177,7 +178,7 @@ public class JavaBeanSchemaTest {
assertEquals((short) 2, (Object) nestedRow.getInt16("aShort"));
assertEquals((int) 3, (Object) nestedRow.getInt32("anInt"));
assertEquals((long) 4, (Object) nestedRow.getInt64("aLong"));
- assertEquals(true, nestedRow.getBoolean("aBoolean"));
+ assertTrue(nestedRow.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), nestedRow.getDateTime("dateTime"));
assertEquals(DATE.toInstant(), nestedRow.getDateTime("instant"));
assertArrayEquals("not equal", BYTE_ARRAY, nestedRow.getBytes("bytes"));
@@ -199,7 +200,7 @@ public class JavaBeanSchemaTest {
assertEquals((short) 2, bean.getNested().getaShort());
assertEquals((int) 3, bean.getNested().getAnInt());
assertEquals((long) 4, bean.getNested().getaLong());
- assertEquals(true, bean.getNested().isaBoolean());
+ assertTrue(bean.getNested().isaBoolean());
assertEquals(DATE, bean.getNested().getDateTime());
assertEquals(DATE.toInstant(), bean.getNested().getInstant());
assertArrayEquals("not equal", BYTE_ARRAY, bean.getNested().getBytes());
@@ -367,7 +368,7 @@ public class JavaBeanSchemaTest {
assertEquals((short) 2, (Object) row.getInt16("aShort"));
assertEquals((int) 3, (Object) row.getInt32("anInt"));
assertEquals((long) 4, (Object) row.getInt64("aLong"));
- assertEquals(true, (Object) row.getBoolean("aBoolean"));
+ assertTrue(row.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), row.getDateTime("dateTime"));
assertEquals(DATE.toInstant(), row.getDateTime("instant"));
assertArrayEquals(BYTE_ARRAY, row.getBytes("bytes"));
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
index 4d3db7a..2bc4c8b 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
@@ -151,7 +152,7 @@ public class JavaFieldSchemaTest {
assertEquals((short) 2, (Object) row.getInt16("aShort"));
assertEquals((int) 3, (Object) row.getInt32("anInt"));
assertEquals((long) 4, (Object) row.getInt64("aLong"));
- assertEquals(true, row.getBoolean("aBoolean"));
+ assertTrue(row.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), row.getDateTime("dateTime"));
assertEquals(INSTANT, row.getDateTime("instant").toInstant());
assertArrayEquals(BYTE_ARRAY, row.getBytes("bytes"));
@@ -171,7 +172,7 @@ public class JavaFieldSchemaTest {
assertEquals((short) 2, pojo.aShort);
assertEquals((int) 3, pojo.anInt);
assertEquals((long) 4, pojo.aLong);
- assertEquals(true, pojo.aBoolean);
+ assertTrue(pojo.aBoolean);
assertEquals(DATE, pojo.dateTime);
assertEquals(INSTANT, pojo.instant);
assertArrayEquals("not equal", BYTE_ARRAY, pojo.bytes);
@@ -205,7 +206,7 @@ public class JavaFieldSchemaTest {
assertEquals((short) 2, (Object) nestedRow.getInt16("aShort"));
assertEquals((int) 3, (Object) nestedRow.getInt32("anInt"));
assertEquals((long) 4, (Object) nestedRow.getInt64("aLong"));
- assertEquals(true, nestedRow.getBoolean("aBoolean"));
+ assertTrue(nestedRow.getBoolean("aBoolean"));
assertEquals(DATE.toInstant(), nestedRow.getDateTime("dateTime"));
assertEquals(INSTANT, nestedRow.getDateTime("instant").toInstant());
assertArrayEquals("not equal", BYTE_ARRAY, nestedRow.getBytes("bytes"));
@@ -227,7 +228,7 @@ public class JavaFieldSchemaTest {
assertEquals((short) 2, pojo.nested.aShort);
assertEquals((int) 3, pojo.nested.anInt);
assertEquals((long) 4, pojo.nested.aLong);
- assertEquals(true, pojo.nested.aBoolean);
+ assertTrue(pojo.nested.aBoolean);
assertEquals(DATE, pojo.nested.dateTime);
assertEquals(INSTANT, pojo.nested.instant);
assertArrayEquals("not equal", BYTE_ARRAY, pojo.nested.bytes);
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
index 5467483..b551a5e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
@@ -142,7 +142,7 @@ public class JavaBeanUtilsTest {
assertEquals((short) 42, getters.get(2).get(simpleBean));
assertEquals((int) 43, getters.get(3).get(simpleBean));
assertEquals((long) 44, getters.get(4).get(simpleBean));
- assertEquals(true, getters.get(5).get(simpleBean));
+ assertTrue((Boolean) getters.get(5).get(simpleBean));
assertEquals(DateTime.parse("1979-03-14").toInstant(), getters.get(6).get(simpleBean));
assertEquals(DateTime.parse("1979-03-15").toInstant(), getters.get(7).get(simpleBean));
assertArrayEquals(
@@ -182,7 +182,7 @@ public class JavaBeanUtilsTest {
assertEquals((short) 42, simpleBean.getaShort());
assertEquals((int) 43, simpleBean.getAnInt());
assertEquals((long) 44, simpleBean.getaLong());
- assertEquals(true, simpleBean.isaBoolean());
+ assertTrue(simpleBean.isaBoolean());
assertEquals(DateTime.parse("1979-03-14"), simpleBean.getDateTime());
assertEquals(DateTime.parse("1979-03-15").toInstant(), simpleBean.getInstant());
assertArrayEquals(
@@ -211,7 +211,7 @@ public class JavaBeanUtilsTest {
assertEquals((short) 42, getters.get(1).get(bean));
assertEquals((int) 43, getters.get(2).get(bean));
assertEquals((long) 44, getters.get(3).get(bean));
- assertEquals(true, getters.get(4).get(bean));
+ assertTrue((Boolean) getters.get(4).get(bean));
}
@Test
@@ -231,7 +231,7 @@ public class JavaBeanUtilsTest {
assertEquals((short) 42, bean.getaShort().shortValue());
assertEquals((int) 43, bean.getAnInt().intValue());
assertEquals((long) 44, bean.getaLong().longValue());
- assertEquals(true, bean.getaBoolean().booleanValue());
+ assertTrue(bean.getaBoolean().booleanValue());
}
@Test
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
index 697000c..6a75e25 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
@@ -142,7 +142,7 @@ public class POJOUtilsTest {
assertEquals((short) 42, getters.get(2).get(simplePojo));
assertEquals((int) 43, getters.get(3).get(simplePojo));
assertEquals((long) 44, getters.get(4).get(simplePojo));
- assertEquals(true, getters.get(5).get(simplePojo));
+ assertTrue((Boolean) getters.get(5).get(simplePojo));
assertEquals(DATE.toInstant(), getters.get(6).get(simplePojo));
assertEquals(INSTANT, getters.get(7).get(simplePojo));
assertArrayEquals("Unexpected bytes", BYTE_ARRAY, (byte[]) getters.get(8).get(simplePojo));
@@ -177,7 +177,7 @@ public class POJOUtilsTest {
assertEquals((short) 42, simplePojo.aShort);
assertEquals((int) 43, simplePojo.anInt);
assertEquals((long) 44, simplePojo.aLong);
- assertEquals(true, simplePojo.aBoolean);
+ assertTrue(simplePojo.aBoolean);
assertEquals(DATE, simplePojo.dateTime);
assertEquals(INSTANT, simplePojo.instant);
assertArrayEquals("Unexpected bytes", BYTE_ARRAY, simplePojo.bytes);
@@ -199,7 +199,7 @@ public class POJOUtilsTest {
assertEquals((short) 42, getters.get(1).get(pojo));
assertEquals((int) 43, getters.get(2).get(pojo));
assertEquals((long) 44, getters.get(3).get(pojo));
- assertEquals(true, getters.get(4).get(pojo));
+ assertTrue((Boolean) getters.get(4).get(pojo));
}
@Test
@@ -221,7 +221,7 @@ public class POJOUtilsTest {
assertEquals((short) 42, pojo.aShort.shortValue());
assertEquals((int) 43, pojo.anInt.intValue());
assertEquals((long) 44, pojo.aLong.longValue());
- assertEquals(true, pojo.aBoolean.booleanValue());
+ assertTrue(pojo.aBoolean.booleanValue());
}
@Test
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
index 8037d28..9e0bdb0 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
@@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -511,7 +512,7 @@ public class PAssertTest implements Serializable {
new MatcherCheckerFn(SerializableMatchers.contains(11)));
String stacktrace = Throwables.getStackTraceAsString(res.assertionError());
- assertEquals(false, res.isSuccess());
+ assertFalse(res.isSuccess());
assertThat(stacktrace, containsString("PAssertionSite.capture"));
}
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ZipFilesTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ZipFilesTest.java
index 2317a1c..8a0646a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ZipFilesTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ZipFilesTest.java
@@ -194,7 +194,7 @@ public class ZipFilesTest {
assertTrue(zipDir.mkdir());
ZipFiles.zipDirectory(tmpDir, zipFile);
File invalidDirectory = new File("/foo/bar");
- assertTrue(!invalidDirectory.exists());
+ assertFalse(invalidDirectory.exists());
try {
ZipFiles.unzipFile(zipFile, invalidDirectory);
fail("We expect the IllegalArgumentException, but it never occured");
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/RowTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/RowTest.java
index 3f773c8..3d4de1e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/values/RowTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/values/RowTest.java
@@ -20,6 +20,7 @@ package org.apache.beam.sdk.values;
import static org.apache.beam.sdk.schemas.Schema.toSchema;
import static org.apache.beam.sdk.values.Row.toRow;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
@@ -143,8 +144,8 @@ public class RowTest {
assertEquals("str", row.getString(7));
assertEquals(dateTime, row.getDateTime("f_datetime"));
assertEquals(dateTime, row.getDateTime(8));
- assertEquals(false, row.getBoolean("f_boolean"));
- assertEquals(false, row.getBoolean(9));
+ assertFalse(row.getBoolean("f_boolean"));
+ assertFalse(row.getBoolean(9));
}
@Test
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java
index a2ea13b..b7abd88 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java
@@ -967,7 +967,7 @@ public class BigQueryIOWriteTest implements Serializable {
assertEquals(BigQueryIO.Write.CreateDisposition.CREATE_IF_NEEDED, write.getCreateDisposition());
assertEquals(BigQueryIO.Write.WriteDisposition.WRITE_EMPTY, write.getWriteDisposition());
assertEquals(null, write.getTableDescription());
- assertEquals(true, write.getValidate());
+ assertTrue(write.getValidate());
assertFalse(write.withoutValidation().getValidate());
TableSchema schema = new TableSchema();
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableConfigTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableConfigTest.java
index f79b907..0a3d4e4 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableConfigTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableConfigTest.java
@@ -117,7 +117,7 @@ public class BigtableConfigTest {
@Test
public void testWithValidate() {
- assertEquals(true, config.withValidate(true).getValidate());
+ assertTrue(config.withValidate(true).getValidate());
}
@Test
@@ -208,7 +208,7 @@ public class BigtableConfigTest {
assertEquals(PROJECT_ID.get(), service.getBigtableOptions().getProjectId());
assertEquals(INSTANCE_ID.get(), service.getBigtableOptions().getInstanceId());
- assertEquals(true, service.getBigtableOptions().getBulkOptions().useBulkApi());
+ assertTrue(service.getBigtableOptions().getBulkOptions().useBulkApi());
}
@Test
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
index e995e7a..0aa45a3 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java
@@ -37,6 +37,7 @@ import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import com.google.bigtable.v2.Cell;
import com.google.bigtable.v2.Column;
@@ -1287,7 +1288,7 @@ public class BigtableIOTest {
BigtableIO.Write write = BigtableIO.write().withBigtableOptions(optionsBuilder.build());
BigtableOptions options = write.getBigtableOptions();
- assertEquals(true, options.getBulkOptions().useBulkApi());
+ assertTrue(options.getBulkOptions().useBulkApi());
assertEquals(maxInflightRpcs, options.getBulkOptions().getMaxInflightRpcs());
assertEquals(initialBackoffMillis, options.getRetryOptions().getInitialBackoffMillis());
diff --git a/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOReadTest.java b/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOReadTest.java
index 7eacab6..bd53a8b 100644
--- a/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOReadTest.java
+++ b/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOReadTest.java
@@ -24,7 +24,9 @@ import static org.apache.beam.sdk.io.hadoop.format.HadoopFormatIO.SerializableSp
import static org.apache.beam.sdk.transforms.display.DisplayDataMatchers.hasDisplayItem;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.ArrayList;
@@ -499,7 +501,7 @@ public class HadoopFormatIOReadTest {
new SerializableSplit(mockInputSplit));
boundedSource.setInputFormatObj(mockInputFormat);
BoundedReader<KV<Text, Employee>> reader = boundedSource.createReader(p.getOptions());
- assertEquals(false, reader.start());
+ assertFalse(reader.start());
assertEquals(Double.valueOf(1), reader.getFractionConsumed());
reader.close();
}
@@ -532,7 +534,7 @@ public class HadoopFormatIOReadTest {
// When start is not called, getFractionConsumed() should return 0.
assertEquals(Double.valueOf(0), reader.getFractionConsumed());
boolean start = reader.start();
- assertEquals(true, start);
+ assertTrue(start);
if (start) {
elements.add(reader.getCurrent());
boolean advance = reader.advance();
@@ -541,7 +543,7 @@ public class HadoopFormatIOReadTest {
assertEquals(
Double.valueOf(++recordsRead / TestEmployeeDataSet.NUMBER_OF_RECORDS_IN_EACH_SPLIT),
reader.getFractionConsumed());
- assertEquals(true, advance);
+ assertTrue(advance);
while (advance) {
elements.add(reader.getCurrent());
advance = reader.advance();
@@ -586,11 +588,11 @@ public class HadoopFormatIOReadTest {
BoundedReader<KV<Text, Employee>> reader = boundedSource.createReader(p.getOptions());
assertEquals(Double.valueOf(0), reader.getFractionConsumed());
boolean start = reader.start();
- assertEquals(true, start);
+ assertTrue(start);
if (start) {
boolean advance = reader.advance();
assertEquals(null, reader.getFractionConsumed());
- assertEquals(true, advance);
+ assertTrue(advance);
if (advance) {
advance = reader.advance();
assertEquals(null, reader.getFractionConsumed());
@@ -782,7 +784,7 @@ public class HadoopFormatIOReadTest {
hifSource.createInputFormatInstance();
ConfigurableEmployeeInputFormat inputFormatObj =
(ConfigurableEmployeeInputFormat) hifSource.getInputFormat();
- assertEquals(true, inputFormatObj.isConfSet);
+ assertTrue(inputFormatObj.isConfSet);
}
}