Skip to content

Commit 50b851e

Browse files
sideeffffectsideeffffect
committed
Build on Scala 3
1 parent b264579 commit 50b851e

21 files changed

+204
-143
lines changed

‎build.sbt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
241241
name := "tests",
242242
publish / skip := true,
243243
Keys.`package` := file(""),
244-
Compile / skip := isDotty.value,
245244
libraryDependencies +=
246245
"org.scalatest" %%% "scalatest" % "3.2.12" % Test,
247246
scalacOptions ~= (_.filterNot(

‎tests/shared/src/test/scala/org/threeten/bp/temporal/MockFieldNoValue.scala‎ renamed to ‎tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala‎

File renamed without changes.

‎tests/shared/src/test/scala-3/org/threeten/bp/temporal/MockFieldNoValue.scala‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
3+
*
4+
* All rights reserved.
5+
*
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following conditions are met:
8+
*
9+
* * Redistributions of source code must retain the above copyright notice,
10+
* this list of conditions and the following disclaimer.
11+
*
12+
* * Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
15+
*
16+
* * Neither the name of JSR-310 nor the names of its contributors
17+
* may be used to endorse or promote products derived from this software
18+
* without specific prior written permission.
19+
*
20+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
*/
32+
package org.threeten.bp.temporal
33+
34+
import java.util.Locale
35+
36+
import org.threeten.bp.DateTimeException
37+
import org.threeten.bp.format.ResolverStyle
38+
import org.threeten.bp.temporal.ChronoUnit.{ MONTHS, WEEKS }
39+
40+
/** Mock DateTimeField that returns null. */
41+
enum MockFieldNoValue private (name: String, ordinal: Int)
42+
extends Enum[MockFieldNoValue]
43+
with TemporalField {
44+
case INSTANCE extends MockFieldNoValue("INSTANCE", 0)
45+
override def toString: String = null
46+
def getBaseUnit: TemporalUnit = WEEKS
47+
def getRangeUnit: TemporalUnit = MONTHS
48+
def range: ValueRange = ValueRange.of(1, 20)
49+
def isDateBased: Boolean = true
50+
def isTimeBased: Boolean = false
51+
def isSupportedBy(dateTime: TemporalAccessor): Boolean = true
52+
def rangeRefinedBy(dateTime: TemporalAccessor): ValueRange = ValueRange.of(1, 20)
53+
def getFrom(dateTime: TemporalAccessor): Long = throw new DateTimeException("Mock")
54+
def adjustInto[R <: Temporal](dateTime: R, newValue: Long): R =
55+
throw new DateTimeException("Mock")
56+
override def getDisplayName(locale: Locale): String = "Mock"
57+
override def resolve(
58+
fieldValues: java.util.Map[TemporalField, java.lang.Long],
59+
partialTemporal: TemporalAccessor,
60+
resolverStyle: ResolverStyle
61+
): TemporalAccessor =
62+
null
63+
}

‎tests/shared/src/test/scala/org/threeten/bp/Performance.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ object Performance {
8383
while (loop < 5) {
8484
{
8585
System.out.println("-------------------------------------")
86-
process
86+
process()
8787
}
8888
{
8989
loop += 1

‎tests/shared/src/test/scala/org/threeten/bp/TestDuration.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,14 +1902,14 @@ class TestDuration extends AnyFunSuite with AssertionsHelper {
19021902
while (j < durations.length) {
19031903
val b: Duration = durations(j)
19041904
if (i < j) {
1905-
assertEquals(a.compareTo(b) < 0, true, a + " <=> " + b)
1906-
assertEquals(a == b, false, a + " <=> " + b)
1905+
assertEquals(a.compareTo(b) < 0, true, s"$a <=> $b")
1906+
assertEquals(a == b, false, s"$a <=> $b")
19071907
} else if (i > j) {
1908-
assertEquals(a.compareTo(b) > 0, true, a + " <=> " + b)
1909-
assertEquals(a == b, false, a + " <=> " + b)
1908+
assertEquals(a.compareTo(b) > 0, true, s"$a <=> $b")
1909+
assertEquals(a == b, false, s"$a <=> $b")
19101910
} else {
1911-
assertEquals(a.compareTo(b), 0, a + " <=> " + b)
1912-
assertEquals(a == b, true, a + " <=> " + b)
1911+
assertEquals(a.compareTo(b), 0, s"$a <=> $b")
1912+
assertEquals(a == b, true, s"$a <=> $b")
19131913
}
19141914
j += 1
19151915
}

‎tests/shared/src/test/scala/org/threeten/bp/TestInstant.scala‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,20 +1497,20 @@ class TestInstant
14971497
while (j < instants.length) {
14981498
val b: Instant = instants(j)
14991499
if (i < j) {
1500-
assertEquals(a.compareTo(b) < 0, true, a + " <=> " + b)
1501-
assertEquals(a.isBefore(b), true, a + " <=> " + b)
1502-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
1503-
assertEquals(a == b, false, a + " <=> " + b)
1500+
assertEquals(a.compareTo(b) < 0, true, s"$a <=> $b")
1501+
assertEquals(a.isBefore(b), true, s"$a <=> $b")
1502+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
1503+
assertEquals(a == b, false, s"$a <=> $b")
15041504
} else if (i > j) {
1505-
assertEquals(a.compareTo(b) > 0, true, a + " <=> " + b)
1506-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
1507-
assertEquals(a.isAfter(b), true, a + " <=> " + b)
1508-
assertEquals(a == b, false, a + " <=> " + b)
1505+
assertEquals(a.compareTo(b) > 0, true, s"$a <=> $b")
1506+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
1507+
assertEquals(a.isAfter(b), true, s"$a <=> $b")
1508+
assertEquals(a == b, false, s"$a <=> $b")
15091509
} else {
1510-
assertEquals(a.compareTo(b), 0, a + " <=> " + b)
1511-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
1512-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
1513-
assertEquals(a == b, true, a + " <=> " + b)
1510+
assertEquals(a.compareTo(b), 0, s"$a <=> $b")
1511+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
1512+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
1513+
assertEquals(a == b, true, s"$a <=> $b")
15141514
}
15151515
j += 1
15161516
}

‎tests/shared/src/test/scala/org/threeten/bp/TestLocalDate.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,19 +1823,19 @@ class TestLocalDate
18231823
val b: LocalDate = localDates(j)
18241824
if (i < j) {
18251825
assertTrue(a.compareTo(b) < 0)
1826-
assertEquals(a.isBefore(b), true, a + " <=> " + b)
1827-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
1828-
assertEquals(a == b, false, a + " <=> " + b)
1826+
assertEquals(a.isBefore(b), true, s"$a <=> $b")
1827+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
1828+
assertEquals(a == b, false, s"$a <=> $b")
18291829
} else if (i > j) {
18301830
assertTrue(a.compareTo(b) > 0)
1831-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
1832-
assertEquals(a.isAfter(b), true, a + " <=> " + b)
1833-
assertEquals(a == b, false, a + " <=> " + b)
1831+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
1832+
assertEquals(a.isAfter(b), true, s"$a <=> $b")
1833+
assertEquals(a == b, false, s"$a <=> $b")
18341834
} else {
1835-
assertEquals(a.compareTo(b), 0, a + " <=> " + b)
1836-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
1837-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
1838-
assertEquals(a == b, true, a + " <=> " + b)
1835+
assertEquals(a.compareTo(b), 0, s"$a <=> $b")
1836+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
1837+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
1838+
assertEquals(a == b, true, s"$a <=> $b")
18391839
}
18401840
}
18411841
{

‎tests/shared/src/test/scala/org/threeten/bp/TestLocalDateTime.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ class TestLocalDateTime
991991
assertEquals(a.getMonth, Month.of(m))
992992
assertEquals(a.getDayOfMonth, d)
993993
case _ =>
994-
fail
994+
fail()
995995
}
996996
}
997997

@@ -2793,19 +2793,19 @@ class TestLocalDateTime
27932793
val b: LocalDateTime = localDateTimes(j)
27942794
if (i < j) {
27952795
assertTrue(a.compareTo(b) < 0)
2796-
assertEquals(a.isBefore(b), true, a + " <=> " + b)
2797-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
2798-
assertEquals(a == b, false, a + " <=> " + b)
2796+
assertEquals(a.isBefore(b), true, s"$a <=> $b")
2797+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
2798+
assertEquals(a == b, false, s"$a <=> $b")
27992799
} else if (i > j) {
28002800
assertTrue(a.compareTo(b) > 0)
2801-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
2802-
assertEquals(a.isAfter(b), true, a + " <=> " + b)
2803-
assertEquals(a == b, false, a + " <=> " + b)
2801+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
2802+
assertEquals(a.isAfter(b), true, s"$a <=> $b")
2803+
assertEquals(a == b, false, s"$a <=> $b")
28042804
} else {
2805-
assertEquals(a.compareTo(b), 0, a + " <=> " + b)
2806-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
2807-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
2808-
assertEquals(a == b, true, a + " <=> " + b)
2805+
assertEquals(a.compareTo(b), 0, s"$a <=> $b")
2806+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
2807+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
2808+
assertEquals(a == b, true, s"$a <=> $b")
28092809
}
28102810
j += 1
28112811
}

‎tests/shared/src/test/scala/org/threeten/bp/TestLocalTime.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,19 +2017,19 @@ class TestLocalTime
20172017
val b: LocalTime = localTimes(j)
20182018
if (i < j) {
20192019
assertTrue(a.compareTo(b) < 0)
2020-
assertEquals(a.isBefore(b), true, a + " <=> " + b)
2021-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
2022-
assertEquals(a == b, false, a + " <=> " + b)
2020+
assertEquals(a.isBefore(b), true, s"$a <=> $b")
2021+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
2022+
assertEquals(a == b, false, s"$a <=> $b")
20232023
} else if (i > j) {
20242024
assertTrue(a.compareTo(b) > 0)
2025-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
2026-
assertEquals(a.isAfter(b), true, a + " <=> " + b)
2027-
assertEquals(a == b, false, a + " <=> " + b)
2025+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
2026+
assertEquals(a.isAfter(b), true, s"$a <=> $b")
2027+
assertEquals(a == b, false, s"$a <=> $b")
20282028
} else {
2029-
assertEquals(a.compareTo(b), 0, a + " <=> " + b)
2030-
assertEquals(a.isBefore(b), false, a + " <=> " + b)
2031-
assertEquals(a.isAfter(b), false, a + " <=> " + b)
2032-
assertEquals(a == b, true, a + " <=> " + b)
2029+
assertEquals(a.compareTo(b), 0, s"$a <=> $b")
2030+
assertEquals(a.isBefore(b), false, s"$a <=> $b")
2031+
assertEquals(a.isAfter(b), false, s"$a <=> $b")
2032+
assertEquals(a == b, true, s"$a <=> $b")
20332033
}
20342034
j += 1
20352035
}

‎tests/shared/src/test/scala/org/threeten/bp/UsabilityBasic.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ class UsabilityBasic {
9797
}
9898

9999
protected def output(date: LocalDate, field: TemporalField): Unit =
100-
System.out.println(field + " " + date.getLong(field))
100+
System.out.println(s"$field ${date.getLong(field)}")
101101

102102
protected def output(dateTime: LocalDateTime, field: TemporalField): Unit =
103-
System.out.println(field + " " + dateTime.getLong(field))
103+
System.out.println(s"$field ${dateTime.getLong(field)}")
104104

105105
protected def output(time: LocalTime, field: TemporalField): Unit =
106-
System.out.println(field + " " + time.getLong(field))
106+
System.out.println(s"$field ${time.getLong(field)}")
107107

108108
private def period(): Unit = {
109109
var date1: LocalDate = LocalDate.now

0 commit comments

Comments
 (0)