remove 2.12; move scala-2 tests to scala-2 directory

paulbutcher · Sep 12, 2023 · 4e86d80 · 4e86d80
1 parent 9d86cc4
commit 4e86d80
Show file tree

Hide file tree

Showing 59 changed files with 65 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.2.16")
 lazy val specs2 = Def.setting("org.specs2" %%% "specs2-core" % "4.20.2")
 
 val commonSettings = Defaults.coreDefaultSettings ++ Seq(
-  scalaVersion := "3.3.0",
+  scalaVersion := "3.3.1",
   scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-release:8")
 )
 
@@ -48,9 +48,17 @@ def crossScalaSettings = {
       }
     }
   Seq(
-    crossScalaVersions := Seq("2.12.17", "2.13.11", scalaVersion.value),
+    crossScalaVersions := Seq("2.13.11", scalaVersion.value),
     Compile / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/main").value,
     Test / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/test").value,
+    scalacOptions ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) =>
+          Seq("-Ytasty-reader")
+        case _ =>
+          Seq.empty
+      }
+    },
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) =>

diff --git a/...st/scala/com/example/ControllerTest.scala → .../scala-2/com/example/ControllerTest.scala b/...st/scala/com/example/ControllerTest.scala → .../scala-2/com/example/ControllerTest.scala
diff --git a/...om/example/HigherOrderFunctionsTest.scala → ...om/example/HigherOrderFunctionsTest.scala b/...om/example/HigherOrderFunctionsTest.scala → ...om/example/HigherOrderFunctionsTest.scala
diff --git a/...cala/com/example/OrderSpecification.scala → ...la-2/com/example/OrderSpecification.scala b/...cala/com/example/OrderSpecification.scala → ...la-2/com/example/OrderSpecification.scala
diff --git a/...rc/test/scala/com/example/OrderTest.scala → .../test/scala-2/com/example/OrderTest.scala b/...rc/test/scala/com/example/OrderTest.scala → .../test/scala-2/com/example/OrderTest.scala
diff --git a/...com/example/ReallySimpleExampleTest.scala → ...com/example/ReallySimpleExampleTest.scala b/...com/example/ReallySimpleExampleTest.scala → ...com/example/ReallySimpleExampleTest.scala
@@ -47,7 +47,7 @@ class ReallySimpleExampleTest extends AnyFunSuite with MockFactory {
   test("WithVariableParameters") {
     val australianFormat = mock[Formatter]
 
-    (australianFormat.format _).expects(*).onCall { s: String => s"G'day $s" }.twice()
+    (australianFormat.format _).expects(*).onCall { (s: String) => s"G'day $s" }.twice()
 
     Greetings.sayHello("Wendy", australianFormat)
     Greetings.sayHello("Gray", australianFormat)

diff --git a/...example/mockitostyle/ControllerTest.scala → ...example/mockitostyle/ControllerTest.scala b/...example/mockitostyle/ControllerTest.scala → ...example/mockitostyle/ControllerTest.scala
diff --git a/...ckitostyle/HigherOrderFunctionsTest.scala → ...ckitostyle/HigherOrderFunctionsTest.scala b/...ckitostyle/HigherOrderFunctionsTest.scala → ...ckitostyle/HigherOrderFunctionsTest.scala
diff --git a/.../com/example/mockitostyle/OrderTest.scala → .../com/example/mockitostyle/OrderTest.scala b/.../com/example/mockitostyle/OrderTest.scala → .../com/example/mockitostyle/OrderTest.scala
diff --git a/.../org/scalamock/jstests/JSNativeTest.scala → .../org/scalamock/jstests/JSNativeTest.scala b/.../org/scalamock/jstests/JSNativeTest.scala → .../org/scalamock/jstests/JSNativeTest.scala
diff --git a/...lamock/jstests/matchers/ArgThatTest.scala → ...lamock/jstests/matchers/ArgThatTest.scala b/...lamock/jstests/matchers/ArgThatTest.scala → ...lamock/jstests/matchers/ArgThatTest.scala
diff --git a/...ulbutcher.test/matchers/ArgThatTest.scala → ...ulbutcher.test/matchers/ArgThatTest.scala b/...ulbutcher.test/matchers/ArgThatTest.scala → ...ulbutcher.test/matchers/ArgThatTest.scala
diff --git a/...lbutcher.test/matchers/MatchAnyTest.scala → ...lbutcher.test/matchers/MatchAnyTest.scala b/...lbutcher.test/matchers/MatchAnyTest.scala → ...lbutcher.test/matchers/MatchAnyTest.scala
diff --git a/...utcher.test/mock/JavaMockNamingTest.scala → ...utcher.test/mock/JavaMockNamingTest.scala b/...utcher.test/mock/JavaMockNamingTest.scala → ...utcher.test/mock/JavaMockNamingTest.scala
diff --git a/...paulbutcher.test/mock/JavaMocksTest.scala → ...paulbutcher.test/mock/JavaMocksTest.scala b/...paulbutcher.test/mock/JavaMocksTest.scala → ...paulbutcher.test/mock/JavaMocksTest.scala
diff --git a/...m.paulbutcher.test/mock/MockTestJvm.scala → ...m.paulbutcher.test/mock/MockTestJvm.scala b/...m.paulbutcher.test/mock/MockTestJvm.scala → ...m.paulbutcher.test/mock/MockTestJvm.scala
diff --git a/....test/proxy/ProxyMockManyParamsTest.scala → ....test/proxy/ProxyMockManyParamsTest.scala b/....test/proxy/ProxyMockManyParamsTest.scala → ....test/proxy/ProxyMockManyParamsTest.scala
diff --git a/...aulbutcher.test/proxy/ProxyMockTest.scala → ...aulbutcher.test/proxy/ProxyMockTest.scala b/...aulbutcher.test/proxy/ProxyMockTest.scala → ...aulbutcher.test/proxy/ProxyMockTest.scala
diff --git a/...est/AsyncMockFactoryNoDuplicatedRun.scala → ...est/AsyncMockFactoryNoDuplicatedRun.scala b/...est/AsyncMockFactoryNoDuplicatedRun.scala → ...est/AsyncMockFactoryNoDuplicatedRun.scala
diff --git a/...mock/test/scalatest/ConcurrencyTest.scala → ...mock/test/scalatest/ConcurrencyTest.scala b/...mock/test/scalatest/ConcurrencyTest.scala → ...mock/test/scalatest/ConcurrencyTest.scala
diff --git a/...test/scalatest/MixedMockFactoryTest.scala → ...test/scalatest/MixedMockFactoryTest.scala b/...test/scalatest/MixedMockFactoryTest.scala → ...test/scalatest/MixedMockFactoryTest.scala
diff --git a/...t/scalatest/SuiteScopeProxyMockTest.scala → ...t/scalatest/SuiteScopeProxyMockTest.scala b/...t/scalatest/SuiteScopeProxyMockTest.scala → ...t/scalatest/SuiteScopeProxyMockTest.scala
diff --git a/...alamock/test/specs2/ConcurrencyTest.scala → ...alamock/test/specs2/ConcurrencyTest.scala b/...alamock/test/specs2/ConcurrencyTest.scala → ...alamock/test/specs2/ConcurrencyTest.scala
diff --git a/...t/specs2/SuiteScopeMockParallelTest.scala → ...t/specs2/SuiteScopeMockParallelTest.scala b/...t/specs2/SuiteScopeMockParallelTest.scala → ...t/specs2/SuiteScopeMockParallelTest.scala
diff --git a/...s2/SuiteScopePresetMockParallelTest.scala → ...s2/SuiteScopePresetMockParallelTest.scala b/...s2/SuiteScopePresetMockParallelTest.scala → ...s2/SuiteScopePresetMockParallelTest.scala
diff --git a/...rg/scalamock/proxy/ProxyMockFactory.scala → ...rg/scalamock/proxy/ProxyMockFactory.scala b/...rg/scalamock/proxy/ProxyMockFactory.scala → ...rg/scalamock/proxy/ProxyMockFactory.scala
@@ -37,7 +37,7 @@ trait ProxyMockFactory {
     val classLoader = Thread.currentThread.getContextClassLoader
     val interfaces = Array[Class[_]](classTag[T].runtimeClass, classTag[F].runtimeClass)
     try {
-      JavaProxy.newProxyInstance(classLoader, interfaces, handler).asInstanceOf[T with F with scala.reflect.Selectable]
+      JavaProxy.newProxyInstance(classLoader, interfaces, handler).asInstanceOf[T with F]
     } catch {
       case e: IllegalArgumentException => 
         throw new IllegalArgumentException("Unable to create proxy - possible classloader issue?", e)

diff --git a/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala b/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala
@@ -21,18 +21,20 @@
 package org.scalamock.clazz
 
 import org.scalamock.context.MockContext
-import org.scalamock.function._
+import org.scalamock.function.*
 import org.scalamock.util.Defaultable
+
+import scala.annotation.experimental
 import scala.reflect.Selectable
 
 trait Mock:
   import scala.language.implicitConversions
 
-  inline def mock[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.mock('{mockContext})}
-  inline def stub[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.stub('{mockContext})}
+  @experimental inline def mock[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.mock[T]('{mockContext})}
+  @experimental inline def stub[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.stub[T]('{mockContext})}
 
-  inline def mock[T](mockName: String)(implicit mockContext: MockContext) : T & Selectable = ${MockImpl.mockWithName('{mockName})('{mockContext})}
-  inline def stub[T](mockName: String)(implicit mockContext: MockContext): T & Selectable = ${MockImpl.stubWithName('{mockName})('{mockContext})}
+  @experimental inline def mock[T](mockName: String)(implicit mockContext: MockContext) : T & Selectable = ${MockImpl.mockWithName[T]('{mockName})('{mockContext})}
+  @experimental inline def stub[T](mockName: String)(implicit mockContext: MockContext): T & Selectable = ${MockImpl.stubWithName[T]('{mockName})('{mockContext})}
 
   inline implicit def toMockFunction0[R: Defaultable](f: () => R): MockFunction0[R] = ${MockImpl.toMockFunction0[R]('{f})('{summon[Defaultable[R]]})}
   inline implicit def toMockFunction1[T1, R: Defaultable](f: T1 => R): MockFunction1[T1, R] = ${MockImpl.toMockFunction1[T1, R]('{f})('{summon[Defaultable[R]]})}

diff --git a/shared/src/main/scala-3/org/scalamock/proxy/ProxyMockFactory.scala b/shared/src/main/scala-3/org/scalamock/proxy/ProxyMockFactory.scala
@@ -0,0 +1,46 @@
+// Copyright (c) 2011-2015 ScalaMock Contributors (https://github.com/paulbutcher/ScalaMock/graphs/contributors)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package org.scalamock.proxy
+
+import org.scalamock.context.MockContext
+
+import java.lang.reflect.{InvocationHandler, Proxy as JavaProxy}
+import scala.reflect.{ClassTag, classTag}
+
+trait ProxyMockFactory {
+
+  protected def mock[T : ClassTag](implicit mockContext: MockContext) =
+    createProxy[T, Mock](new MockInvocationHandler(mockContext))
+
+  protected def stub[T : ClassTag](implicit mockContext: MockContext) =
+    createProxy[T, Stub](new StubInvocationHandler(mockContext))
+
+  private def createProxy[T : ClassTag, F : ClassTag](handler: InvocationHandler) = {
+    val classLoader = Thread.currentThread.getContextClassLoader
+    val interfaces = Array[Class[_]](classTag[T].runtimeClass, classTag[F].runtimeClass)
+    try {
+      JavaProxy.newProxyInstance(classLoader, interfaces, handler).asInstanceOf[T with F with scala.reflect.Selectable]
+    } catch {
+      case e: IllegalArgumentException => 
+        throw new IllegalArgumentException("Unable to create proxy - possible classloader issue?", e)
+    }
+  }
+}
diff --git a/...a/com/paulbutcher/test/IsolatedSpec.scala → ...2/com/paulbutcher/test/IsolatedSpec.scala b/...a/com/paulbutcher/test/IsolatedSpec.scala → ...2/com/paulbutcher/test/IsolatedSpec.scala
diff --git a/...butcher/test/features/CallCountTest.scala → ...butcher/test/features/CallCountTest.scala b/...butcher/test/features/CallCountTest.scala → ...butcher/test/features/CallCountTest.scala
diff --git a/...lbutcher/test/features/OrderingTest.scala → ...lbutcher/test/features/OrderingTest.scala b/...lbutcher/test/features/OrderingTest.scala → ...lbutcher/test/features/OrderingTest.scala
diff --git a/...aulbutcher/test/features/ReturnTest.scala → ...aulbutcher/test/features/ReturnTest.scala b/...aulbutcher/test/features/ReturnTest.scala → ...aulbutcher/test/features/ReturnTest.scala
diff --git a/...paulbutcher/test/features/ThrowTest.scala → ...paulbutcher/test/features/ThrowTest.scala b/...paulbutcher/test/features/ThrowTest.scala → ...paulbutcher/test/features/ThrowTest.scala
diff --git a/...utcher/test/matchers/ArgCaptureTest.scala → ...utcher/test/matchers/ArgCaptureTest.scala b/...utcher/test/matchers/ArgCaptureTest.scala → ...utcher/test/matchers/ArgCaptureTest.scala
diff --git a/...lbutcher/test/matchers/MatchersTest.scala → ...lbutcher/test/matchers/MatchersTest.scala b/...lbutcher/test/matchers/MatchersTest.scala → ...lbutcher/test/matchers/MatchersTest.scala
diff --git a/...her/test/matchers/MockParameterTest.scala → ...her/test/matchers/MockParameterTest.scala b/...her/test/matchers/MockParameterTest.scala → ...her/test/matchers/MockParameterTest.scala
diff --git a/...t/mock/MethodsWithDefaultParamsTest.scala → ...t/mock/MethodsWithDefaultParamsTest.scala b/...t/mock/MethodsWithDefaultParamsTest.scala → ...t/mock/MethodsWithDefaultParamsTest.scala
diff --git a/...er/test/mock/MockFunctionNamingTest.scala → ...er/test/mock/MockFunctionNamingTest.scala b/...er/test/mock/MockFunctionNamingTest.scala → ...er/test/mock/MockFunctionNamingTest.scala
diff --git a/...lbutcher/test/mock/MockFunctionTest.scala → ...lbutcher/test/mock/MockFunctionTest.scala b/...lbutcher/test/mock/MockFunctionTest.scala → ...lbutcher/test/mock/MockFunctionTest.scala
diff --git a/...aulbutcher/test/mock/MockNamingTest.scala → ...aulbutcher/test/mock/MockNamingTest.scala b/...aulbutcher/test/mock/MockNamingTest.scala → ...aulbutcher/test/mock/MockNamingTest.scala
diff --git a/.../com/paulbutcher/test/mock/MockTest.scala → .../com/paulbutcher/test/mock/MockTest.scala b/.../com/paulbutcher/test/mock/MockTest.scala → .../com/paulbutcher/test/mock/MockTest.scala
diff --git a/...utcher/test/mock/MockTestManyParams.scala → ...utcher/test/mock/MockTestManyParams.scala b/...utcher/test/mock/MockTestManyParams.scala → ...utcher/test/mock/MockTestManyParams.scala
diff --git a/...her/test/mock/OverloadedMethodsTest.scala → ...her/test/mock/OverloadedMethodsTest.scala b/...her/test/mock/OverloadedMethodsTest.scala → ...her/test/mock/OverloadedMethodsTest.scala
diff --git a/...er/test/stub/StubFunctionNamingTest.scala → ...er/test/stub/StubFunctionNamingTest.scala b/...er/test/stub/StubFunctionNamingTest.scala → ...er/test/stub/StubFunctionNamingTest.scala
diff --git a/...lbutcher/test/stub/StubFunctionTest.scala → ...lbutcher/test/stub/StubFunctionTest.scala b/...lbutcher/test/stub/StubFunctionTest.scala → ...lbutcher/test/stub/StubFunctionTest.scala
diff --git a/...aulbutcher/test/stub/StubNamingTest.scala → ...aulbutcher/test/stub/StubNamingTest.scala b/...aulbutcher/test/stub/StubNamingTest.scala → ...aulbutcher/test/stub/StubNamingTest.scala
diff --git a/.../com/paulbutcher/test/stub/StubTest.scala → .../com/paulbutcher/test/stub/StubTest.scala b/.../com/paulbutcher/test/stub/StubTest.scala → .../com/paulbutcher/test/stub/StubTest.scala
diff --git a/...k/test/scalatest/AsyncSyncMixinTest.scala → ...k/test/scalatest/AsyncSyncMixinTest.scala b/...k/test/scalatest/AsyncSyncMixinTest.scala → ...k/test/scalatest/AsyncSyncMixinTest.scala
diff --git a/...amock/test/scalatest/BasicAsyncTest.scala → ...amock/test/scalatest/BasicAsyncTest.scala b/...amock/test/scalatest/BasicAsyncTest.scala → ...amock/test/scalatest/BasicAsyncTest.scala
diff --git a/.../scalamock/test/scalatest/BasicTest.scala → .../scalamock/test/scalatest/BasicTest.scala b/.../scalamock/test/scalatest/BasicTest.scala → .../scalamock/test/scalatest/BasicTest.scala
diff --git a/...k/test/scalatest/ErrorReportingTest.scala → ...k/test/scalatest/ErrorReportingTest.scala b/...k/test/scalatest/ErrorReportingTest.scala → ...k/test/scalatest/ErrorReportingTest.scala
diff --git a/...k/test/scalatest/FixtureContextTest.scala → ...k/test/scalatest/FixtureContextTest.scala b/...k/test/scalatest/FixtureContextTest.scala → ...k/test/scalatest/FixtureContextTest.scala
diff --git a/...alamock/test/scalatest/PathSpecTest.scala → ...alamock/test/scalatest/PathSpecTest.scala b/...alamock/test/scalatest/PathSpecTest.scala → ...alamock/test/scalatest/PathSpecTest.scala
diff --git a/.../test/scalatest/StackableSuitesTest.scala → .../test/scalatest/StackableSuitesTest.scala b/.../test/scalatest/StackableSuitesTest.scala → .../test/scalatest/StackableSuitesTest.scala
diff --git a/...calatest/SuiteScopeMockParallelTest.scala → ...calatest/SuiteScopeMockParallelTest.scala b/...calatest/SuiteScopeMockParallelTest.scala → ...calatest/SuiteScopeMockParallelTest.scala
diff --git a/...st/SuiteScopePresetMockParallelTest.scala → ...st/SuiteScopePresetMockParallelTest.scala b/...st/SuiteScopePresetMockParallelTest.scala → ...st/SuiteScopePresetMockParallelTest.scala
diff --git a/...org/scalamock/test/specs2/BasicTest.scala → ...org/scalamock/test/specs2/BasicTest.scala b/...org/scalamock/test/specs2/BasicTest.scala → ...org/scalamock/test/specs2/BasicTest.scala
diff --git a/...mock/test/specs2/FixtureContextTest.scala → ...mock/test/specs2/FixtureContextTest.scala b/...mock/test/specs2/FixtureContextTest.scala → ...mock/test/specs2/FixtureContextTest.scala
diff --git a/...ala/yet/another/pkg/YetAnotherClass.scala → ...ala/yet.another.pkg/YetAnotherClass.scala b/...ala/yet/another/pkg/YetAnotherClass.scala → ...ala/yet.another.pkg/YetAnotherClass.scala