[
https://issues.apache.org/jira/browse/BEAM-6299?focusedWorklogId=178246&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-178246
]
ASF GitHub Bot logged work on BEAM-6299:
----------------------------------------
Author: ASF GitHub Bot
Created on: 22/Dec/18 13:07
Start Date: 22/Dec/18 13:07
Worklog Time Spent: 10m
Work Description: reuvenlax closed pull request #7344: [BEAM-6299] Update
JUnit to fix bug with parameterized tests
URL: https://github.com/apache/beam/pull/7344
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 6a0a4d2f0d9f..c5026756f3d3 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -420,7 +420,7 @@ class BeamModulePlugin implements Plugin<Project> {
jackson_module_scala :
"com.fasterxml.jackson.module:jackson-module-scala_2.11:$jackson_version",
jaxb_api :
"javax.xml.bind:jaxb-api:$jaxb_api_version",
joda_time :
"joda-time:joda-time:2.4",
- junit : "junit:junit:4.12",
+ junit :
"junit:junit:4.13-beta-1",
kafka_2_11 :
"org.apache.kafka:kafka_2.11:$kafka_version",
kafka_clients :
"org.apache.kafka:kafka-clients:$kafka_version",
malhar_library :
"org.apache.apex:malhar-library:$apex_malhar_version",
diff --git
a/sdks/java/extensions/euphoria/src/test/java/org/apache/beam/sdk/extensions/euphoria/core/translate/BeamMetricsTranslationTest.java
b/sdks/java/extensions/euphoria/src/test/java/org/apache/beam/sdk/extensions/euphoria/core/translate/BeamMetricsTranslationTest.java
index 1bc7186ab6bf..8edf3498cab9 100644
---
a/sdks/java/extensions/euphoria/src/test/java/org/apache/beam/sdk/extensions/euphoria/core/translate/BeamMetricsTranslationTest.java
+++
b/sdks/java/extensions/euphoria/src/test/java/org/apache/beam/sdk/extensions/euphoria/core/translate/BeamMetricsTranslationTest.java
@@ -18,7 +18,6 @@
package org.apache.beam.sdk.extensions.euphoria.core.translate;
import static org.apache.beam.sdk.metrics.MetricResultsMatchers.metricsResult;
-import static org.junit.Assert.assertThat;
import java.util.stream.Stream;
import org.apache.beam.sdk.PipelineResult;
@@ -36,6 +35,7 @@
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TypeDescriptors;
+import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
@@ -134,11 +134,11 @@ public void testBeamMetricsTranslation() {
}
private void testStep1Metrics(MetricQueryResults metrics, String
counterName1, String stepName1) {
- assertThat(
+ MatcherAssert.assertThat(
metrics.getCounters(),
Matchers.hasItem(metricsResult(stepName1, counterName1, stepName1, 5L,
true)));
- assertThat(
+ MatcherAssert.assertThat(
metrics.getDistributions(),
Matchers.hasItem(
metricsResult(
@@ -146,11 +146,11 @@ private void testStep1Metrics(MetricQueryResults metrics,
String counterName1, S
}
private void testStep2Metrics(MetricQueryResults metrics, String
counterName2, String stepName2) {
- assertThat(
+ MatcherAssert.assertThat(
metrics.getCounters(),
Matchers.hasItem(metricsResult(stepName2, counterName2, stepName2, 2L,
true)));
- assertThat(
+ MatcherAssert.assertThat(
metrics.getDistributions(),
Matchers.hasItem(
metricsResult(
@@ -159,11 +159,11 @@ private void testStep2Metrics(MetricQueryResults metrics,
String counterName2, S
private void testStep3WithDefaultOperatorName(
MetricQueryResults metrics, String counterName2, String stepName3) {
- assertThat(
+ MatcherAssert.assertThat(
metrics.getCounters(),
Matchers.hasItem(metricsResult(stepName3, counterName2, stepName3, 6L,
true)));
- assertThat(
+ MatcherAssert.assertThat(
metrics.getDistributions(),
Matchers.hasItem(
metricsResult(
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 178246)
Time Spent: 20m (was: 10m)
> Update JUnit to fix incompatibility between parameterized tests and include
> categories
> --------------------------------------------------------------------------------------
>
> Key: BEAM-6299
> URL: https://issues.apache.org/jira/browse/BEAM-6299
> Project: Beam
> Issue Type: Bug
> Components: testing
> Reporter: Reuven Lax
> Assignee: Reuven Lax
> Priority: Major
> Time Spent: 20m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
