From ec39948ed1333699daf246e2ba37ccec67db5bd2 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 3 Feb 2018 19:16:23 -0800 Subject: Make use of `CrossScalaModule` in `HelloWorldTests` Also standardize the `HelloWorldTests` onto the typical project layout, where the module of interest is nested within a top-level `BaseModule` --- .../resources/hello-world/core/src-2.10/Shim.scala | 5 +++++ .../resources/hello-world/core/src-2.11/Shim.scala | 5 +++++ .../resources/hello-world/core/src-2.12/Shim.scala | 5 +++++ .../test/resources/hello-world/core/src/Main.scala | 18 ++++++++++++++++++ .../test/resources/hello-world/core/src/Result.scala | 7 +++++++ 5 files changed, 40 insertions(+) create mode 100644 scalalib/test/resources/hello-world/core/src-2.10/Shim.scala create mode 100644 scalalib/test/resources/hello-world/core/src-2.11/Shim.scala create mode 100644 scalalib/test/resources/hello-world/core/src-2.12/Shim.scala create mode 100644 scalalib/test/resources/hello-world/core/src/Main.scala create mode 100644 scalalib/test/resources/hello-world/core/src/Result.scala (limited to 'scalalib/test/resources/hello-world/core') diff --git a/scalalib/test/resources/hello-world/core/src-2.10/Shim.scala b/scalalib/test/resources/hello-world/core/src-2.10/Shim.scala new file mode 100644 index 00000000..025cff5c --- /dev/null +++ b/scalalib/test/resources/hello-world/core/src-2.10/Shim.scala @@ -0,0 +1,5 @@ +object Shim{ + def main(args: Array[String]): Unit = { + Main0(args(0), scala.util.Properties.versionNumberString + " rox") + } +} \ No newline at end of file diff --git a/scalalib/test/resources/hello-world/core/src-2.11/Shim.scala b/scalalib/test/resources/hello-world/core/src-2.11/Shim.scala new file mode 100644 index 00000000..d98a6de1 --- /dev/null +++ b/scalalib/test/resources/hello-world/core/src-2.11/Shim.scala @@ -0,0 +1,5 @@ +object Shim{ + def main(args: Array[String]): Unit = { + Main0(args(0), scala.util.Properties.versionNumberString + " pwns") + } +} \ No newline at end of file diff --git a/scalalib/test/resources/hello-world/core/src-2.12/Shim.scala b/scalalib/test/resources/hello-world/core/src-2.12/Shim.scala new file mode 100644 index 00000000..1f3e1c0f --- /dev/null +++ b/scalalib/test/resources/hello-world/core/src-2.12/Shim.scala @@ -0,0 +1,5 @@ +object Shim{ + def main(args: Array[String]): Unit = { + Main0(args(0), scala.util.Properties.versionNumberString + " leet") + } +} \ No newline at end of file diff --git a/scalalib/test/resources/hello-world/core/src/Main.scala b/scalalib/test/resources/hello-world/core/src/Main.scala new file mode 100644 index 00000000..32706d44 --- /dev/null +++ b/scalalib/test/resources/hello-world/core/src/Main.scala @@ -0,0 +1,18 @@ +import scala.collection._ +import java.nio.file.{Files, Paths} + +import Main.{args, greeting} +object Main0{ + def apply(s: String, greeting: String) = { + val resultPath = Paths.get(s) + Files.createDirectories(resultPath.getParent) + Files.write(resultPath, greeting.getBytes) + } +} +object Main extends App { + + val person = Person.fromString("rockjam:25") + val greeting = s"hello ${person.name}, your age is: ${person.age}" + println(greeting) + Main0(args(0), greeting) +} diff --git a/scalalib/test/resources/hello-world/core/src/Result.scala b/scalalib/test/resources/hello-world/core/src/Result.scala new file mode 100644 index 00000000..d7d29a51 --- /dev/null +++ b/scalalib/test/resources/hello-world/core/src/Result.scala @@ -0,0 +1,7 @@ +object Person { + def fromString(s: String): Person = { + val Array(name, age) = s.split(":") + Person(name, age.toInt) + } +} +case class Person(name: String, age: Int) -- cgit v1.2.3