Fix null or empty check in TestDataflowRunner
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/73449146 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/73449146 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/73449146 Branch: refs/heads/master Commit: 7344914638953a78251d021f4001e404e8c1aff1 Parents: e5b2f13 Author: Kenneth Knowles <k...@google.com> Authored: Wed Nov 9 13:39:57 2016 -0800 Committer: Kenneth Knowles <k...@google.com> Committed: Thu Nov 10 10:49:28 2016 -0800 ---------------------------------------------------------------------- .../beam/runners/dataflow/testing/TestDataflowRunner.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/73449146/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java index 0f141d2..9dacfd3 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java @@ -25,6 +25,7 @@ import com.google.api.services.dataflow.model.MetricUpdate; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Optional; +import com.google.common.base.Strings; import com.google.common.base.Throwables; import java.io.IOException; import java.math.BigDecimal; @@ -149,9 +150,10 @@ public class TestDataflowRunner extends PipelineRunner<DataflowPipelineJob> { throw new IllegalStateException( "The dataflow did not output a success or failure metric."); } else if (!success.get()) { - throw new AssertionError(messageHandler.getErrorMessage() == null - ? "The dataflow did not return a failure reason." - : messageHandler.getErrorMessage()); + throw new AssertionError( + Strings.isNullOrEmpty(messageHandler.getErrorMessage()) + ? "The dataflow did not return a failure reason." + : messageHandler.getErrorMessage()); } else { assertThat(job, testPipelineOptions.getOnSuccessMatcher()); }
