Conform the names of generators

Author: ashawley

Diff for: src/test/scala/scala/xml/ProcInstrGen.scala

@@ -5,10 +5,10 @@ import org.scalacheck.Gen
 
 trait ProcInstrGen extends XmlNameGen {
 
-  def validTarget: Gen[String] =
+  val validTarget: Gen[String] =
     genXmlName.suchThat(_.toLowerCase != "xml")
 
-  def validProcText: Gen[String] =
+  val validProcText: Gen[String] =
     genXmlName.suchThat(!_.contains("?>")): Gen[String]
 
   val genProcInstr: Gen[ProcInstr] = for {

Diff for: src/test/scala/scala/xml/XMLSpec.scala

@@ -10,7 +10,7 @@ object XMLSpec extends CheckProperties("XML")
     with NodeGen
     with dtd.DocTypeGen {
 
-  def writerGen: Gen[java.io.Writer] =
+  def genWriter: Gen[java.io.Writer] =
     Gen.const(
       new java.io.OutputStreamWriter(
         new java.io.ByteArrayOutputStream,
@@ -19,7 +19,7 @@ object XMLSpec extends CheckProperties("XML")
     )
 
   implicit val arbWriter = Arbitrary {
-    writerGen
+    genWriter
   }
 
   property("write") = {

Diff for: src/test/scala/scala/xml/XmlStringGen.scala

@@ -11,7 +11,7 @@ trait XmlStringGen extends DocumentGen {
       Gen.const(s"<?xml version='$version' encoding='$encoding'?>")
     )
 
-  val xmlStringGen: Gen[String] = for {
+  val genXmlString: Gen[String] = for {
     document <- Arbitrary.arbitrary[Document]
     encoding <- Gen.const("UTF-8") // java.nio.charset.StandardCharsets.UTF_8.name
     xmlDecl <- xmlDeclGen("1.0", encoding)

Diff for: src/test/scala/scala/xml/factory/XMLLoaderSpec.scala

@@ -30,7 +30,7 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
       override def parser = testParser
     }
 
-  val xmlLoaderGen: Gen[XMLLoader[Elem]] =
+  val genXMLLoader: Gen[XMLLoader[Elem]] =
     Gen.const(
       loader
     )
@@ -40,7 +40,7 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
     val writer: java.io.Writer
   )
 
-  val streamAndWriterGen: Gen[StreamAndWriter] = for {
+  val genStreamAndWriter: Gen[StreamAndWriter] = for {
     out <- Gen.delay(new java.io.ByteArrayOutputStream)
   } yield {
     new StreamAndWriter(
@@ -53,10 +53,10 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
   }
 
   implicit val arbStreamAndWriter = Arbitrary {
-    streamAndWriterGen
+    genStreamAndWriter
   }
 
-  val inputStreamGen: Gen[java.io.InputStream] = for {
+  val genInputStream: Gen[java.io.InputStream] = for {
     inOut <- Arbitrary.arbitrary[StreamAndWriter]
     document <- Arbitrary.arbitrary[Document]
     encoding <- Gen.const("UTF-8") // java.nio.charset.StandardCharsets.UTF_8.name
@@ -77,22 +77,22 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
       minimizeTags
     )
     inOut.writer.flush()
-    val str = inOut.stream.toString(encoding)
+    val str = inOut.stream.toString
     new java.io.StringBufferInputStream(str)
   }
 
   implicit val arbInputStream = Arbitrary {
-    inputStreamGen
+    genInputStream
   }
 
-  val inputSourceGen: Gen[InputSource] = for {
+  val genInputSource: Gen[InputSource] = for {
     is <- Arbitrary.arbitrary[java.io.InputStream]
   } yield {
     Source.fromInputStream(is)
   }
 
   implicit val arbInputSource = Arbitrary {
-    inputSourceGen
+    genInputSource
   }
 
   property("adapter") = {
@@ -134,7 +134,7 @@ object XMLLoaderSpec extends PropertiesFor("factory.XMLLoader")
     // while shrinking since Xerces only throws a SAXParseException,
     // albeit with different message values, but Scalacheck doesn't
     // listen to them.
-    Prop.forAllNoShrink(xmlStringGen) { xml: String =>
+    Prop.forAllNoShrink(genXmlString) { xml: String =>
       loader.loadString(xml)
       Prop.passed
     }

Diff for: src/test/scala/scala/xml/parsing/ConstructingParserGen.scala

@@ -8,7 +8,7 @@ trait ConstructingParserGen extends XmlStringGen {
 
   val genConstructingParser: Gen[ConstructingParser] = for {
     xml <- Gen.oneOf(
-      xmlStringGen: Gen[String],
+      genXmlString: Gen[String],
       Arbitrary.arbitrary[String]
     )
     preserveWS <- Arbitrary.arbitrary[Boolean]