You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2022/07/12 23:57:26 UTC
[GitHub] [flink] RyanSkraba opened a new pull request, #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
RyanSkraba opened a new pull request, #20258:
URL: https://github.com/apache/flink/pull/20258
<!--
*Thank you very much for contributing to Apache Flink - we are happy that you want to help us improve Flink. To help the community review your contribution in the best possible way, please go through the checklist below, which will get the contribution into a shape in which it can be best reviewed.*
*Please understand that we do not do this to make contributions to Flink a hassle. In order to uphold a high standard of quality for code contributions, while at the same time managing a large number of contributions, we need contributors to prepare the contributions well, and give reviewers enough contextual information for the review. Please also understand that contributions that do not follow this guide will take longer to review and thus typically be picked up with lower priority by the community.*
## Contribution Checklist
- Make sure that the pull request corresponds to a [JIRA issue](https://issues.apache.org/jira/projects/FLINK/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no JIRA issue.
- Name the pull request in the form "[FLINK-XXXX] [component] Title of the pull request", where *FLINK-XXXX* should be replaced by the actual issue number. Skip *component* if you are unsure about which is the best component.
Typo fixes that have no associated JIRA issue should be named following this pattern: `[hotfix] [docs] Fix typo in event time introduction` or `[hotfix] [javadocs] Expand JavaDoc for PuncuatedWatermarkGenerator`.
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Azure Pipelines CI to do that following [this guide](https://cwiki.apache.org/confluence/display/FLINK/Azure+Pipelines#AzurePipelines-Tutorial:SettingupAzurePipelinesforaforkoftheFlinkrepository).
- Each pull request should address only one issue, not mix up code from multiple issues.
- Each commit in the pull request has a meaningful commit message (including the JIRA id)
- Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below.
**(The sections below can be removed for hotfixes of typos)**
-->
## What is the purpose of the change
Update the `flink-formats/flink-sequence-file` module to AssertJ and JUnit 5 following the [JUnit 5 Migration Guide](https://docs.google.com/document/d/1514Wa_aNB9bJUen4xm5uiuXOooOJTtXqS_Jqk9KJitU/edit)
## Brief change log
* Removed dependences on JUnit 4, JUnit 5 Assertions and Hamcrest where possible.
## Verifying this change
This change is a code cleanup without any test coverage.
I verified that there were 4 tests run before and after the change.
## Does this pull request potentially affect one of the following parts:
- Dependencies (does it add or upgrade a dependency): no
- The public API, i.e., is any changed class annotated with `@Public(Evolving)`: no
- The serializers: no
- The runtime per-record code paths (performance sensitive):no
- Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn, ZooKeeper: no
- The S3 file system connector: no
## Documentation
- Does this pull request introduce a new feature? no
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] flinkbot commented on pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
flinkbot commented on PR #20258:
URL: https://github.com/apache/flink/pull/20258#issuecomment-1182611408
<!--
Meta data
{
"version" : 1,
"metaDataEntries" : [ {
"hash" : "455af0ef4247c0f4fc6751c16fc483750ad703de",
"status" : "UNKNOWN",
"url" : "TBD",
"triggerID" : "455af0ef4247c0f4fc6751c16fc483750ad703de",
"triggerType" : "PUSH"
} ]
}-->
## CI report:
* 455af0ef4247c0f4fc6751c16fc483750ad703de UNKNOWN
<details>
<summary>Bot commands</summary>
The @flinkbot bot supports the following commands:
- `@flinkbot run azure` re-run the last Azure build
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] RyanSkraba commented on a diff in pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
RyanSkraba commented on code in PR #20258:
URL: https://github.com/apache/flink/pull/20258#discussion_r1001994132
##########
flink-formats/flink-sequence-file/src/test/java/org/apache/flink/formats/sequencefile/SerializableHadoopConfigurationTest.java:
##########
@@ -19,70 +19,51 @@
package org.apache.flink.formats.sequencefile;
import org.apache.hadoop.conf.Configuration;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.HamcrestCondition.matching;
-
/** Tests for the {@link SerializableHadoopConfiguration}. */
-public class SerializableHadoopConfigurationTest {
+class SerializableHadoopConfigurationTest {
private static final String TEST_KEY = "test-key";
private static final String TEST_VALUE = "test-value";
private Configuration configuration;
- @Before
- public void createConfigWithCustomProperty() {
+ @BeforeEach
+ void createConfigWithCustomProperty() {
this.configuration = new Configuration();
configuration.set(TEST_KEY, TEST_VALUE);
}
@Test
- public void customPropertiesSurviveSerializationDeserialization()
+ void customPropertiesSurviveSerializationDeserialization()
throws IOException, ClassNotFoundException {
final SerializableHadoopConfiguration serializableConfigUnderTest =
new SerializableHadoopConfiguration(configuration);
final byte[] serializedConfigUnderTest = serializeAndGetBytes(serializableConfigUnderTest);
final SerializableHadoopConfiguration deserializableConfigUnderTest =
deserializeAndGetConfiguration(serializedConfigUnderTest);
- assertThat(deserializableConfigUnderTest.get())
- .satisfies(matching(hasTheSamePropertiesAs(configuration)));
- }
-
- // ---------------------------------------- Matchers ---------------------------------------- //
-
- private static TypeSafeMatcher<Configuration> hasTheSamePropertiesAs(
- final Configuration expectedConfig) {
- return new TypeSafeMatcher<Configuration>() {
- @Override
- protected boolean matchesSafely(Configuration actualConfig) {
- final String value = actualConfig.get(TEST_KEY);
- return actualConfig != expectedConfig
- && value != null
- && expectedConfig.get(TEST_KEY).equals(value);
- }
-
- @Override
- public void describeTo(Description description) {
- description
- .appendText("a Hadoop Configuration with property: key=")
- .appendValue(TEST_KEY)
- .appendText(" and value=")
- .appendValue(TEST_VALUE);
- }
- };
+ Assertions.<Configuration>assertThat(deserializableConfigUnderTest.get())
+ .matches(
+ actualConfig -> {
+ final String value = actualConfig.get(TEST_KEY);
+ return actualConfig != configuration
Review Comment:
This needed to be rewritten in order to compile. I squashed it into the single commit.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] RyanSkraba commented on a diff in pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
RyanSkraba commented on code in PR #20258:
URL: https://github.com/apache/flink/pull/20258#discussion_r1004723756
##########
flink-formats/flink-sequence-file/src/test/java/org/apache/flink/formats/sequencefile/SerializableHadoopConfigurationTest.java:
##########
@@ -19,70 +19,54 @@
package org.apache.flink.formats.sequencefile;
import org.apache.hadoop.conf.Configuration;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.HamcrestCondition.matching;
-
/** Tests for the {@link SerializableHadoopConfiguration}. */
-public class SerializableHadoopConfigurationTest {
+class SerializableHadoopConfigurationTest {
private static final String TEST_KEY = "test-key";
private static final String TEST_VALUE = "test-value";
private Configuration configuration;
- @Before
- public void createConfigWithCustomProperty() {
+ @BeforeEach
+ void createConfigWithCustomProperty() {
this.configuration = new Configuration();
configuration.set(TEST_KEY, TEST_VALUE);
}
@Test
- public void customPropertiesSurviveSerializationDeserialization()
+ void customPropertiesSurviveSerializationDeserialization()
throws IOException, ClassNotFoundException {
final SerializableHadoopConfiguration serializableConfigUnderTest =
new SerializableHadoopConfiguration(configuration);
final byte[] serializedConfigUnderTest = serializeAndGetBytes(serializableConfigUnderTest);
final SerializableHadoopConfiguration deserializableConfigUnderTest =
deserializeAndGetConfiguration(serializedConfigUnderTest);
- assertThat(deserializableConfigUnderTest.get())
- .satisfies(matching(hasTheSamePropertiesAs(configuration)));
- }
-
- // ---------------------------------------- Matchers ---------------------------------------- //
-
- private static TypeSafeMatcher<Configuration> hasTheSamePropertiesAs(
- final Configuration expectedConfig) {
- return new TypeSafeMatcher<Configuration>() {
- @Override
- protected boolean matchesSafely(Configuration actualConfig) {
- final String value = actualConfig.get(TEST_KEY);
- return actualConfig != expectedConfig
- && value != null
- && expectedConfig.get(TEST_KEY).equals(value);
- }
-
- @Override
- public void describeTo(Description description) {
- description
- .appendText("a Hadoop Configuration with property: key=")
- .appendValue(TEST_KEY)
- .appendText(" and value=")
- .appendValue(TEST_VALUE);
- }
- };
+ Assertions.<Configuration>assertThat(deserializableConfigUnderTest.get())
+ .matches(
+ actualConfig -> {
+ final String value = actualConfig.get(TEST_KEY);
+ return actualConfig != serializableConfigUnderTest.get()
+ && value != null
+ && serializableConfigUnderTest
+ .get()
+ .get(TEST_KEY)
+ .equals(value);
+ })
+ .describedAs(
Review Comment:
Yes, it seems that the `describedAs` needs to come before any asserts!
In this case, I changed the logic quite a bit from the original to improve the descriptive error messages. The new logic would print the error message:
```
[ERROR] Failures:
[ERROR] SerializableHadoopConfigurationTest.customPropertiesSurviveSerializationDeserialization:60
[a Hadoop Configuration with property: key=test-key and value=test-value] (1 failure)
-- failure 1 --
expected: "test-value"
but was: "faked-for-error-message"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp commented on a diff in pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp commented on code in PR #20258:
URL: https://github.com/apache/flink/pull/20258#discussion_r989176628
##########
flink-formats/flink-sequence-file/src/test/java/org/apache/flink/formats/sequencefile/SequenceStreamingFileSinkITCase.java:
##########
@@ -50,18 +51,17 @@
* Integration test case for writing bulk encoded files with the {@link StreamingFileSink} with
* SequenceFile.
*/
-public class SequenceStreamingFileSinkITCase extends AbstractTestBase {
+@ExtendWith(MiniClusterExtension.class)
+@Timeout(20)
Review Comment:
There was a community discussion on trying to avoid timeouts (see [discussion thread](https://lists.apache.org/thread/q11t0y3qsw07lkb811037h4mvx0r7ncn) and [corresponding Flink coding guidelines](https://flink.apache.org/contributing/code-style-and-quality-common.html#avoid-timeouts-in-junit-tests)).
The decision was only made on unit tests but I don't see why the same wouldn't also apply for integration tests. WDYT?
##########
flink-formats/flink-sequence-file/src/test/java/org/apache/flink/formats/sequencefile/SerializableHadoopConfigurationTest.java:
##########
@@ -19,70 +19,51 @@
package org.apache.flink.formats.sequencefile;
import org.apache.hadoop.conf.Configuration;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.HamcrestCondition.matching;
-
/** Tests for the {@link SerializableHadoopConfiguration}. */
-public class SerializableHadoopConfigurationTest {
+class SerializableHadoopConfigurationTest {
private static final String TEST_KEY = "test-key";
private static final String TEST_VALUE = "test-value";
private Configuration configuration;
- @Before
- public void createConfigWithCustomProperty() {
+ @BeforeEach
+ void createConfigWithCustomProperty() {
this.configuration = new Configuration();
configuration.set(TEST_KEY, TEST_VALUE);
}
@Test
- public void customPropertiesSurviveSerializationDeserialization()
+ void customPropertiesSurviveSerializationDeserialization()
throws IOException, ClassNotFoundException {
final SerializableHadoopConfiguration serializableConfigUnderTest =
new SerializableHadoopConfiguration(configuration);
final byte[] serializedConfigUnderTest = serializeAndGetBytes(serializableConfigUnderTest);
final SerializableHadoopConfiguration deserializableConfigUnderTest =
deserializeAndGetConfiguration(serializedConfigUnderTest);
- assertThat(deserializableConfigUnderTest.get())
- .satisfies(matching(hasTheSamePropertiesAs(configuration)));
- }
-
- // ---------------------------------------- Matchers ---------------------------------------- //
-
- private static TypeSafeMatcher<Configuration> hasTheSamePropertiesAs(
- final Configuration expectedConfig) {
- return new TypeSafeMatcher<Configuration>() {
- @Override
- protected boolean matchesSafely(Configuration actualConfig) {
- final String value = actualConfig.get(TEST_KEY);
- return actualConfig != expectedConfig
- && value != null
- && expectedConfig.get(TEST_KEY).equals(value);
- }
-
- @Override
- public void describeTo(Description description) {
- description
- .appendText("a Hadoop Configuration with property: key=")
- .appendValue(TEST_KEY)
- .appendText(" and value=")
- .appendValue(TEST_VALUE);
- }
- };
+ Assertions.<Configuration>assertThat(deserializableConfigUnderTest.get())
+ .matches(
+ actualConfig -> {
+ final String value = actualConfig.get(TEST_KEY);
+ return actualConfig != configuration
Review Comment:
```suggestion
return actualConfig != serializableConfigUnderTest
```
nit: I'd prefer keeping it in the test method's context as much as possible.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp commented on pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp commented on PR #20258:
URL: https://github.com/apache/flink/pull/20258#issuecomment-1303112725
I accidentally cancelled the squash-merge but the corresponding commit 276bb778c7ea4555370c6155af5128ea7f7cbe6c ended up on `master` as planned. Therefore, I'm manually closing this PR. The PR is considered `MERGED`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] RyanSkraba commented on pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
RyanSkraba commented on PR #20258:
URL: https://github.com/apache/flink/pull/20258#issuecomment-1183431266
@flinkbot run azure
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp commented on pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp commented on PR #20258:
URL: https://github.com/apache/flink/pull/20258#issuecomment-1290231651
`KafkaShuffleExactlyOnceITCase` failed due to FLINK-24119. I added the pipeline run to the ticket already. I'm going to investigate the `PulsarSourceUnorderedE2ECase` test failure (see [build failure](https://dev.azure.com/apache-flink/apache-flink/_build/results?buildId=42325&view=logs&j=af184cdd-c6d8-5084-0b69-7e9c67b35f7a&t=160c9ae5-96fd-516e-1c91-deb81f59292a&l=14720))
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp closed pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp closed pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
URL: https://github.com/apache/flink/pull/20258
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp commented on a diff in pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp commented on code in PR #20258:
URL: https://github.com/apache/flink/pull/20258#discussion_r1004201984
##########
flink-formats/flink-sequence-file/src/test/java/org/apache/flink/formats/sequencefile/SerializableHadoopConfigurationTest.java:
##########
@@ -19,70 +19,54 @@
package org.apache.flink.formats.sequencefile;
import org.apache.hadoop.conf.Configuration;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.HamcrestCondition.matching;
-
/** Tests for the {@link SerializableHadoopConfiguration}. */
-public class SerializableHadoopConfigurationTest {
+class SerializableHadoopConfigurationTest {
private static final String TEST_KEY = "test-key";
private static final String TEST_VALUE = "test-value";
private Configuration configuration;
- @Before
- public void createConfigWithCustomProperty() {
+ @BeforeEach
+ void createConfigWithCustomProperty() {
this.configuration = new Configuration();
configuration.set(TEST_KEY, TEST_VALUE);
}
@Test
- public void customPropertiesSurviveSerializationDeserialization()
+ void customPropertiesSurviveSerializationDeserialization()
throws IOException, ClassNotFoundException {
final SerializableHadoopConfiguration serializableConfigUnderTest =
new SerializableHadoopConfiguration(configuration);
final byte[] serializedConfigUnderTest = serializeAndGetBytes(serializableConfigUnderTest);
final SerializableHadoopConfiguration deserializableConfigUnderTest =
deserializeAndGetConfiguration(serializedConfigUnderTest);
- assertThat(deserializableConfigUnderTest.get())
- .satisfies(matching(hasTheSamePropertiesAs(configuration)));
- }
-
- // ---------------------------------------- Matchers ---------------------------------------- //
-
- private static TypeSafeMatcher<Configuration> hasTheSamePropertiesAs(
- final Configuration expectedConfig) {
- return new TypeSafeMatcher<Configuration>() {
- @Override
- protected boolean matchesSafely(Configuration actualConfig) {
- final String value = actualConfig.get(TEST_KEY);
- return actualConfig != expectedConfig
- && value != null
- && expectedConfig.get(TEST_KEY).equals(value);
- }
-
- @Override
- public void describeTo(Description description) {
- description
- .appendText("a Hadoop Configuration with property: key=")
- .appendValue(TEST_KEY)
- .appendText(" and value=")
- .appendValue(TEST_VALUE);
- }
- };
+ Assertions.<Configuration>assertThat(deserializableConfigUnderTest.get())
+ .matches(
+ actualConfig -> {
+ final String value = actualConfig.get(TEST_KEY);
+ return actualConfig != serializableConfigUnderTest.get()
+ && value != null
+ && serializableConfigUnderTest
+ .get()
+ .get(TEST_KEY)
+ .equals(value);
+ })
+ .describedAs(
Review Comment:
It doesn't look like it does what it suppose to do. You can double check by making the test fail. The descriptive error message is not printed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [flink] XComp commented on pull request #20258: [FLINK-28522][tests][JUnit5 migration] flink-sequence-file
Posted by GitBox <gi...@apache.org>.
XComp commented on PR #20258:
URL: https://github.com/apache/flink/pull/20258#issuecomment-1290447507
I created FLINK-29755 to cover the `PulsarSourceUnorderedE2ECase.testSavepoint` test failure in the [failed build](https://dev.azure.com/apache-flink/apache-flink/_build/results?buildId=42325&view=logs&j=af184cdd-c6d8-5084-0b69-7e9c67b35f7a&t=160c9ae5-96fd-516e-1c91-deb81f59292a&l=14380)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@flink.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org