Skip to content

Commit

Permalink
Merge pull request #77 from eed3si9n/wip/rename
Browse files Browse the repository at this point in the history
Move Java and Scala packages to com.github.sbt.junit
  • Loading branch information
eed3si9n authored Jul 27, 2024
2 parents fae883e + 1ecb5a5 commit 5e7a6d6
Show file tree
Hide file tree
Showing 44 changed files with 105 additions and 105 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Jupiter Interface
=================

[![Build Status](https://github.com/sbt/sbt-jupiter-interface/actions/workflows/ci.yml/badge.svg)](https://github.com/sbt/sbt-jupiter-interface/actions/workflows/ci.yml)
[![License](https://img.shields.io/hexpm/l/plug.svg)](https://raw.githubusercontent.com/maichler/sbt-jupiter-interface/master/LICENSE)
![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/net.aichler/jupiter-interface?server=https%3A%2F%2Foss.sonatype.org)
[![License](https://img.shields.io/hexpm/l/plug.svg)](https://raw.githubusercontent.com/sbt/sbt-jupiter-interface/main/LICENSE)
![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/com.github.sbt.junit/jupiter-interface?server=https%3A%2F%2Foss.sonatype.org)

An implementation of [SBT's test interface](https://github.com/sbt/test-interface) for [JUnit Jupiter](http://junit.org/junit5). This allows you to run JUnit 5 tests from [SBT](http://www.scala-sbt.org/).

Expand All @@ -13,17 +13,17 @@ The code is split into a runtime library `jupiter-interface` and an SBT plugin `

Add the following line to `./project/plugins.sbt`. See the section [Using Plugins](http://www.scala-sbt.org/release/docs/Using-Plugins.html) in the sbt wiki for more information.

addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.11.1")
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.11.1")

Additionally a test dependency to this plugins runtime library `jupiter-interface` is required for every module which wants to run `JUnit 5` tests:

libraryDependencies ++= Seq(
"net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
"com.github.sbt.junit" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
)

Note that if you want to restore default behaviour like in versions before `0.8.0` you can globally activate this plugin by adding the runtime dependency to `ThisScope` of the root project.

libraryDependencies in ThisBuild += "net.aichler" % "jupiter-interface" % "0.11.1" % Test
ThisBuild / libraryDependencies += "com.github.sbt.junit" % "jupiter-interface" % "0.11.1" % Test

### Integration Testing

Expand Down Expand Up @@ -81,7 +81,7 @@ The following options are supported when running JUnit Jupiter tests:
`--display-mode=<MODE>` | Select an output display mode for when tests are executed. Use either `flat` or `tree`.
`--tests=<REGEXPS>` | Run only the tests whose names match one of the specified regular expressions (in a comma-separated list). Non-matched tests are ignored. Only individual test case names are matched, not test classes. Example: For test `MyClassTest.testBasic()` only "testBasic" is matched. Use sbt's `test-only` command instead to match test classes.
`-Dkey=value` | Temporarily set a system property for the duration of the test run. The property is restored to its previous value after the test has ended. Note that system properties are global to the entire JVM and they can be modified in a non-transactional way, so you should run tests serially and not perform any other tasks in parallel which depend on the modified property.
`--run-listener=<CLASS_NAME>` | A (user defined) class which extends either `org.junit.platform.launcher.TestExecutionListener` or `net.aichler.jupiter.api.JupiterTestListener`. An instance of this class is created and added to the JUnit Launcher, so that it will receive test execution events. For more information, see [TestExecutionListener](http://junit.org/junit5/docs/current/api/org/junit/platform/launcher/TestExecutionListener.html). *Note: this uses the test-classloader, so the class needs to be defined in `src/test` or `src/main` or included as a test or compile dependency*
`--run-listener=<CLASS_NAME>` | A (user defined) class which extends either `org.junit.platform.launcher.TestExecutionListener` or `com.github.sbt.junit.jupiter.api.JupiterTestListener`. An instance of this class is created and added to the JUnit Launcher, so that it will receive test execution events. For more information, see [TestExecutionListener](http://junit.org/junit5/docs/current/api/org/junit/platform/launcher/TestExecutionListener.html). *Note: this uses the test-classloader, so the class needs to be defined in `src/test` or `src/main` or included as a test or compile dependency*
`--include-tags=<EXPRESSIONS>` | A comma separated list of tag expressions which should be included. Only tests matching one or more of those expressions will be run.
`--exclude-tags=<EXPRESSIONS>` | A comma separated list of tag expressions which should be excluded. Any test matching one or more of those expressions will not be run.
`--trace-dispatch-events` | Write dispatch events to file `target/jupiterDispatchEvents.log` (used internally to test the event dispatcher).
Expand Down
2 changes: 1 addition & 1 deletion src/library/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ JUnit Jupiter tests from within SBT.

build.sbt:
```
libraryDependencies += "net.aichler" % "jupiter-interface" % "0.8.2" % "test"
libraryDependencies += "com.github.sbt.junit" % "jupiter-interface" % "0.8.2" % "test"
```
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import net.aichler.jupiter.internal.JupiterRunner;
import com.github.sbt.junit.jupiter.internal.JupiterRunner;
import sbt.testing.Fingerprint;
import sbt.testing.Framework;
import sbt.testing.Runner;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.support.descriptor.ClassSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import sbt.testing.AnnotatedFingerprint;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.launcher.TestExecutionListener;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import java.io.PrintStream;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;
package com.github.sbt.junit.jupiter.internal;

/**
* Defines an enumeration of available colors.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;
package com.github.sbt.junit.jupiter.internal;

/**
* Defines a theme for colored output.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;
package com.github.sbt.junit.jupiter.internal;

import net.aichler.jupiter.api.JupiterTestListener;
import net.aichler.jupiter.internal.listeners.FlatPrintingTestListener;
import net.aichler.jupiter.internal.listeners.TreePrintingTestListener;
import net.aichler.jupiter.internal.options.Options;
import com.github.sbt.junit.jupiter.api.JupiterTestListener;
import com.github.sbt.junit.jupiter.internal.listeners.FlatPrintingTestListener;
import com.github.sbt.junit.jupiter.internal.listeners.TreePrintingTestListener;
import com.github.sbt.junit.jupiter.internal.options.Options;
import org.junit.jupiter.api.Test;
import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.UniqueId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;

import net.aichler.jupiter.api.JupiterTestListener;
import net.aichler.jupiter.api.StreamPair;
import net.aichler.jupiter.internal.event.Dispatcher;
import net.aichler.jupiter.internal.event.LoggingEventHandler;
import net.aichler.jupiter.internal.filter.GlobFilter;
import net.aichler.jupiter.internal.filter.TestFilter;
import net.aichler.jupiter.internal.listeners.OutputCapturingTestListener;
import net.aichler.jupiter.internal.listeners.SummaryPrintingTestListener;
import net.aichler.jupiter.internal.options.Options;
import net.aichler.jupiter.internal.options.OptionsParser;
package com.github.sbt.junit.jupiter.internal;

import com.github.sbt.junit.jupiter.api.JupiterTestListener;
import com.github.sbt.junit.jupiter.api.StreamPair;
import com.github.sbt.junit.jupiter.internal.event.Dispatcher;
import com.github.sbt.junit.jupiter.internal.event.LoggingEventHandler;
import com.github.sbt.junit.jupiter.internal.filter.GlobFilter;
import com.github.sbt.junit.jupiter.internal.filter.TestFilter;
import com.github.sbt.junit.jupiter.internal.listeners.OutputCapturingTestListener;
import com.github.sbt.junit.jupiter.internal.listeners.SummaryPrintingTestListener;
import com.github.sbt.junit.jupiter.internal.options.Options;
import com.github.sbt.junit.jupiter.internal.options.OptionsParser;
import org.junit.platform.engine.DiscoverySelector;
import org.junit.platform.engine.Filter;
import org.junit.platform.launcher.Launcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;
package com.github.sbt.junit.jupiter.internal;

import net.aichler.jupiter.internal.options.Options;
import com.github.sbt.junit.jupiter.internal.options.Options;
import sbt.testing.Logger;

import java.text.MessageFormat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import net.aichler.jupiter.api.JupiterTestFingerprint;
import net.aichler.jupiter.api.JupiterTestListener;
import net.aichler.jupiter.internal.Configuration;
import com.github.sbt.junit.jupiter.api.JupiterTestFingerprint;
import com.github.sbt.junit.jupiter.api.JupiterTestListener;
import com.github.sbt.junit.jupiter.internal.Configuration;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.launcher.TestIdentifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import sbt.testing.Event;
import sbt.testing.EventHandler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.UniqueId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.filter;
package com.github.sbt.junit.jupiter.internal.filter;

import net.aichler.jupiter.internal.event.Dispatcher;
import com.github.sbt.junit.jupiter.internal.event.Dispatcher;
import org.junit.platform.engine.FilterResult;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.UniqueId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.filter;
package com.github.sbt.junit.jupiter.internal.filter;

import net.aichler.jupiter.internal.event.Dispatcher;
import com.github.sbt.junit.jupiter.internal.event.Dispatcher;
import org.junit.platform.engine.FilterResult;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.listeners;
package com.github.sbt.junit.jupiter.internal.listeners;

import net.aichler.jupiter.api.JupiterTestListener;
import net.aichler.jupiter.internal.ColorTheme;
import net.aichler.jupiter.internal.Configuration;
import net.aichler.jupiter.internal.TestLogger;
import com.github.sbt.junit.jupiter.api.JupiterTestListener;
import com.github.sbt.junit.jupiter.internal.ColorTheme;
import com.github.sbt.junit.jupiter.internal.Configuration;
import com.github.sbt.junit.jupiter.internal.TestLogger;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.engine.reporting.ReportEntry;
import org.junit.platform.launcher.TestIdentifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* under the License.
*/

package net.aichler.jupiter.internal.listeners;
package com.github.sbt.junit.jupiter.internal.listeners;

import net.aichler.jupiter.api.StreamPair;
import net.aichler.jupiter.api.StreamPair.Type;
import com.github.sbt.junit.jupiter.api.StreamPair;
import com.github.sbt.junit.jupiter.api.StreamPair.Type;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.listeners;
package com.github.sbt.junit.jupiter.internal.listeners;

import net.aichler.jupiter.api.StreamPair;
import net.aichler.jupiter.internal.Configuration;
import net.aichler.jupiter.internal.TestLogger;
import com.github.sbt.junit.jupiter.api.StreamPair;
import com.github.sbt.junit.jupiter.internal.Configuration;
import com.github.sbt.junit.jupiter.internal.TestLogger;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.launcher.TestExecutionListener;
import org.junit.platform.launcher.TestIdentifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.listeners;
package com.github.sbt.junit.jupiter.internal.listeners;

import net.aichler.jupiter.internal.Color;
import net.aichler.jupiter.internal.ColorTheme;
import net.aichler.jupiter.internal.Configuration;
import net.aichler.jupiter.internal.TestLogger;
import com.github.sbt.junit.jupiter.internal.Color;
import com.github.sbt.junit.jupiter.internal.ColorTheme;
import com.github.sbt.junit.jupiter.internal.Configuration;
import com.github.sbt.junit.jupiter.internal.TestLogger;
import org.junit.platform.launcher.TestPlan;
import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
import org.junit.platform.launcher.listeners.TestExecutionSummary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.listeners;
package com.github.sbt.junit.jupiter.internal.listeners;

import net.aichler.jupiter.api.JupiterTestListener;
import net.aichler.jupiter.internal.ColorTheme;
import net.aichler.jupiter.internal.Configuration;
import net.aichler.jupiter.internal.TestLogger;
import com.github.sbt.junit.jupiter.api.JupiterTestListener;
import com.github.sbt.junit.jupiter.internal.ColorTheme;
import com.github.sbt.junit.jupiter.internal.Configuration;
import com.github.sbt.junit.jupiter.internal.TestLogger;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.engine.reporting.ReportEntry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.options;
package com.github.sbt.junit.jupiter.internal.options;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.options;
package com.github.sbt.junit.jupiter.internal.options;

import java.util.AbstractMap;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.api;
package com.github.sbt.junit.jupiter.api;

import org.junit.Rule;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal;
package com.github.sbt.junit.jupiter.internal;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Nested;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import junit.TestRunner;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.DurationTests;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.DynamicTests;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.MultipleParamsTests;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.NestedTests;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.ParameterizedTests;
import net.aichler.jupiter.internal.event.DispatcherSampleTests.SingleParamTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.DurationTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.DynamicTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.MultipleParamsTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.NestedTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.ParameterizedTests;
import com.github.sbt.junit.jupiter.internal.event.DispatcherSampleTests.SingleParamTests;
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;
import org.junit.Ignore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.aichler.jupiter.internal.event;
package com.github.sbt.junit.jupiter.internal.event;

import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
Expand Down
Loading

0 comments on commit 5e7a6d6

Please sign in to comment.