Homogenize use and definitions with () paramteres

Author: nicolasstucki

common-test/src/main/scala/org/scalatest/prop/CommonGenerators.scala

@@ -2403,7 +2403,7 @@ trait CommonGenerators {
   // classify will need to use the same sizing algo as forAll, and same edges approach
   def classify[A](count: PosInt, genOfA: Generator[A])(pf: PartialFunction[A, String]): Classification = {
 
-    val (initEdges, rnd1) = genOfA.initEdges(100, Randomizer.default())
+    val (initEdges, rnd1) = genOfA.initEdges(100, Randomizer.default)
     @tailrec
     def loop(currentCount: Int, edges: List[A], rnd: Randomizer, acc: Map[String, PosZInt]): Map[String, PosZInt] = {
       if (currentCount >= count) acc

common-test/src/main/scala/org/scalatest/prop/Randomizer.scala

@@ -2204,7 +2204,7 @@ object Randomizer {
   /**
     * This seed is empty under ordinary circumstances. It is here so that the test
     * Runner can poke in a seed value to be used during a test run. If set, it will be used
-    * as the seed for all calls to [[Randomizer.default()]].
+    * as the seed for all calls to [[Randomizer.default]].
     */
   private[scalatest] val defaultSeed: AtomicReference[Option[Long]] = new AtomicReference(None)
 
@@ -2216,7 +2216,7 @@ object Randomizer {
     *
     * @return A Randomizer, ready to begin producing random values.
     */
-  def default(): Randomizer =
+  def default: Randomizer =
     apply(
       defaultSeed.get() match {
         case Some(seed) => seed
@@ -2236,7 +2236,7 @@ object Randomizer {
     * your "random" events.
     *
     * If you want to create an adequate seed to feed into here, the value of [[System.currentTimeMillis()]] is
-    * reasonable (and is used in [[Randomizer.default()]]). It's a somewhat weak seed, but decent for most
+    * reasonable (and is used in [[Randomizer.default]]). It's a somewhat weak seed, but decent for most
     * purposes.
     *
     * @param seed A number that will be used to initialize a new Randomizer.

project/GenResources.scala

@@ -158,12 +158,16 @@ trait GenResourcesJVM extends GenResources {
       if (paramCount > 0)
         "def " + kv.key + "(" + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = makeString(\"" + kv.key + "\", Array(" + (for (i <- 0 until paramCount) yield s"param$i").mkString(", ") + "))"
       else
-        "def " + kv.key + "(): String = resourceBundle.getString(\"" + kv.key + "\")"
+        "def " + kv.key + ": String = resourceBundle.getString(\"" + kv.key + "\")"
     ) + "\n\n" +
     "def raw" + kv.key.capitalize + ": String = resourceBundle.getString(\"" + kv.key + "\")"
 
-  def failureMessagesKeyValueTemplate(kv: KeyValue, paramCount: Int): String =
-    "def " + kv.key + (if (paramCount == 0) "(" else "(prettifier: org.scalactic.Prettifier, ") + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = Resources." + kv.key + "(" + (for (i <- 0 until paramCount) yield s"prettifier.apply(param$i)").mkString(", ") + ")"
+  def failureMessagesKeyValueTemplate(kv: KeyValue, paramCount: Int): String = {
+    if (paramCount == 0)
+      "def " + kv.key + ": String = Resources." + kv.key
+    else
+      "def " + kv.key + "(prettifier: org.scalactic.Prettifier, " + (for (i <- 0 until paramCount) yield s"param$i: Any").mkString(", ") + "): String = Resources." + kv.key + "(" + (for (i <- 0 until paramCount) yield s"prettifier.apply(param$i)").mkString(", ") + ")"
+  }
 
 }
 

scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala

@@ -72,8 +72,8 @@ object Position {
 
     val file = refl.rootPosition.sourceFile
     val fileName: String = file.jpath.getFileName.toString
-    val filePath: String = if (showScalacticFillFilePathnames) file.toString else Resources.pleaseDefineScalacticFillFilePathnameEnvVar()
-    val lineNo: Int = refl.rootPosition.startLine
+    val filePath: String = if (showScalacticFillFilePathnames) file.toString else Resources.pleaseDefineScalacticFillFilePathnameEnvVar
+    val lineNo: Int = rootPosition.startLine
     '{ Position(${fileName.toExpr}, ${filePath.toExpr}, ${lineNo.toExpr}) }
   }
 

scalatest-test/src/test/scala/org/scalatest/prop/GeneratorSpec.scala

@@ -98,11 +98,11 @@ class GeneratorSpec extends FunSpec with Matchers {
     it("should offer a filter method that throws an exception if too many objects are filtered out") {
       val doNotDoThisAtHome = CommonGenerators.ints.filter(i => i == 0) // Only keep zero
       a [IllegalStateException] should be thrownBy {
-        doNotDoThisAtHome.next(SizeParam(PosZInt(0), 100, 100), Nil, Randomizer.default())
+        doNotDoThisAtHome.next(SizeParam(PosZInt(0), 100, 100), Nil, Randomizer.default)
       }
       val okToDoThisAtHome = CommonGenerators.ints.filter(i => i != 0) // Only keep non-zeros
       noException should be thrownBy {
-        okToDoThisAtHome.next(SizeParam(PosZInt(0), 100, 100), Nil, Randomizer.default())
+        okToDoThisAtHome.next(SizeParam(PosZInt(0), 100, 100), Nil, Randomizer.default)
       }
     }
     it("should mix up both i and d when used in a for expression") {
@@ -2808,7 +2808,7 @@ class GeneratorSpec extends FunSpec with Matchers {
       it("should offer a tuple2 generator") {
         val gen = implicitly[Generator[(Int, Int)]]
         val intGen = implicitly[Generator[Int]]
-        val (it8, rnd1) = intGen.shrink(8, Randomizer.default())
+        val (it8, rnd1) = intGen.shrink(8, Randomizer.default)
         val (it18, rnd2)= intGen.shrink(18, rnd1)
         val list8 = it8.toList
         val list18 = it18.toList
@@ -2823,7 +2823,7 @@ class GeneratorSpec extends FunSpec with Matchers {
         val tupGen: Generator[(String, Int)] = Generator.tuple2Generator[String, Int]
         case class Person(name: String, age: Int)
         val persons = for (tup <- tupGen) yield Person(tup._1, tup._2)
-        val (it, _) = persons.shrink(Person("Harry Potter", 32), Randomizer.default())
+        val (it, _) = persons.shrink(Person("Harry Potter", 32), Randomizer.default)
         it.toList should not be empty
       }
     }

scalatest/src/main/scala/org/scalatest/ParallelTestExecution.scala

@@ -155,7 +155,7 @@ trait ParallelTestExecution extends OneInstancePerTest { this: Suite =>
             sorter.distributingTest(testName)
 
           // It will be oneInstance, testName, args.copy(reporter = ...)
-          distribute(new DistributedTestRunnerSuite(newInstance, testName, args), args.copy(tracker = args.tracker.nextTracker))
+          distribute(new DistributedTestRunnerSuite(newInstance, testName, args), args.copy(tracker = args.tracker.nextTracker()))
         }
         else {
           // In test-specific (distributed) instance, so just run the test. (RTINI was

scalatest/src/main/scala/org/scalatest/Suite.scala

@@ -1226,7 +1226,7 @@ trait Suite extends Assertions with Serializable { thisSuite =>
           }
         case Some(distribute) =>
           for (nestedSuite <- nestedSuitesArray) 
-            statusBuffer += distribute(nestedSuite, args.copy(tracker = tracker.nextTracker))
+            statusBuffer += distribute(nestedSuite, args.copy(tracker = tracker.nextTracker()))
       }
     }
     new CompositeStatus(Set.empty ++ statusBuffer)

scalatest/src/main/scala/org/scalatest/concurrent/Conductors.scala

@@ -571,7 +571,7 @@ trait Conductors extends PatienceConfiguration {
           testThreadsStartingCounter.decrement()
 
           // wait for the main thread to say its ok to go.
-          greenLightForTestThreads.await
+          greenLightForTestThreads.await()
 
           // go
           f()

scalatest/src/main/scala/org/scalatest/tools/Durations.scala

@@ -106,7 +106,7 @@ private[scalatest] case class Durations(file: File) {
     }
 
     def getTest(): Test = {
-      val suite = getSuite
+      val suite = getSuite()
       val testOption = suite.tests.find(test => test.name == testName)
 
       if (testOption.isDefined) {

scalatest/src/main/scala/org/scalatest/tools/Framework.scala

@@ -983,7 +983,7 @@ import java.net.{ServerSocket, InetAddress}
         propertiesMap + (Suite.CHOSEN_STYLES -> chosenStyleSet)
 
     if (chosenStyleSet.nonEmpty)
-      println(Resources.deprecatedChosenStyleWarning())
+      println(Resources.deprecatedChosenStyleWarning)
 
     val tagsToInclude: Set[String] = parseCompoundArgIntoSet(tagsToIncludeArgs, "-n")
     val tagsToExclude: Set[String] = parseCompoundArgIntoSet(tagsToExcludeArgs, "-l")