Skip to content

switch from javax to jakarta namespace #11

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

switch from javax to jakarta namespace #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,11 @@ hs_err_pid*
.idea/
*.iml

# Eclipse
.settings/
.classpath
.project
.factorypath

# Maven
target/
10 changes: 5 additions & 5 deletions ...ension/src/test/java/name/falgout/jeffrey/testing/junit/disable/TestDisablerMetaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package name.falgout.jeffrey.testing.junit.disable;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;

import java.util.Arrays;
import name.falgout.jeffrey.testing.junit.testing.ExtensionTester;
import name.falgout.jeffrey.testing.junit.testing.TestPlanExecutionReport;
import name.falgout.jeffrey.testing.junit.testing.TestPlanExecutionReport.DisplayName;
Expand Down Expand Up @@ -34,21 +34,21 @@ void metaTest() {
() -> assertThat(report.getTests()).hasSize(10),
() ->
assertThat(report.getSuccessful())
.containsAllOf(
.containsAtLeastElementsIn(Arrays.asList(
nestedFoo,
parameterized1,
parameterized2),
parameterized2)),
() ->
assertThat(report.getSkipped().keySet())
.containsAllOf(
.containsAtLeastElementsIn(Arrays.asList(
foo,
disableSpecificTest,
nestedBar,
nestedBaz,
nestedDifferentDisplayName,
nested2,
parameterized3,
badTest),
badTest)),
() -> assertThat(report.getSkippedCause(foo)).hasValue("foo!"),
() -> assertThat(report.getSkippedCause(nestedBaz)).hasValue("baz!")
);
Expand Down
4 changes: 2 additions & 2 deletions extension-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<artifactId>auto-value-annotations</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ing/src/main/java/name/falgout/jeffrey/testing/junit/testing/TestPlanExecutionReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.LinkedList;
import java.util.Optional;
import java.util.Set;
import javax.annotation.Nullable;
import jakarta.annotation.Nullable;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.engine.support.descriptor.ClassSource;
import org.junit.platform.launcher.TestIdentifier;
Expand Down
78 changes: 41 additions & 37 deletions ...n-testing/src/test/java/name/falgout/jeffrey/testing/junit/testing/ExpectFailureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.jupiter.api.Assertions.assertAll;

import java.io.IOException;
import java.util.Arrays;
import name.falgout.jeffrey.testing.junit.testing.ExpectFailure.Cause;
import name.falgout.jeffrey.testing.junit.testing.TestPlanExecutionReport.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -61,47 +62,50 @@ void negativeExamples() {
() -> assertThat(report.getTests()).hasSize(5),
() ->
assertThat(report.getFailures().keySet())
.containsAllOf(
noExceptionThrown,
wrongExceptionThrown,
wrongCauseThrown,
.containsAtLeastElementsIn(Arrays.asList(
noExceptionThrown,
wrongExceptionThrown,
wrongCauseThrown,
noCauseThrown,
wrongMessage),
wrongMessage)),
() -> {
Throwable failure = report.getFailure(noExceptionThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat().contains("No exception was thrown!");
},
Throwable failure = report.getFailure(noExceptionThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat().contains("No exception was thrown!");
},
() -> {
Throwable failure = report.getFailure(wrongExceptionThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("Not true that <java.lang.RuntimeException: Oops>"
+ " is an instance of <java.lang.IllegalArgumentException>");
},
Throwable failure = report.getFailure(wrongExceptionThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("expected instance of: java.lang.IllegalArgumentException\n"
+ "but was instance of : java.lang.RuntimeException\n"
+ "with value : java.lang.RuntimeException: Oops");
},
() -> {
Throwable failure = report.getFailure(wrongCauseThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("Unexpected cause for java.lang.IllegalArgumentException");
assertThat(failure).hasMessageThat()
.contains("Not true that <java.lang.RuntimeException: bar>"
+ " is an instance of <java.io.IOException>");
},
() -> {
Throwable failure = report.getFailure(noCauseThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("Unexpected cause for java.lang.IllegalArgumentException");
assertThat(failure).hasMessageThat()
.contains("Not true that <null> is an instance of <java.io.IOException>");
},
() -> {
Throwable failure = report.getFailure(wrongMessage).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("Not true that <\"54321\"> contains <\"12345\">");
}
Throwable failure = report.getFailure(wrongCauseThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("value of : throwable.getCause()\n"
+ "expected instance of: java.io.IOException\n"
+ "but was instance of : java.lang.RuntimeException\n"
+ "with value : java.lang.RuntimeException: bar");
},
() -> {
Throwable failure = report.getFailure(noCauseThrown).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("value of : throwable.getCause()\n"
+ "expected instance of: java.io.IOException\n"
+ "but was : null");
},
() -> {
Throwable failure = report.getFailure(wrongMessage).get();
assertThat(failure).isInstanceOf(AssertionError.class);
assertThat(failure).hasMessageThat()
.contains("value of : throwable.getMessage()\n"
+ "expected to contain: 12345\n"
+ "but was : 54321");
}
);
}

Expand Down
6 changes: 3 additions & 3 deletions ...testing/src/test/java/name/falgout/jeffrey/testing/junit/testing/ExtentionTesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package name.falgout.jeffrey.testing.junit.testing;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;

import java.util.Arrays;
import name.falgout.jeffrey.testing.junit.testing.TestPlanExecutionReport.DisplayName;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
Expand Down Expand Up @@ -37,9 +37,9 @@ void testTheTester() {
assertAll(
() -> assertThat(report.getTests()).hasSize(4),
() -> assertThat(report.getSuccessful())
.containsAllOf(
.containsAtLeastElementsIn(Arrays.asList(
DisplayName.create("successful()"),
DisplayName.create("NestedTests", "nestedTest()")),
DisplayName.create("NestedTests", "nestedTest()"))),
() ->
assertThat(report.getSkippedCause(DisplayName.create("skipped()")))
.hasValue("reasons"),
Expand Down
2 changes: 1 addition & 1 deletion guice-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.2</version>
<version>7.0.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion guice-extension/src/main/java/name/falgout/jeffrey/testing/junit/guice/GuiceExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Stream;
import javax.inject.Qualifier;
import jakarta.inject.Qualifier;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
import org.junit.jupiter.api.extension.ExtensionContext.Store;
Expand Down
2 changes: 1 addition & 1 deletion ...-extension/src/test/java/name/falgout/jeffrey/testing/junit/guice/GuiceExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.google.inject.Injector;
import com.google.inject.Key;
import java.lang.reflect.InvocationTargetException;
import javax.inject.Inject;
import jakarta.inject.Inject;
import name.falgout.jeffrey.testing.junit.guice.GuiceExtensionTest.TestModule;
import name.falgout.jeffrey.testing.junit.testing.ExpectFailure;
import name.falgout.jeffrey.testing.junit.testing.ExpectFailure.Cause;
Expand Down
2 changes: 1 addition & 1 deletion ...xtension/src/test/java/name/falgout/jeffrey/testing/junit/guice/InjectExtensionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.junit.jupiter.api.Assertions.fail;

import com.google.inject.AbstractModule;
import javax.inject.Inject;
import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition;
Expand Down
2 changes: 1 addition & 1 deletion ...extension/src/test/java/name/falgout/jeffrey/testing/junit/guice/SharedInjectorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import javax.inject.Named;
import jakarta.inject.Named;
import name.falgout.jeffrey.testing.junit.guice.SharedInjectorsTest.OuterClassModule;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...sion/src/test/java/name/falgout/jeffrey/testing/junit/guice/SomeQualifyingAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import javax.inject.Qualifier;
import jakarta.inject.Qualifier;

@Documented
@Retention(RUNTIME)
Expand Down
40 changes: 20 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.5.2</junit.jupiter.version>
<junit.platform.version>1.5.2</junit.platform.version>
<junit.jupiter.version>5.11.3</junit.jupiter.version>
<junit.platform.version>1.11.3</junit.platform.version>
<java.version>1.8</java.version>
<base.url>https://github.com/JeffreyFalgout/junit5-extensions</base.url>
</properties>
Expand Down Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
<version>33.3.1-jre</version>
</dependency>

<!-- Provided dependencies -->
Expand All @@ -93,25 +93,25 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.6.3</version>
<version>1.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>1.6.3</version>
<version>1.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>1.0-rc4</version>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -132,13 +132,13 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.33</version>
<version>1.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth.extensions</groupId>
<artifactId>truth-java8-extension</artifactId>
<version>0.33</version>
<version>1.4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -150,23 +150,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.1</version>
<version>3.5.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.3</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -175,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.1.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release,ossrh</releaseProfiles>
Expand All @@ -195,7 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -208,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.11.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -221,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.7</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -252,7 +252,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down