SI-9167 Clarify ScalaVersion parsing

Probably it was unintended to accept "2.." and "2.-11.7".

This commit makes it a bit more regular and also accepts arbitrary
text after the dash in the build string, including newlines.

Since the number parts must be numbers, accept only digits.
That also disallows "2.+11.7", which could be misconstrued as
some sort of range.

As before, the special build string prefixes "rc" and "m" are
case-insensitive, but "FINAL" is not.

1 files changed, 43 insertions, 1 deletions

diff --git a/test/junit/scala/tools/nsc/settings/ScalaVersionTest.scala b/test/junit/scala/tools/nsc/settings/ScalaVersionTest.scala
index 77a2da828e..acbf39fe23 100644
--- a/test/junit/scala/tools/nsc/settings/ScalaVersionTest.scala
+++ b/test/junit/scala/tools/nsc/settings/ScalaVersionTest.scala
@@ -13,6 +13,48 @@ class ScalaVersionTest {
   @Test def versionUnparse() {
     val v = "2.11.3"
 
-    assertEquals(ScalaVersion(v).unparse, v)
+    assertEquals(v, ScalaVersion(v).unparse)
+    assertEquals("2.11.3-RC4", ScalaVersion("2.11.3-rc4").unparse)
+  }
+
+  // SI-9167
+  @Test def `version parses with rigor`() {
+    import settings.{ SpecificScalaVersion => V }
+    import ScalaVersion._
+
+    // no-brainers
+    assertEquals(V(2,11,7,Final), ScalaVersion("2.11.7"))
+    assertEquals(V(2,11,7,Final), ScalaVersion("2.11.7-FINAL"))
+    assertEquals(V(2,11,7,Milestone(3)), ScalaVersion("2.11.7-M3"))
+    assertEquals(V(2,11,7,RC(3)), ScalaVersion("2.11.7-RC3"))
+    assertEquals(V(2,11,7,Development("devbuild")), ScalaVersion("2.11.7-devbuild"))
+
+    // partial-brainers
+    assertEquals(V(2,11,7,Milestone(3)), ScalaVersion("2.11.7-m3"))
+    assertEquals(V(2,11,7,RC(3)), ScalaVersion("2.11.7-rc3"))
+    assertEquals(V(2,11,7,Development("maybegood")), ScalaVersion("2.11.7-maybegood"))
+    assertEquals(V(2,11,7,Development("RCCola")), ScalaVersion("2.11.7-RCCola"))
+    assertEquals(V(2,11,7,Development("RC1.5")), ScalaVersion("2.11.7-RC1.5"))
+    assertEquals(V(2,11,7,Development("")), ScalaVersion("2.11.7-"))
+    assertEquals(V(2,11,7,Development("0.5")), ScalaVersion("2.11.7-0.5"))
+    assertEquals(V(2,11,7,Development("devbuild\nSI-9167")), ScalaVersion("2.11.7-devbuild\nSI-9167"))
+    assertEquals(V(2,11,7,Development("final")), ScalaVersion("2.11.7-final"))
+
+    // oh really
+    assertEquals(NoScalaVersion, ScalaVersion("none"))
+    assertEquals(AnyScalaVersion, ScalaVersion("any"))
+
+    assertThrows[NumberFormatException] { ScalaVersion("2.11.7.2") }
+    assertThrows[NumberFormatException] { ScalaVersion("2.11.7.beta") }
+    assertThrows[NumberFormatException] { ScalaVersion("2.x.7") }
+    assertThrows[NumberFormatException] { ScalaVersion("2.-11.7") }
+    assertThrows[NumberFormatException] { ScalaVersion("2. ") }
+    assertThrows[NumberFormatException] { ScalaVersion("2.1 .7") }
+    assertThrows[NumberFormatException] { ScalaVersion("2.") }
+    assertThrows[NumberFormatException] { ScalaVersion("2..") }
+    assertThrows[NumberFormatException] { ScalaVersion("2...") }
+    assertThrows[NumberFormatException] { ScalaVersion("2-") }
+    assertThrows[NumberFormatException] { ScalaVersion("2-.") } // scalacheck territory
+    assertThrows[NumberFormatException] { ScalaVersion("any.7") }
   }
 }