Make Eval tests pass and add them to cbt tests

2 files changed, 10 insertions, 6 deletions

diff --git a/libraries/eval/Eval.scala b/libraries/eval/Eval.scala
index 395fc2f..ff87651 100644
--- a/libraries/eval/Eval.scala
+++ b/libraries/eval/Eval.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.twitter.util
+package cbt.eval
 
 import java.io._
 import java.math.BigInteger
@@ -265,11 +265,11 @@ class Eval(target: Option[File]) {
     compiler.findClass(className).getOrElse { throw new ClassNotFoundException("no such class: " + className) }
   }
 
-  private[util] def resetReporter(): Unit = {
+  private[eval] def resetReporter(): Unit = {
     compiler.resetReporter()
   }
 
-  private[util] def uniqueId(code: String, idOpt: Option[Int] = Some(jvmId)): String = {
+  private[eval] def uniqueId(code: String, idOpt: Option[Int] = Some(jvmId)): String = {
     val digest = MessageDigest.getInstance("SHA-1").digest(code.getBytes())
     val sha = new BigInteger(1, digest).toString(16)
     idOpt match {
@@ -278,7 +278,7 @@ class Eval(target: Option[File]) {
     }
   }
 
-  private[util] def fileToClassName(f: File): String = {
+  private[eval] def fileToClassName(f: File): String = {
     // HOPE YOU'RE HAPPY GUYS!!!!
     /*          __
      *    __/|_/ /_  __  ______ ________/|_
@@ -389,7 +389,7 @@ class Eval(target: Option[File]) {
 
   class ClassLoaderResolver(classLoader: ClassLoader) extends Resolver {
     private[this] def quotePath(path: String) =
-      "/" + path
+      /*"/" +*/ path
 
     def resolvable(path: String): Boolean = {
       classLoader.getResourceAsStream(quotePath(path)) != null
diff --git a/libraries/eval/test/EvalTest.scala b/libraries/eval/test/EvalTest.scala
index c9d33b3..0489fba 100644
--- a/libraries/eval/test/EvalTest.scala
+++ b/libraries/eval/test/EvalTest.scala
@@ -1,4 +1,4 @@
-package com.twitter.util
+package cbt.eval.test
 
 import java.io.{File, FileWriter}
 import org.scalatest.WordSpec
@@ -10,6 +10,10 @@ import scala.tools.nsc.reporters.{AbstractReporter, Reporter}
 import java.nio.file._
 
 class EvalTest extends WordSpec {
+  class Eval(f: Option[File] = None) extends cbt.eval.Eval(f){
+    override def classLoader = EvalTest.this.getClass.getClassLoader
+  }
+  object Eval extends Eval(None)
   def fromResourcePath(path: String): File = {
     assert(path.endsWith(".scala"))
     val tmpFile = File.createTempFile(path.stripSuffix(".scala"),"scala")