1 files changed, 61 insertions, 0 deletions
diff --git a/src/partest-alternative/scala/tools/partest/util/package.scala b/src/partest-alternative/scala/tools/partest/util/package.scala
new file mode 100644
index 0000000000..bc5470ba5d
--- /dev/null
+++ b/src/partest-alternative/scala/tools/partest/util/package.scala
@@ -0,0 +1,61 @@
+/* NEST (New Scala Test)
+ * Copyright 2007-2010 LAMP/EPFL
+ */
+
+package scala.tools
+package partest
+
+import java.util.{ Timer, TimerTask }
+import java.io.StringWriter
+import nsc.io._
+
+/** Misc code still looking for a good home.
+ */
+package object util {
+
+  def allPropertiesString() = javaHashtableToString(System.getProperties)
+
+  private def javaHashtableToString(table: java.util.Hashtable[_,_]) = {
+    import collection.JavaConversions._
+    (table.toList map { case (k, v) => "%s -> %s\n".format(k, v) }).sorted mkString
+  }
+
+  def filesToSet(pre: String, fs: List[String]): Set[AbstractFile] =
+    fs flatMap (x => Option(AbstractFile getFile (Path(pre) / x).path)) toSet
+
+  /** Copies one Path to another Path, trying to be sensible when one or the
+   *  other is a Directory.  Returns true if it believes it succeeded.
+   */
+  def copyPath(from: Path, to: Path): Boolean = {
+    if (!to.parent.isDirectory)
+      to.parent.createDirectory(force = true)
+
+    def copyDir = {
+      val sub = to / from.name createDirectory true
+      from.toDirectory.list forall (x => copyPath(x, sub))
+    }
+    (from.isDirectory, to.isDirectory) match {
+      case (true, true)   => copyDir
+      case (true, false)  => false
+      case (false, true)  => from.toFile copyTo (to / from.name)
+      case (false, false) => from.toFile copyTo to
+    }
+  }
+
+  /**
+  * Compares two files using a Java implementation of the GNU diff
+  * available at http://www.bmsi.com/java/#diff.
+  *
+  * @param  f1  the first file to be compared
+  * @param  f2  the second file to be compared
+  * @return the text difference between the compared files
+  */
+  def diffFiles(f1: File, f2: File): String = {
+    val diffWriter = new StringWriter
+    val args = Array(f1.toAbsolute.path, f2.toAbsolute.path)
+
+    io.DiffPrint.doDiff(args, diffWriter)
+    val result = diffWriter.toString
+    if (result == "No differences") "" else result
+  }
+}