Skip to content

AVRO-3628: [Java] JUnit 4.x tests are not executed #1863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanSkraba merged 2 commits into from
Sep 14, 2022
Merged

AVRO-3628: [Java] JUnit 4.x tests are not executed #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d793071
AVRO-3628: [Java] JUnit 4.x tests are not executed
martin-g Sep 13, 2022
65c3ac3
AVRO-3628: Migrate avro-service-archetype tests to JUnit 5.x
martin-g Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<properties>
<avro.version>${project.version}</avro.version>
<jackson-bom.version>${jackson-bom.version}</jackson-bom.version>
<junit.version>${junit.version}</junit.version>
<junit5.version>${junit5.version}</junit5.version>
<logback.version>1.2.3</logback.version>
<slf4j.version>${slf4j.version}</slf4j.version>
</properties>
Expand Down Expand Up @@ -79,9 +79,9 @@
<version>\${logback.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>\${junit.version}</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>\${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
18 changes: 9 additions & 9 deletions ...rces/archetype-resources/src/test/java/integration/SimpleOrderServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@

package ${package}.integration;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;

import ${package}.transport.SimpleOrderServiceEndpoint;
import ${package}.transport.SimpleOrderServiceClient;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import ${package}.service.Confirmation;
import ${package}.service.Item;
Expand All @@ -42,13 +42,13 @@
* <code>SimpleOrderServiceIntegrationTest</code> runs as part of the Integration phase of the build and is
* meant for end to end service testing.
*/
public class SimpleOrderServiceIntegrationTest {
class SimpleOrderServiceIntegrationTest {

private static SimpleOrderServiceEndpoint service;
private static SimpleOrderServiceClient client;

@Test
public void simpleRoundTripTest() throws Exception {
void simpleRoundTripTest() throws Exception {
Order simpleOrder = createOrder();
Confirmation c = client.submitOrder(simpleOrder);

Expand All @@ -57,7 +57,7 @@ public void simpleRoundTripTest() throws Exception {
assertTrue(c.getEstimatedCompletion() > 0);
}

@BeforeClass
@BeforeAll
public static void setupTransport() throws Exception {
InetSocketAddress endpointAddress = new InetSocketAddress("0.0.0.0", 12345);
service = new SimpleOrderServiceEndpoint(endpointAddress);
Expand All @@ -67,7 +67,7 @@ public static void setupTransport() throws Exception {
client.start();
}

@AfterClass
@AfterAll
public static void shutdownTransport() throws Exception {
client.stop();
service.stop();
Expand Down
3 changes: 2 additions & 1 deletion lang/java/maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../</relativePath>
Copy link
Contributor

@RyanSkraba RyanSkraba Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for info, is this a best practice?

Copy link
Member Author

@martin-g martin-g Sep 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least Intellij IDEA suggests so. It shows ../ as a warning.
I'm OK to revert it.

<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>avro-maven-plugin</artifactId>
Expand Down Expand Up @@ -60,6 +60,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven-core.version}</version>
<scope>provided</scope>
Copy link
Member Author

@martin-g martin-g Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the following Maven error:

[INFO] --- maven-plugin-plugin:3.6.4:helpmojo (generated-helpmojo) @ avro-maven-plugin ---
[ERROR] 

Some dependencies of Maven Plugins are expected to be in provided scope.
Please make sure that dependencies listed below declared in POM
have set '<scope>provided</scope>' as well.

The following dependencies are in wrong scope:
 * org.apache.maven:maven-core:jar:3.3.9:compile
 * org.apache.maven:maven-model:jar:3.3.9:compile
 * org.apache.maven:maven-settings:jar:3.3.9:compile
 * org.apache.maven:maven-settings-builder:jar:3.3.9:compile
 * org.apache.maven:maven-builder-support:jar:3.3.9:compile
 * org.apache.maven:maven-repository-metadata:jar:3.3.9:compile
 * org.apache.maven:maven-artifact:jar:3.3.9:compile
 * org.apache.maven:maven-plugin-api:jar:3.3.9:compile
 * org.apache.maven:maven-model-builder:jar:3.3.9:compile
 * org.apache.maven:maven-aether-provider:jar:3.3.9:compile

<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
Copy link
Member Author

@martin-g martin-g Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems something is wrong with the release process. Several pom.xml files were still pointing to the old 1.11.0-SNAPSHOT parent.

Copy link
Contributor

@RyanSkraba RyanSkraba Sep 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, this should have been done in https://cwiki.apache.org/confluence/display/AVRO/How+To+Release#HowToRelease-Branching (Step 2c)!

<relativePath>../../../../../../../../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>avro-parent</artifactId>
<groupId>org.apache.avro</groupId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../../../../../../../../../pom.xml</relativePath>
</parent>

Expand Down
10 changes: 5 additions & 5 deletions lang/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<servlet-api.version>4.0.1</servlet-api.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<jopt-simple.version>5.0.4</jopt-simple.version>
<junit.version>4.13.2</junit.version>
<junit5.version>5.9.0</junit5.version>
<netty.version>4.1.81.Final</netty.version>
<protobuf.version>3.21.5</protobuf.version>
Expand Down Expand Up @@ -157,13 +156,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<configuration>
<includes>
<!-- Avro naming convention for JUnit tests -->
<include>**/Test**</include>
</includes>
<excludes>
<!-- A few innner classes are not to be tested -->
<!-- A few inner classes are not to be tested -->
<exclude>**/*$*</exclude>
<!-- exclude the generated classes under apache.avro.test, some of
these match **/Test** and are not JUnit tests -->
Expand Down Expand Up @@ -592,9 +592,9 @@
will inherit these dependencies directly, and can opt out if necessary with <excludes> -->
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down