Skip to content

Commit e644b85

Browse files
cheesengcheeseng
authored
Merge pull request #244 from scalatest/feature-scalatestplus-junit5-3.2.19.0-for-junit5
ScalaTest+Junit5 3.2.19.0 for JUnit 5.12 Self-merge this one as it is straight forward changes.
2 parents dc125f4 + 53ada9c commit e644b85

File tree

76 files changed

+5184
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5184
-6
lines changed

‎app/controllers/Application.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ object Application {
156156
val latestEasyMockVersion = "5-3"
157157
val latestJMockVersion = "2-13"
158158
val latestJUnitVersion = "4-13"
159-
val latestJUnit5Version = "5-11"
159+
val latestJUnit5Version = "5-12"
160160
val latestJUnit5PlusVersion = "3.2.19.0"
161161
val latestMockitoVersion = "5-12"
162162
val latestScalaCheckVersion = "1-18"

‎app/views/plus/junit5.scala.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ <h1>ScalaTest + JUnit 5</h1>
6868
implementation "org.scala-lang:scala-library:@baseScalaVersion"
6969

7070
testImplementation "org.scalatest:scalatest_3:@latestVersion"
71-
testImplementation "org.junit.platform:junit-platform-launcher:1.11.3"
72-
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.11.3"
71+
testImplementation "org.junit.platform:junit-platform-launcher:1.12.0"
72+
testRuntimeOnly "org.junit.platform:junit-platform-engine:1.12.0"
7373
testRuntimeOnly "org.scalatestplus:junit-@{latestJUnit5Version}_3:@latestJUnit5PlusVersion"
7474
}
7575

@@ -92,8 +92,8 @@ <h1>ScalaTest + JUnit 5</h1>
9292
implementation("org.scala-lang:scala-library:@latestVersion")
9393

9494
testImplementation("org.scalatest:scalatest_3:@latestVersion")
95-
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.11.3")
96-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.3")
95+
testRuntimeOnly("org.junit.platform:junit-platform-engine:1.12.0")
96+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
9797
testRuntimeOnly("org.scalatestplus:junit-@{latestJUnit5Version}_3:@latestJUnit5PlusVersion")
9898
}
9999

‎app/views/plus/junit5Versions.scala.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ <h1>ScalaTest + JUnit 5 Versions, Versions, Versions</h1>
3131
<table style="border-collapse: collapse; border: 1px solid black">
3232
<tr><th style="background-color: #CCCCCC; border-width: 1px; padding: 10px; text-align: center; border: 1px solid black">ScalaTest + JUnit 5 Version</th><th style="background-color: #CCCCCC; border-width: 1px; padding: 10px; text-align: center; border: 1px solid black">ScalaTest Version</th><th style="background-color: #CCCCCC; border-width: 1px; padding: 10px; text-align: center; border: 1px solid black">JUnit 5 Versions</th></tr>
3333

34+
<tr>
35+
<td style="border-width: 1px; padding: 3px; border: 1px solid black; text-align: center"><a href="@routes.Assets.at("/public/scaladoc", "plus-junit-5.12/3.2.19.0/org/scalatestplus/junit5/AssertionsForJUnit.html")">3.2.19.0</a></td>
36+
<td style="border-width: 1px; padding: 3px; border: 1px solid black; text-align: center">3.2.19</td>
37+
<td style="border-width: 1px; padding: 3px; border: 1px solid black; text-align: center">5.12</td>
38+
</tr>
39+
3440
<tr>
3541
<td style="border-width: 1px; padding: 3px; border: 1px solid black; text-align: center"><a href="@routes.Assets.at("/public/scaladoc", "plus-junit-5.11/3.2.19.0/org/scalatestplus/junit5/AssertionsForJUnit.html")">3.2.19.0</a></td>
3642
<td style="border-width: 1px; padding: 3px; border: 1px solid black; text-align: center">3.2.19</td>

‎app/views/scaladoc.scala.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@ <h1>ScalaTest + Mockito (1.10)'s Scaladoc documentation</h1>
321321

322322
<a name="scalatestPlusJUnit5"/>
323323

324+
<h1>ScalaTest + JUnit (5.12)'s Scaladoc documentation</h1>
325+
326+
<ul>
327+
<li><a href="@routes.Assets.at("/public/scaladoc", "plus-junit-5.12/3.2.19.0/org/scalatestplus/junit5/AssertionsForJUnit.html")">Scaladoc for ScalaTest + JUnit 3.2.19.0</a></li>
328+
</ul>
329+
324330
<h1>ScalaTest + JUnit (5.11)'s Scaladoc documentation</h1>
325331

326332
<ul>

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
lazy val root = (project in file(".")).settings(
44
name := "scalatest-website",
5-
version := "241106",
5+
version := "250312",
66
scalaVersion := "3.3.4",
77
libraryDependencies ++= Seq(
88
guice,

‎public/scaladoc/plus-junit-5.12/3.2.19.0/index.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!DOCTYPE html ><html><head><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"/><title>ScalaTest + JUnit5 3.2.19.0 </title><meta content="ScalaTest JUnit5 3.2.19.0 " name="description"/><meta content="ScalaTest JUnit5 3.2.19.0 " name="keywords"/><meta http-equiv="content-type" content="text/html; charset=UTF-8"/><link href="lib/index.css" media="screen" type="text/css" rel="stylesheet"/><link href="lib/template.css" media="screen" type="text/css" rel="stylesheet"/><link href="lib/print.css" media="print" type="text/css" rel="stylesheet"/><link href="lib/diagrams.css" media="screen" type="text/css" rel="stylesheet" id="diagrams-css"/><script type="text/javascript" src="lib/jquery.min.js"></script><script type="text/javascript" src="lib/index.js"></script><script type="text/javascript" src="index.js"></script><script type="text/javascript" src="lib/scheduler.js"></script><script type="text/javascript" src="lib/template.js"></script><script type="text/javascript">/* this variable can be used by the JS to determine the path to the root document */
2+
var toRoot = '';</script>
3+
4+
<!-- gtag [javascript] -->
5+
6+
<script async src="https://www.googletagmanager.com/gtag/js?id=G-NJWCS90VG5"></script>
7+
8+
<script defer>
9+
10+
window.dataLayer = window.dataLayer || [];
11+
12+
function gtag(){dataLayer.push(arguments);}
13+
14+
gtag('js', new Date());
15+
16+
gtag('config', 'G-NJWCS90VG5');
17+
18+
</script>
19+
</head><body><div id="search"><span id="doc-title">ScalaTest + JUnit5 3.2.19.0<span id="doc-version"></span></span> <span class="close-results"><span class="left">&lt;</span> Back</span><div id="textfilter"><span class="input"><input autocapitalize="none" placeholder="Search" id="index-input" type="text" accesskey="/"/><i class="clear material-icons"></i><i id="search-icon" class="material-icons"></i></span></div></div><div id="search-results"><div id="search-progress"><div id="progress-fill"></div></div><div id="results-content"><div id="entity-results"></div><div id="member-results"></div></div></div><div id="content-scroll-container" style="-webkit-overflow-scrolling: touch;"><div id="content-container" style="-webkit-overflow-scrolling: touch;"><div id="subpackage-spacer"><div id="packages"><h1>Packages</h1><ul><li class="indented0 current" name="_root_.root" group="Ungrouped" fullComment="no" data-isabs="false" visbl="pub"><a id="_root_" class="anchorToMember"></a><a id="root:_root_" class="anchorToMember"></a> <span class="permalink"><a href="index.html" title="Permalink"><i class="material-icons"></i></a></span> <span class="modifier_kind"><span class="modifier"></span> <span class="kind">package</span></span> <span class="symbol"><span class="name">root</span></span></li><li class="indented1 " name="_root_.org" group="Ungrouped" fullComment="no" data-isabs="false" visbl="pub"><a id="org" class="anchorToMember"></a><a id="org:org" class="anchorToMember"></a> <span class="permalink"><a href="org/index.html" title="Permalink"><i class="material-icons"></i></a></span> <span class="modifier_kind"><span class="modifier"></span> <span class="kind">package</span></span> <span class="symbol"><a href="org/index.html" title=""><span class="name">org</span></a></span></li></ul></div></div><div id="content"><body class="package value">
20+
21+
<!-- Top of doc.scalatest.org [javascript] -->
22+
23+
<script id=adsArtimaScript type=text/javascript src=https://www.artima.com/assets/javascripts/4ca150665e51d0b1c3890ca1b891c507-ads.js?product=ScalaTest></script>
24+
<div id="definition"><div class="big-circle package">p</div><h1>root package <span class="permalink"><a href="index.html" title="Permalink"><i class="material-icons"></i></a></span></h1></div><h4 id="signature" class="signature"><span class="modifier_kind"><span class="modifier"></span> <span class="kind">package</span></span> <span class="symbol"><span class="name">root</span></span></h4><div id="comment" class="fullcommenttop"></div><div id="template"><div id="allMembers"><div id="packages" class="package members"><h3>Package Members</h3><ol><li class="indented0 " name="_root_.org" group="Ungrouped" fullComment="no" data-isabs="false" visbl="pub"><a id="org" class="anchorToMember"></a><a id="org:org" class="anchorToMember"></a> <span class="permalink"><a href="org/index.html" title="Permalink"><i class="material-icons"></i></a></span> <span class="modifier_kind"><span class="modifier"></span> <span class="kind">package</span></span> <span class="symbol"><a href="org/index.html" title=""><span class="name">org</span></a></span></li></ol></div></div><div id="inheritedMembers"></div><div id="groupedMembers"><div name="Ungrouped" class="group"><h3>Ungrouped</h3></div></div></div><div id="tooltip"></div><div id="footer"></div></body></div></div></div></body></html>

‎public/scaladoc/plus-junit-5.12/3.2.19.0/index.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/scaladoc/plus-junit-5.12/3.2.19.0/lib/MaterialIcons-Regular.eot‎

134 KB
Binary file not shown.

‎public/scaladoc/plus-junit-5.12/3.2.19.0/lib/MaterialIcons-Regular.ttf‎

120 KB
Binary file not shown.

‎public/scaladoc/plus-junit-5.12/3.2.19.0/lib/MaterialIcons-Regular.woff‎

55.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)