Skip to content

#1308 Switch to JUnit Jupiter and do not use Toolchains for the integration tests #2013

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
filiphr merged 2 commits into from
Feb 3, 2020
Merged

#1308 Switch to JUnit Jupiter and do not use Toolchains for the integration tests #2013

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
2f8bcf4
#1308 Switch to JUnit Jupiter and do not use Toolchains for the integ…
filiphr Feb 1, 2020
49413d4
Remove toolchains and not needed mapstruct artifact id property
filiphr Feb 2, 2020
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
14 changes: 4 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
install: true
script: mvn clean install -DprocessorIntegrationTest.toolchainsFile=etc/toolchains-travis-jenkins.xml -B -V
script: mvn clean install -B -V

matrix:
include:
Expand All @@ -9,20 +9,14 @@ matrix:
- mvn jacoco:report && bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
dist: trusty
- jdk: openjdk11
# Only run the processor and its dependencies
# The integration tests are using the maven toolchain and that is not yet ready for Java 11
# There is an issue with the documentation so skip it
script: mvn -B -V clean install -pl processor -am
script: mvn -B -V clean install -DskipDistribution=true
- jdk: openjdk13
# Only run the processor and its dependencies
# The integration tests are using the maven toolchain and that is not yet ready for Java 11
# There is an issue with the documentation so skip it
script: mvn -B -V clean install -pl processor -am
# Only run the processor and its dependencies
# The integration tests are using the maven toolchain and that is not yet ready for Java EA
script: mvn -B -V clean install -DskipDistribution=true
# There is an issue with the documentation so skip it
- jdk: openjdk-ea
script: mvn -B -V clean install -pl processor -am
script: mvn -B -V clean install -DskipDistribution=true
allow_failures:
- jdk: openjdk-ea
deploy:
Expand Down
14 changes: 0 additions & 14 deletions etc/toolchains-cloudbees-jenkins.xml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions etc/toolchains-example.xml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions etc/toolchains-travis-jenkins.xml
View file
Open in desktop

This file was deleted.

16 changes: 11 additions & 5 deletions integrationtest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@

<dependencies>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down Expand Up @@ -73,6 +68,17 @@
<version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
19 changes: 0 additions & 19 deletions integrationtest/src/test/java/org/mapstruct/itest/tests/AutoValueBuilderTest.java
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions integrationtest/src/test/java/org/mapstruct/itest/tests/CdiTest.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions integrationtest/src/test/java/org/mapstruct/itest/tests/ExternalBeanJarTest.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions integrationtest/src/test/java/org/mapstruct/itest/tests/FreeBuilderBuilderTest.java
View file
Open in desktop

This file was deleted.

45 changes: 45 additions & 0 deletions ...t/src/test/java/org/mapstruct/itest/tests/FullFeatureCompilationExclusionCliEnhancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.itest.tests;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import org.junit.jupiter.api.condition.JRE;
import org.mapstruct.itest.testutil.extension.ProcessorTest;

/**
* Adds explicit exclusions of test mappers that are known or expected to not work with specific compilers.
*
* @author Andreas Gudian

@sjaakd sjaakd Feb 1, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is this really the author?

@filiphr filiphr Feb 2, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes this was within the FullFeatureTest and was written by Andreas

*/
public final class FullFeatureCompilationExclusionCliEnhancer implements ProcessorTest.CommandLineEnhancer {
@Override
public Collection<String> getAdditionalCommandLineArguments(ProcessorTest.ProcessorType processorType,
JRE currentJreVersion) {
List<String> additionalExcludes = new ArrayList<>();

// SPI not working correctly here.. (not picked up)

@sjaakd sjaakd Feb 2, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

should we fix this in a later phase? Make an issue? I guess we rely heavily on SPI.. I guess somewhere the META_INF is not on the classpath.

@filiphr filiphr Feb 2, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This comes from earlier, I didn't write a single new line in this class. Just pulled it outside of the deleted FullFeatureTest. I actually have a better idea now with Jupiter instead of doing what we are doing here.

additionalExcludes.add( "org/mapstruct/ap/test/bugs/_1596/*.java" );
additionalExcludes.add( "org/mapstruct/ap/test/bugs/_1801/*.java" );

switch ( currentJreVersion ) {
case JAVA_9:
// TODO find out why this fails:

@sjaakd sjaakd Feb 2, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

did you investigate this?

@filiphr filiphr Feb 2, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Nope, this is an old TODO :), so I left it

additionalExcludes.add( "org/mapstruct/ap/test/collection/wildcard/BeanMapper.java" );
break;
default:
}

Collection<String> result = new ArrayList<String>( additionalExcludes.size() );
for ( int i = 0; i < additionalExcludes.size(); i++ ) {
result.add( "-DadditionalExclude" + i + "=" + additionalExcludes.get( i ) );
}

return result;
}
}
72 changes: 0 additions & 72 deletions integrationtest/src/test/java/org/mapstruct/itest/tests/FullFeatureCompilationTest.java
View file
Open in desktop

This file was deleted.

Loading