Start compiling the examples again, and fix a bug that stopped proxy …

…mocks and generated mocks from co-existing
paulbutcher · Jan 9, 2012 · dc3595c · dc3595c
1 parent 3a3bc7c
commit dc3595c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/core/src/main/scala/org/scalamock/ClassLoaderStrategy.scala b/core/src/main/scala/org/scalamock/ClassLoaderStrategy.scala
@@ -24,6 +24,14 @@ trait ClassLoaderStrategy {
   def getClassLoader(interfaces: Class[_]*): ClassLoader
 }
 
+object ClassLoaderStrategy {
+  var default: ClassLoaderStrategy = threadContextClassLoaderStrategy
+}
+
 object threadContextClassLoaderStrategy extends ClassLoaderStrategy {
   def getClassLoader(interfaces: Class[_]*) = Thread.currentThread.getContextClassLoader
+}
+
+object classClassLoaderStrategy extends ClassLoaderStrategy {
+  def getClassLoader(interfaces: Class[_]*) = interfaces.head.getClassLoader
 }
diff --git a/core/src/main/scala/org/scalamock/ProxyMockFactory.scala b/core/src/main/scala/org/scalamock/ProxyMockFactory.scala
@@ -24,10 +24,10 @@ import scala.collection.mutable.{ListBuffer, Map}
 
 trait ProxyMockFactory { self: MockFactoryBase =>
 
-  protected var proxyClassLoaderStrategy = threadContextClassLoaderStrategy
+  protected def getClassLoaderStrategy = ClassLoaderStrategy.default
 
   protected def mock[T: ClassManifest] = {
-    val proxy = Proxy.create(proxyClassLoaderStrategy, classOf[Mock], classManifest[T].erasure) {
+    val proxy = Proxy.create(getClassLoaderStrategy, classOf[Mock], classManifest[T].erasure) {
       (proxy: AnyRef, name: Symbol, args: Array[AnyRef]) =>
         try {
           name match {

diff --git a/frameworks/scalatest/src/main/scala/org/scalamock/scalatest/MockFactory.scala b/frameworks/scalatest/src/main/scala/org/scalamock/scalatest/MockFactory.scala
@@ -20,7 +20,7 @@
 
 package org.scalamock.scalatest
 
-import org.scalamock.{MockFactoryBase, MockingURLClassLoader}
+import org.scalamock.{ClassLoaderStrategy, classClassLoaderStrategy, MockFactoryBase, MockingURLClassLoader}
 import org.scalatest.{AbstractSuite, Distributor, Filter, Reporter, Stopper, Suite, Tracker}
 import java.net.URL
 
@@ -50,6 +50,9 @@ trait MockFactory extends AbstractSuite with MockFactoryBase { this: Suite =>
   def runInternal(testName: Option[String], reporter: Reporter, stopper: Stopper, filter: Filter,
     configMap: Map[String, Any], distributor: Option[Distributor], tracker: Tracker) {
 
+    if (configMap contains "mock.classes")
+      ClassLoaderStrategy.default = classClassLoaderStrategy
+
     super.runTests(testName, reporter, stopper, filter, configMap, distributor, tracker)
   }