Skip to content

Commit 76d003f

Browse files
committed
Fix typo
1 parent 94583d1 commit 76d003f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class VulpixUnitTests extends ParallelTesting {
6565
compileFile("tests/vulpix-tests/unit/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
6666

6767
@Test def runStackOverflow: Unit =
68-
if (!scala.util.isWin)
69-
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
68+
if (!scala.util.Properties.isWin)
69+
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
7070

7171
@Test def runOutRedirects: Unit =
7272
compileFile("tests/vulpix-tests/unit/i2147.scala", defaultOptions).expectFailure.checkRuns()
@@ -91,7 +91,7 @@ class VulpixUnitTests extends ParallelTesting {
9191
case ae: AssertionError => assertTrue(ae.getMessage.contains("java compilation failed"))
9292
}
9393

94-
@Test def runTimeout: Unit = if (!scala.util.isWin) {
94+
@Test def runTimeout: Unit = if (!scala.util.Properties.isWin) {
9595
val fileName = s"tests/vulpix-tests/unit/timeout.scala"
9696
try {
9797
compileFile(fileName, defaultOptions).checkRuns()

tests/generic-java-signatures/derivedNames.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ object Test {
44
def main(args: Array[String]): Unit = {
55
val objectB = classOf[Foo[Any]].getClasses
66
val returnType = objectB(1).getDeclaredMethod("m").getGenericReturnType.asInstanceOf[ParameterizedType]
7-
if (scala.util.isWin) assert(returnType.toString == "Test$Foo.Test$Foo$A<Test.Test$Foo<T1>.B$>")
8-
else assert(returnType.toString == "Test$Foo$A<Test$Foo<T1>$B$>")
7+
if (scala.util.Properties.isWin)
8+
assert(returnType.toString == "Test$Foo.Test$Foo$A<Test.Test$Foo<T1>.B$>")
9+
else
10+
assert(returnType.toString == "Test$Foo$A<Test$Foo<T1>$B$>")
911
}
1012
class Foo[T1] {
1113
class A[T2]

0 commit comments

Comments
 (0)