Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

Commit 86af2fd

Browse files
committed
move java tests into a separate module to allow to disable cross paths and not to interfere with the publish process
1 parent 29a1ed3 commit 86af2fd

File tree

6 files changed

+18
-4
lines changed

6 files changed

+18
-4
lines changed

build.sbt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,16 @@ lazy val rootProject = (project in file("."))
4848
.settings(
4949
publishArtifact := false,
5050
name := "akka-http-session")
51-
.aggregate(core, jwt, example)
51+
.aggregate(core, jwt, example, javaTests)
5252

5353
lazy val core: Project = (project in file("core"))
5454
.settings(commonSettings: _*)
5555
.settings(
5656
name := "core",
57-
testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
5857
libraryDependencies ++= Seq(
5958
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
6059
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
6160
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
62-
"junit" % "junit" % "4.12" % "test",
63-
"com.novocode" % "junit-interface" % "0.11" % "test",
6461
scalaTest
6562
)
6663
)
@@ -84,3 +81,20 @@ lazy val example: Project = (project in file("example"))
8481
"ch.qos.logback" % "logback-classic" % "1.1.7"
8582
))
8683
.dependsOn(core, jwt)
84+
85+
lazy val javaTests: Project = (project in file("javaTests"))
86+
.settings(commonSettings: _*)
87+
.settings(
88+
name := "javaTests",
89+
testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
90+
crossPaths := false, // https://github.com/sbt/junit-interface/issues/35
91+
publishArtifact := false,
92+
libraryDependencies ++= Seq(
93+
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
94+
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
95+
"junit" % "junit" % "4.12" % "test",
96+
"com.novocode" % "junit-interface" % "0.11" % "test",
97+
scalaTest
98+
))
99+
.dependsOn(core, jwt)
100+

core/src/test/java/com/softwaremill/session/javadsl/CsrfDirectivesTest.java renamed to javaTests/src/test/java/com/softwaremill/session/javadsl/CsrfDirectivesTest.java

File renamed without changes.

core/src/test/java/com/softwaremill/session/javadsl/HttpSessionAwareDirectivesTest.java renamed to javaTests/src/test/java/com/softwaremill/session/javadsl/HttpSessionAwareDirectivesTest.java

File renamed without changes.

core/src/test/java/com/softwaremill/session/javadsl/OneOffSetRefreshableGetTest.java renamed to javaTests/src/test/java/com/softwaremill/session/javadsl/OneOffSetRefreshableGetTest.java

File renamed without changes.

core/src/test/java/com/softwaremill/session/javadsl/OneOffTest.java renamed to javaTests/src/test/java/com/softwaremill/session/javadsl/OneOffTest.java

File renamed without changes.

core/src/test/java/com/softwaremill/session/javadsl/RefreshableTest.java renamed to javaTests/src/test/java/com/softwaremill/session/javadsl/RefreshableTest.java

File renamed without changes.

0 commit comments

Comments
 (0)