diff options
Diffstat (limited to 'scalalib/test')
-rw-r--r-- | scalalib/test/src/GenIdeaTests.scala | 2 | ||||
-rw-r--r-- | scalalib/test/src/HelloJavaTests.scala | 6 | ||||
-rw-r--r-- | scalalib/test/src/HelloWorldTests.scala | 136 | ||||
-rw-r--r-- | scalalib/test/src/ResolveDepsTests.scala | 18 | ||||
-rw-r--r-- | scalalib/test/src/VersionControlTests.scala | 6 | ||||
-rw-r--r-- | scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala | 6 | ||||
-rw-r--r-- | scalalib/test/src/dependency/updates/UpdatesFinderTests.scala | 60 | ||||
-rw-r--r-- | scalalib/test/src/dependency/versions/VersionTests.scala | 14 | ||||
-rw-r--r-- | scalalib/test/src/publish/IvyTests.scala | 6 | ||||
-rw-r--r-- | scalalib/test/src/publish/PomTests.scala | 28 | ||||
-rw-r--r-- | scalalib/test/src/scalafmt/ScalafmtTests.scala | 6 |
11 files changed, 144 insertions, 144 deletions
diff --git a/scalalib/test/src/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala index 60c9f9a8..10034e88 100644 --- a/scalalib/test/src/GenIdeaTests.scala +++ b/scalalib/test/src/GenIdeaTests.scala @@ -21,7 +21,7 @@ object GenIdeaTests extends TestSuite { val helloWorldEvaluator = TestEvaluator.static(HelloWorld) def tests: Tests = Tests { - 'genIdeaTests - { + test("genIdeaTests"){ val pp = new scala.xml.PrettyPrinter(999, 4) val layout = GenIdeaImpl.xmlFileLayout( diff --git a/scalalib/test/src/HelloJavaTests.scala b/scalalib/test/src/HelloJavaTests.scala index 02c2567f..66511ad8 100644 --- a/scalalib/test/src/HelloJavaTests.scala +++ b/scalalib/test/src/HelloJavaTests.scala @@ -36,7 +36,7 @@ object HelloJavaTests extends TestSuite { eval } def tests: Tests = Tests { - 'compile - { + test("compile"){ val eval = init() val Right((res1, n1)) = eval.apply(HelloJava.core.compile) @@ -64,7 +64,7 @@ object HelloJavaTests extends TestSuite { os.proc("jar", "tf", ref2.path).call().out.lines.contains("hello/Main.html") ) } - 'test - { + test("test"){ val eval = init() val Left(Result.Failure(ref1, Some(v1))) = eval.apply(HelloJava.core.test.test()) @@ -85,7 +85,7 @@ object HelloJavaTests extends TestSuite { v2._2(1).status == "Success" ) } - 'failures - { + test("failures"){ val eval = init() val mainJava = HelloJava.millSourcePath / 'app / 'src / "Main.java" diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala index 57750991..80f78fe7 100644 --- a/scalalib/test/src/HelloWorldTests.scala +++ b/scalalib/test/src/HelloWorldTests.scala @@ -309,9 +309,9 @@ object HelloWorldTests extends TestSuite { def tests: Tests = Tests { - 'scalaVersion - { + test("scalaVersion"){ - 'fromBuild - workspaceTest(HelloWorld){eval => + test("fromBuild") - workspaceTest(HelloWorld){eval => val Right((result, evalCount)) = eval.apply(HelloWorld.core.scalaVersion) assert( @@ -319,7 +319,7 @@ object HelloWorldTests extends TestSuite { evalCount > 0 ) } - 'override - workspaceTest(HelloWorldScalaOverride){eval => + test("override") - workspaceTest(HelloWorldScalaOverride){eval => val Right((result, evalCount)) = eval.apply(HelloWorldScalaOverride.core.scalaVersion) assert( @@ -329,8 +329,8 @@ object HelloWorldTests extends TestSuite { } } - 'scalacOptions - { - 'emptyByDefault - workspaceTest(HelloWorld){eval => + test("scalacOptions"){ + test("emptyByDefault") - workspaceTest(HelloWorld){eval => val Right((result, evalCount)) = eval.apply(HelloWorld.core.scalacOptions) assert( @@ -338,7 +338,7 @@ object HelloWorldTests extends TestSuite { evalCount > 0 ) } - 'override - workspaceTest(HelloWorldFatalWarnings){ eval => + test("override") - workspaceTest(HelloWorldFatalWarnings){ eval => val Right((result, evalCount)) = eval.apply(HelloWorldFatalWarnings.core.scalacOptions) assert( @@ -348,22 +348,22 @@ object HelloWorldTests extends TestSuite { } } - 'scalaDocOptions - { - 'emptyByDefault - workspaceTest(HelloWorld){eval => + test("scalaDocOptions"){ + test("emptyByDefault") - workspaceTest(HelloWorld){eval => val Right((result, evalCount)) = eval.apply(HelloWorld.core.scalaDocOptions) assert( result.isEmpty, evalCount > 0 ) } - 'override - workspaceTest(HelloWorldDocTitle){ eval => + test("override") - workspaceTest(HelloWorldDocTitle){ eval => val Right((result, evalCount)) = eval.apply(HelloWorldDocTitle.core.scalaDocOptions) assert( result == Seq("-doc-title", "Hello World"), evalCount > 0 ) } - 'extend - workspaceTest(HelloWorldWithDocVersion){ eval => + test("extend") - workspaceTest(HelloWorldWithDocVersion){ eval => val Right((result, evalCount)) = eval.apply(HelloWorldWithDocVersion.core.scalaDocOptions) assert( result == Seq("-Ywarn-unused", "-Xfatal-warnings", "-doc-version", "1.2.3"), @@ -371,7 +371,7 @@ object HelloWorldTests extends TestSuite { ) } // make sure options are passed during ScalaDoc generation - 'docJarWithTitle - workspaceTest( + test("docJarWithTitle") - workspaceTest( HelloWorldDocTitle, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world" ){ eval => @@ -381,14 +381,14 @@ object HelloWorldTests extends TestSuite { os.read(eval.outPath / 'core / 'docJar / 'dest / 'javadoc / "index.html").contains("<span id=\"doc-title\">Hello World") ) } - 'docJarWithVersion - workspaceTest( + test("docJarWithVersion") - workspaceTest( HelloWorldWithDocVersion, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world" ){ eval => // scaladoc generation fails because of "-Xfatal-warnings" flag val Left(Result.Failure("docJar generation failed", None)) = eval.apply(HelloWorldWithDocVersion.core.docJar) } - 'docJarOnlyVersion - workspaceTest( + test("docJarOnlyVersion") - workspaceTest( HelloWorldOnlyDocVersion, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world" ){ eval => @@ -400,8 +400,8 @@ object HelloWorldTests extends TestSuite { } } - 'scalacPluginClasspath - { - 'withMacroParadise - workspaceTest(HelloWorldTypeLevel){eval => + test("scalacPluginClasspath"){ + test("withMacroParadise") - workspaceTest(HelloWorldTypeLevel){eval => val Right((result, evalCount)) = eval.apply(HelloWorldTypeLevel.foo.scalacPluginClasspath) assert( result.nonEmpty, @@ -411,8 +411,8 @@ object HelloWorldTests extends TestSuite { } } - 'scalaDocPluginClasspath - { - 'extend - workspaceTest(HelloWorldTypeLevel){eval => + test("scalaDocPluginClasspath"){ + test("extend") - workspaceTest(HelloWorldTypeLevel){eval => val Right((result, evalCount)) = eval.apply(HelloWorldTypeLevel.foo.scalaDocPluginClasspath) assert( result.nonEmpty, @@ -423,8 +423,8 @@ object HelloWorldTests extends TestSuite { } } - 'compile - { - 'fromScratch - workspaceTest(HelloWorld){eval => + test("compile"){ + test("fromScratch") - workspaceTest(HelloWorld){eval => val Right((result, evalCount)) = eval.apply(HelloWorld.core.compile) val analysisFile = result.analysisFile @@ -445,7 +445,7 @@ object HelloWorldTests extends TestSuite { assert(unchangedEvalCount == 0) } - 'recompileOnChange - workspaceTest(HelloWorld){eval => + test("recompileOnChange") - workspaceTest(HelloWorld){eval => val Right((_, freshCount)) = eval.apply(HelloWorld.core.compile) assert(freshCount > 0) @@ -454,7 +454,7 @@ object HelloWorldTests extends TestSuite { val Right((_, incCompileCount)) = eval.apply(HelloWorld.core.compile) assert(incCompileCount > 0, incCompileCount < freshCount) } - 'failOnError - workspaceTest(HelloWorld){eval => + test("failOnError") - workspaceTest(HelloWorld){eval => os.write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ") val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.compile) @@ -477,14 +477,14 @@ object HelloWorldTests extends TestSuite { val Right((result, evalCount)) = eval.apply(HelloWorld.core.compile) } - 'passScalacOptions - workspaceTest(HelloWorldFatalWarnings){ eval => + test("passScalacOptions") - workspaceTest(HelloWorldFatalWarnings){ eval => // compilation fails because of "-Xfatal-warnings" flag val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorldFatalWarnings.core.compile) } } - 'runMain - { - 'runMainObject - workspaceTest(HelloWorld){eval => + test("runMain"){ + test("runMainObject") - workspaceTest(HelloWorld){eval => val runResult = eval.outPath / 'core / 'runMain / 'dest / "hello-mill" val Right((_, evalCount)) = eval.apply(HelloWorld.core.runMain("Main", runResult.toString)) @@ -495,7 +495,7 @@ object HelloWorldTests extends TestSuite { os.read(runResult) == "hello rockjam, your age is: 25" ) } - 'runCross - { + test("runCross"){ def cross(eval: TestEvaluator, v: String, expectedOut: String) { val runResult = eval.outPath / "hello-mill" @@ -512,18 +512,18 @@ object HelloWorldTests extends TestSuite { os.read(runResult) == expectedOut ) } - 'v210 - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.10.6", "2.10.6 rox"))) - 'v211 - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.11.11", "2.11.11 pwns"))) - 'v2123 - workspaceTest(CrossHelloWorld)(cross(_, "2.12.3", "2.12.3 leet")) - 'v2124 - workspaceTest(CrossHelloWorld)(cross(_, "2.12.4", "2.12.4 leet")) - 'v2130M3 - workspaceTest(CrossHelloWorld)(cross(_, "2.13.0-M3", "2.13.0-M3 idk")) + test("v210") - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.10.6", "2.10.6 rox"))) + test("v211") - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.11.11", "2.11.11 pwns"))) + test("v2123") - workspaceTest(CrossHelloWorld)(cross(_, "2.12.3", "2.12.3 leet")) + test("v2124") - workspaceTest(CrossHelloWorld)(cross(_, "2.12.4", "2.12.4 leet")) + test("v2130M3") - workspaceTest(CrossHelloWorld)(cross(_, "2.13.0-M3", "2.13.0-M3 idk")) } - 'notRunInvalidMainObject - workspaceTest(HelloWorld){eval => + test("notRunInvalidMainObject") - workspaceTest(HelloWorld){eval => val Left(Result.Failure("subprocess failed", _)) = eval.apply(HelloWorld.core.runMain("Invalid")) } - 'notRunWhenCompileFailed - workspaceTest(HelloWorld){eval => + test("notRunWhenCompileFailed") - workspaceTest(HelloWorld){eval => os.write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ") val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.runMain("Main")) @@ -531,8 +531,8 @@ object HelloWorldTests extends TestSuite { } } - 'forkRun - { - 'runIfMainClassProvided - workspaceTest(HelloWorldWithMain){eval => + test("forkRun"){ + test("runIfMainClassProvided") - workspaceTest(HelloWorldWithMain){eval => val runResult = eval.outPath / 'core / 'run / 'dest / "hello-mill" val Right((_, evalCount)) = eval.apply( HelloWorldWithMain.core.run(runResult.toString) @@ -546,14 +546,14 @@ object HelloWorldTests extends TestSuite { os.read(runResult) == "hello rockjam, your age is: 25" ) } - 'notRunWithoutMainClass - workspaceTest( + test("notRunWithoutMainClass") - workspaceTest( HelloWorldWithoutMain, os.pwd / 'scalalib / 'test / 'resources / "hello-world-no-main" ){eval => val Left(Result.Failure(_, None)) = eval.apply(HelloWorldWithoutMain.core.run()) } - 'runDiscoverMainClass - workspaceTest(HelloWorldWithoutMain){eval => + test("runDiscoverMainClass") - workspaceTest(HelloWorldWithoutMain){eval => // Make sure even if there isn't a main class defined explicitly, it gets // discovered by Zinc and used val runResult = eval.outPath / 'core / 'run / 'dest / "hello-mill" @@ -571,8 +571,8 @@ object HelloWorldTests extends TestSuite { } } - 'run - { - 'runIfMainClassProvided - workspaceTest(HelloWorldWithMain){eval => + test("run"){ + test("runIfMainClassProvided") - workspaceTest(HelloWorldWithMain){eval => val runResult = eval.outPath / 'core / 'run / 'dest / "hello-mill" val Right((_, evalCount)) = eval.apply( HelloWorldWithMain.core.runLocal(runResult.toString) @@ -586,7 +586,7 @@ object HelloWorldTests extends TestSuite { os.read(runResult) == "hello rockjam, your age is: 25" ) } - 'runWithDefaultMain - workspaceTest(HelloWorldDefaultMain){eval => + test("runWithDefaultMain") - workspaceTest(HelloWorldDefaultMain){eval => val runResult = eval.outPath / 'core / 'run / 'dest / "hello-mill" val Right((_, evalCount)) = eval.apply( HelloWorldDefaultMain.core.runLocal(runResult.toString) @@ -600,7 +600,7 @@ object HelloWorldTests extends TestSuite { os.read(runResult) == "hello rockjam, your age is: 25" ) } - 'notRunWithoutMainClass - workspaceTest( + test("notRunWithoutMainClass") - workspaceTest( HelloWorldWithoutMain, os.pwd / 'scalalib / 'test / 'resources / "hello-world-no-main" ){eval => @@ -609,8 +609,8 @@ object HelloWorldTests extends TestSuite { } } - 'jar - { - 'nonEmpty - workspaceTest(HelloWorldWithMain){eval => + test("jar"){ + test("nonEmpty") - workspaceTest(HelloWorldWithMain){eval => val Right((result, evalCount)) = eval.apply(HelloWorldWithMain.core.jar) assert( @@ -636,7 +636,7 @@ object HelloWorldTests extends TestSuite { assert(mainClass.contains("Main")) } - 'logOutputToFile - workspaceTest(HelloWorld){eval => + test("logOutputToFile") - workspaceTest(HelloWorld){eval => val outPath = eval.outPath eval.apply(HelloWorld.core.compile) @@ -645,8 +645,8 @@ object HelloWorldTests extends TestSuite { } } - 'assembly - { - 'assembly - workspaceTest(HelloWorldWithMain){ eval => + test("assembly"){ + test("assembly") - workspaceTest(HelloWorldWithMain){ eval => val Right((result, evalCount)) = eval.apply(HelloWorldWithMain.core.assembly) assert( os.exists(result.path), @@ -663,7 +663,7 @@ object HelloWorldTests extends TestSuite { assert(mainClass.contains("Main")) } - 'assemblyRules - { + test("assemblyRules"){ def checkAppend[M <: TestUtil.BaseModule](module: M, target: Target[PathRef]) = workspaceTest(module) { eval => @@ -717,19 +717,19 @@ object HelloWorldTests extends TestSuite { ) } - 'appendWithDeps - checkAppend( + test("appendWithDeps") - checkAppend( HelloWorldAkkaHttpAppend, HelloWorldAkkaHttpAppend.core.assembly ) - 'appendMultiModule - checkAppendMulti( + test("appendMultiModule") - checkAppendMulti( HelloWorldMultiAppend, HelloWorldMultiAppend.core.assembly ) - 'appendPatternWithDeps - checkAppend( + test("appendPatternWithDeps") - checkAppend( HelloWorldAkkaHttpAppendPattern, HelloWorldAkkaHttpAppendPattern.core.assembly ) - 'appendPatternMultiModule - checkAppendMulti( + test("appendPatternMultiModule") - checkAppendMulti( HelloWorldMultiAppendPattern, HelloWorldMultiAppendPattern.core.assembly ) @@ -746,28 +746,28 @@ object HelloWorldTests extends TestSuite { assert(!jarEntries(jarFile).contains("reference.conf")) } - 'excludeWithDeps - checkExclude( + test("excludeWithDeps") - checkExclude( HelloWorldAkkaHttpExclude, HelloWorldAkkaHttpExclude.core.assembly ) - 'excludeMultiModule - checkExclude( + test("excludeMultiModule") - checkExclude( HelloWorldMultiExclude, HelloWorldMultiExclude.core.assembly, resourcePath = helloWorldMultiResourcePath ) - 'excludePatternWithDeps - checkExclude( + test("excludePatternWithDeps") - checkExclude( HelloWorldAkkaHttpExcludePattern, HelloWorldAkkaHttpExcludePattern.core.assembly ) - 'excludePatternMultiModule - checkExclude( + test("excludePatternMultiModule") - checkExclude( HelloWorldMultiExcludePattern, HelloWorldMultiExcludePattern.core.assembly, resourcePath = helloWorldMultiResourcePath ) - 'writeDownstreamWhenNoRule - { - 'withDeps - workspaceTest(HelloWorldAkkaHttpNoRules) { eval => + test("writeDownstreamWhenNoRule"){ + test("withDeps") - workspaceTest(HelloWorldAkkaHttpNoRules) { eval => val Right((result, _)) = eval.apply(HelloWorldAkkaHttpNoRules.core.assembly) val jarFile = new JarFile(result.path.toIO) @@ -789,7 +789,7 @@ object HelloWorldTests extends TestSuite { assert(timesOcccurres == 1) } - 'multiModule - workspaceTest( + test("multiModule") - workspaceTest( HelloWorldMultiNoRules, resourcePath = helloWorldMultiResourcePath ) { eval => @@ -812,7 +812,7 @@ object HelloWorldTests extends TestSuite { } } - 'run - workspaceTest(HelloWorldWithMain){eval => + test("run") - workspaceTest(HelloWorldWithMain){eval => val Right((result, evalCount)) = eval.apply(HelloWorldWithMain.core.assembly) assert( @@ -830,7 +830,7 @@ object HelloWorldTests extends TestSuite { } } - 'ivyDeps - workspaceTest(HelloWorldIvyDeps){ eval => + test("ivyDeps") - workspaceTest(HelloWorldIvyDeps){ eval => val Right((result, _)) = eval.apply(HelloWorldIvyDeps.moduleA.runClasspath) assert( result.exists(_.path.last == "sourcecode_2.12-0.1.3.jar"), @@ -844,7 +844,7 @@ object HelloWorldTests extends TestSuite { ) } - 'typeLevel - workspaceTest(HelloWorldTypeLevel){ eval => + test("typeLevel") - workspaceTest(HelloWorldTypeLevel){ eval => val classPathsToCheck = Seq( HelloWorldTypeLevel.foo.runClasspath, HelloWorldTypeLevel.foo.ammoniteReplClasspath, @@ -864,9 +864,9 @@ object HelloWorldTests extends TestSuite { } } - 'macros - { + test("macros"){ // make sure macros are applied when compiling/running - 'runMain - workspaceTest( + test("runMain") - workspaceTest( HelloWorldMacros, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world-macros" ){ eval => @@ -874,7 +874,7 @@ object HelloWorldTests extends TestSuite { assert(evalCount > 0) } // make sure macros are applied when compiling during scaladoc generation - 'docJar - workspaceTest( + test("docJar") - workspaceTest( HelloWorldMacros, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world-macros" ){ eval => @@ -883,9 +883,9 @@ object HelloWorldTests extends TestSuite { } } - 'flags - { + test("flags"){ // make sure flags are passed when compiling/running - 'runMain - workspaceTest( + test("runMain") - workspaceTest( HelloWorldFlags, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world-flags" ){ eval => @@ -893,7 +893,7 @@ object HelloWorldTests extends TestSuite { assert(evalCount > 0) } // make sure flags are passed during ScalaDoc generation - 'docJar - workspaceTest( + test("docJar") - workspaceTest( HelloWorldFlags, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-world-flags" ){ eval => @@ -902,7 +902,7 @@ object HelloWorldTests extends TestSuite { } } - 'scalacheck - workspaceTest( + test("scalacheck") - workspaceTest( HelloScalacheck, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-scalacheck" ){ eval => @@ -918,7 +918,7 @@ object HelloWorldTests extends TestSuite { ) } - 'dotty - workspaceTest( + test("dotty") - workspaceTest( HelloDotty, resourcePath = os.pwd / 'scalalib / 'test / 'resources / "hello-dotty" ){ eval => diff --git a/scalalib/test/src/ResolveDepsTests.scala b/scalalib/test/src/ResolveDepsTests.scala index 94b8adb9..5722df50 100644 --- a/scalalib/test/src/ResolveDepsTests.scala +++ b/scalalib/test/src/ResolveDepsTests.scala @@ -16,20 +16,20 @@ object ResolveDepsTests extends TestSuite { ) val tests = Tests { - 'resolveValidDeps - { + test("resolveValidDeps"){ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3") val Success(paths) = evalDeps(deps) assert(paths.nonEmpty) } - 'resolveValidDepsWithClassifier - { + test("resolveValidDepsWithClassifier"){ val deps = Agg(ivy"org.lwjgl:lwjgl:3.1.1;classifier=natives-macos") val Success(paths) = evalDeps(deps) assert(paths.nonEmpty) assert(paths.items.next.path.toString.contains("natives-macos")) } - 'resolveTransitiveRuntimeDeps - { + test("resolveTransitiveRuntimeDeps"){ val deps = Agg(ivy"org.mockito:mockito-core:2.7.22") val Success(paths) = evalDeps(deps) assert(paths.nonEmpty) @@ -37,37 +37,37 @@ object ResolveDepsTests extends TestSuite { assert(paths.exists(_.path.toString.contains("byte-buddy"))) } - 'excludeTransitiveDeps - { + test("excludeTransitiveDeps"){ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".exclude("com.lihaoyi" -> "fansi_2.12")) val Success(paths) = evalDeps(deps) assert(!paths.exists(_.path.toString.contains("fansi_2.12"))) } - 'excludeTransitiveDepsByOrg - { + test("excludeTransitiveDepsByOrg"){ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".excludeOrg("com.lihaoyi")) val Success(paths) = evalDeps(deps) assert(!paths.exists(path => path.path.toString.contains("com/lihaoyi") && !path.path.toString.contains("pprint_2.12"))) } - 'excludeTransitiveDepsByName - { + test("excludeTransitiveDepsByName"){ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3".excludeName("fansi_2.12")) val Success(paths) = evalDeps(deps) assert(!paths.exists(_.path.toString.contains("fansi_2.12"))) } - 'errOnInvalidOrgDeps - { + test("errOnInvalidOrgDeps"){ val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3") val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("xxx.yyy.invalid")) } - 'errOnInvalidVersionDeps - { + test("errOnInvalidVersionDeps"){ val deps = Agg(ivy"com.lihaoyi::pprint:invalid.version.num") val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("invalid.version.num")) } - 'errOnPartialSuccess - { + test("errOnPartialSuccess"){ val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3", ivy"fake::fake:fake") val Failure(errMsg, _) = evalDeps(deps) assert(errMsg.contains("fake")) diff --git a/scalalib/test/src/VersionControlTests.scala b/scalalib/test/src/VersionControlTests.scala index fafdca2d..d26a6adf 100644 --- a/scalalib/test/src/VersionControlTests.scala +++ b/scalalib/test/src/VersionControlTests.scala @@ -10,7 +10,7 @@ object VersionContolTests extends TestSuite { import VersionControlConnection._ val tests = Tests { - 'github - { + test("github"){ assert( github("lihaoyi", "mill") == VersionControl( @@ -21,7 +21,7 @@ object VersionContolTests extends TestSuite { ) ) } - 'git - { + test("git"){ assert( gitGit("example.org", "path.git", port = Some(9418)) == "scm:git:git://example.org:9418/path.git" @@ -48,7 +48,7 @@ object VersionContolTests extends TestSuite { ) } - 'svn - { + test("svn"){ assert( svnSsh("example.org", "repo") == "scm:svn:svn+ssh://example.org/repo" diff --git a/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala index af2ea617..3961f5ae 100644 --- a/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala +++ b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala @@ -38,19 +38,19 @@ import utest._ object MetadataLoaderFactoryTests extends TestSuite { val tests = Tests { - 'mavenRepository - { + test("mavenRepository"){ val mavenRepo = MavenRepository("https://repo1.maven.org/maven2") assertMatch(MetadataLoaderFactory(mavenRepo)) { case Some(MavenMetadataLoader(`mavenRepo`)) => } } - 'ivyRepository - { + test("ivyRepository"){ val Right(ivyRepo) = IvyRepository.parse( "https://dl.bintray.com/sbt/sbt-plugin-releases/" + coursier.ivy.Pattern.default.string, dropInfoAttributes = true) assertMatch(MetadataLoaderFactory(ivyRepo)) { case None => } } - 'otherRepository - { + test("otherRepository"){ val otherRepo = new CustomRepository assertMatch(MetadataLoaderFactory(otherRepo)) { case None => } } diff --git a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala index 3b613bcb..dcd029f1 100644 --- a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala +++ b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala @@ -67,108 +67,108 @@ object UpdatesFinderTests extends TestSuite { val tests = Tests { - 'snapshotArtifacts - { + test("snapshotArtifacts"){ val u = updates("1.0.0-SNAPSHOT", available, allowPreRelease = false) val pu = updates("1.0.0-SNAPSHOT", available, allowPreRelease = true) - 'noOldStableVersions - { + test("noOldStableVersions"){ assert(!u.contains("0.9.9")) } - 'noOldMilestones - { + test("noOldMilestones"){ assert(!u.contains("0.9.9-M3")) } - 'noOldSnapshots - { + test("noOldSnapshots"){ assert(!u.contains("0.9.9-SNAPSHOT")) } - 'noCurrentMilestones - { + test("noCurrentMilestones"){ assert(!u.contains("1.0.0-M3")) } - 'noCurrentSnapshot - { + test("noCurrentSnapshot"){ assert(!u.contains("1.0.0-SNAPSHOT")) } - 'stableUpdates - { + test("stableUpdates"){ assert(u.contains("1.0.0") && u.contains("1.0.1")) } - 'milestoneUpdates - { + test("milestoneUpdates"){ assert(u.contains("1.0.1-M3")) } - 'snapshotUpdates - { + test("snapshotUpdates"){ assert(u.contains("1.0.1-SNAPSHOT")) } - 'noDifferencesRegardingOptionalPreReleases - { + test("noDifferencesRegardingOptionalPreReleases"){ assert(u == pu) } } - 'milestoneArtifacts - { + test("milestoneArtifacts"){ val u = updates("1.0.0-M2", available, allowPreRelease = false) val pu = updates("1.0.0-M2", available, allowPreRelease = true) - 'noOldStableVersions - { + test("noOldStableVersions"){ assert(!u.contains("0.9.9")) } - 'noOldSnapshots - { + test("noOldSnapshots"){ assert(!u.contains("0.9.9-SNAPSHOT")) } - 'noOldMilestones - { + test("noOldMilestones"){ assert(!u.contains("0.9.9-M3")) } - 'noCurrentSnapshot - { + test("noCurrentSnapshot"){ assert(!u.contains("1.0.0-SNAPSHOT")) } - 'currentMilestones - { + test("currentMilestones"){ assert(u.contains("1.0.0-M3")) } - 'stableUpdates - { + test("stableUpdates"){ assert(u.contains("1.0.1")) } - 'noSnapshotUpdates - { + test("noSnapshotUpdates"){ assert(!u.contains("1.0.1-SNAPSHOT")) } - 'milestoneUpdates - { + test("milestoneUpdates"){ assert(u.contains("1.0.1-M3")) } - 'noDifferencesRegardingOptionalPreReleases - { + test("noDifferencesRegardingOptionalPreReleases"){ assert(u == pu) } } - 'stableArtifacts - { + test("stableArtifacts"){ val u = updates("1.0.0", available, allowPreRelease = false) val pu = updates("1.0.0", available, allowPreRelease = true) - 'noOldStableVersions - { + test("noOldStableVersions"){ assert(!u.contains("0.9.9")) assert(!pu.contains("0.9.9")) } - 'noOldSnapshots - { + test("noOldSnapshots"){ assert(!u.contains("0.9.9-SNAPSHOT")) assert(!pu.contains("0.9.9-SNAPSHOT")) } - 'noOldMilestones - { + test("noOldMilestones"){ assert(!u.contains("0.9.9-M3")) assert(!pu.contains("0.9.9-M3")) } - 'noCurrentSnapshot - { + test("noCurrentSnapshot"){ assert(!u.contains("1.0.0-SNAPSHOT")) assert(!pu.contains("1.0.0-SNAPSHOT")) } - 'noCurrentMilestones - { + test("noCurrentMilestones"){ assert(!u.contains("1.0.0-M3")) assert(!pu.contains("1.0.0-M3")) } - 'stableUpdates - { + test("stableUpdates"){ assert(u.contains("1.0.1")) assert(pu.contains("1.0.1")) } - 'noSnapshotUpdates - { + test("noSnapshotUpdates"){ assert(!u.contains("1.0.1-SNAPSHOT")) assert(!pu.contains("1.0.1-SNAPSHOT")) } - 'noMilestoneUpdates - { + test("noMilestoneUpdates"){ assert(!u.contains("1.0.1-M3")) } - 'milestoneUpdatesWhenAllowingPreReleases - { + test("milestoneUpdatesWhenAllowingPreReleases"){ assert(pu.contains("1.0.1-M3")) } } diff --git a/scalalib/test/src/dependency/versions/VersionTests.scala b/scalalib/test/src/dependency/versions/VersionTests.scala index b916c86f..f09f1def 100644 --- a/scalalib/test/src/dependency/versions/VersionTests.scala +++ b/scalalib/test/src/dependency/versions/VersionTests.scala @@ -34,8 +34,8 @@ import fastparse.Parsed object VersionTests extends TestSuite { val tests = Tests { - 'versionsClassification - { - 'ReleaseVersion - { + test("versionsClassification"){ + test("ReleaseVersion"){ List("1.0.0", "1.0.0.Final", "1.0.0-FINAL", "1.0.0.RELEASE") foreach { rel => assertMatch(Version(rel)) { @@ -43,26 +43,26 @@ object VersionTests extends TestSuite { } } } - 'PreReleaseVersion - { + test("PreReleaseVersion"){ assertMatch(Version("1.0.0-alpha.1")) { case PreReleaseVersion(List(1, 0, 0), List("alpha", "1")) => } } - 'PreReleaseBuildVersion - { + test("PreReleaseBuildVersion"){ assertMatch(Version("1.0.0-alpha.1+build.10")) { case PreReleaseBuildVersion(List(1, 0, 0), List("alpha", "1"), List("build", "10")) => } } - 'BuildVersion - { + test("BuildVersion"){ assertMatch(Version("1.0.0+build.10")) { case BuildVersion(List(1, 0, 0), List("build", "10")) => } } } - 'semverVersionsOrdering - { + test("semverVersionsOrdering"){ import scala.Ordered._ val v = List( @@ -95,7 +95,7 @@ object VersionTests extends TestSuite { } } - 'parser - { + test("parser"){ Symbol("parse 1.0.5") - { assertMatch(VersionParser.parse("1.0.5")) { diff --git a/scalalib/test/src/publish/IvyTests.scala b/scalalib/test/src/publish/IvyTests.scala index d187f969..4fa52002 100644 --- a/scalalib/test/src/publish/IvyTests.scala +++ b/scalalib/test/src/publish/IvyTests.scala @@ -20,10 +20,10 @@ object IvyTests extends TestSuite { Scope.Compile, exclusions = List("com.lihaoyi" -> "fansi_2.12", "*" -> "sourcecode_2.12")) ) - 'fullIvy - { + test("fullIvy"){ val fullIvy = XML.loadString(Ivy(artifact, deps)) - 'topLevel - { + test("topLevel"){ val info = singleNode(fullIvy \ "info") assert( singleAttr(info, "organisation") == artifact.group, @@ -32,7 +32,7 @@ object IvyTests extends TestSuite { ) } - 'dependencies - { + test("dependencies"){ val dependencies = fullIvy \ "dependencies" \ "dependency" val ivyDeps = deps.indexed diff --git a/scalalib/test/src/publish/PomTests.scala b/scalalib/test/src/publish/PomTests.scala index 307ae379..aeb4070b 100644 --- a/scalalib/test/src/publish/PomTests.scala +++ b/scalalib/test/src/publish/PomTests.scala @@ -39,10 +39,10 @@ object PomTests extends TestSuite { ) ) - 'fullPom - { + test("fullPom"){ val fullPom = pomXml(artifact, deps, artifactId, settings) - 'topLevel - { + test("topLevel"){ assert( singleText(fullPom \ "modelVersion") == "4.0.0", singleText(fullPom \ "name") == artifactId, @@ -55,7 +55,7 @@ object PomTests extends TestSuite { ) } - 'licenses - { + test("licenses"){ val licenses = fullPom \ "licenses" \ "license" assert(licenses.size == 1) @@ -69,7 +69,7 @@ object PomTests extends TestSuite { ) } - 'scm - { + test("scm"){ val scm = (fullPom \ "scm").head val pomScm = settings.versionControl @@ -81,7 +81,7 @@ object PomTests extends TestSuite { ) } - 'developers - { + test("developers"){ val developers = fullPom \ "developers" \ "developer" assert(developers.size == 2) @@ -103,7 +103,7 @@ object PomTests extends TestSuite { ) } - 'dependencies - { + test("dependencies"){ val dependencies = fullPom \ "dependencies" \ "dependency" assert(dependencies.size == 3) @@ -126,7 +126,7 @@ object PomTests extends TestSuite { } } - 'pomEmptyScm - { + test("pomEmptyScm"){ val updatedSettings = settings.copy( versionControl = VersionControl( browsableRepository = Some("git://github.com/lihaoyi/mill.git"), @@ -136,7 +136,7 @@ object PomTests extends TestSuite { )) val pomEmptyScm = pomXml(artifact, deps, artifactId, updatedSettings) - 'scm - { + test("scm"){ val scm = (pomEmptyScm \ "scm").head val pomScm = updatedSettings.versionControl @@ -149,11 +149,11 @@ object PomTests extends TestSuite { } } - 'pomNoLicenses - { + test("pomNoLicenses"){ val updatedSettings = settings.copy(licenses = Seq.empty) val pomNoLicenses = pomXml(artifact, deps, artifactId, updatedSettings) - 'licenses - { + test("licenses"){ assert( (pomNoLicenses \ "licenses").nonEmpty, (pomNoLicenses \ "licenses" \ "licenses").isEmpty @@ -161,13 +161,13 @@ object PomTests extends TestSuite { } } - 'pomNoDeps - { + test("pomNoDeps"){ val pomNoDeps = pomXml(artifact, dependencies = Agg.empty, artifactId = artifactId, pomSettings = settings) - 'dependencies - { + test("dependencies"){ assert( (pomNoDeps \ "dependencies").nonEmpty, (pomNoDeps \ "dependencies" \ "dependency").isEmpty @@ -175,11 +175,11 @@ object PomTests extends TestSuite { } } - 'pomNoDevelopers - { + test("pomNoDevelopers"){ val updatedSettings = settings.copy(developers = Seq.empty) val pomNoDevelopers = pomXml(artifact, deps, artifactId, updatedSettings) - 'developers - { + test("developers"){ assert( (pomNoDevelopers \ "developers").nonEmpty, (pomNoDevelopers \ "developers" \ "developer").isEmpty diff --git a/scalalib/test/src/scalafmt/ScalafmtTests.scala b/scalalib/test/src/scalafmt/ScalafmtTests.scala index dcbdb769..c9a7ffdd 100644 --- a/scalalib/test/src/scalafmt/ScalafmtTests.scala +++ b/scalalib/test/src/scalafmt/ScalafmtTests.scala @@ -34,7 +34,7 @@ object ScalafmtTests extends TestSuite { } def tests: Tests = Tests { - 'scalafmt - { + test("scalafmt"){ def checkReformat(reformatCommand: mill.define.Command[Unit]) = workspaceTest(ScalafmtTestModule) { eval => val before = getProjectFiles(ScalafmtTestModule.core, eval) @@ -82,8 +82,8 @@ object ScalafmtTests extends TestSuite { ) } - 'reformat - checkReformat(ScalafmtTestModule.core.reformat()) - 'reformatAll - checkReformat( + test("reformat") - checkReformat(ScalafmtTestModule.core.reformat()) + test("reformatAll") - checkReformat( ScalafmtModule.reformatAll(Tasks(Seq(ScalafmtTestModule.core.sources)))) } } |