Scala 3 #490

goshacodes · 2023-09-07T18:13:14Z

Pull Request Checklist

I agree to licence my contributions under the MIT licence
I have added copyright headers to new files

Purpose

Migration to Scala 3.

Write additional tests for:

trait with parameters in constructor.
parameters with & or | type.

Migration notes:

Methods without parameters should be represented as function (Scala 3 restriction)

trait Turtle:
  def getAngle: Double

val t = mock[Turtle]

// this one no longer compiles
(t.getAngle _).expects(*).returns(1.0)

// this one should be used instead
(() => t.getAngle).expects(*).returns(1.0)

Type should be specified for methods with by-name parameters

trait TestTrait:
  def byNameParam(x: => Int): String

val t = mock[TestTrait]

// this one no longer compiles
(t.byNameParam _).expects(*).returns("")

// this one should be used instead
(t.byNameParam(_: Int)).expects(*).returns("")

Vars support becomes super scarse
Abstract vars are not supported anymore, use scala.compiletime.uninitialized instead.
There are multiple issues when trying to override vars, so mocking vars feature is dropped.

trait X:
  var y: Int  // No more compiles
  var y: Int = scala.compile.uninitialized // Should be used instead

Java class mocking is not available without workaround

public class JavaClass {
    public int simpleMethod(String b) { return 4; }
}

val m = mock[JavaClass] // not works anymore

class JavaClassExtended extends JavaClass

val mm = mock[JavaClassExtended] // should be used instead

lrytz · 2023-09-13T16:10:12Z

Facing this one right now

Is this problem still current?

goshacodes · 2023-09-14T13:08:33Z

No, it is fixed

Facing this one right now

Is this problem still current?

goshacodes · 2023-09-14T13:25:18Z

I'm superbusy till next wednesday. If someone want to help, I can add a collaborator to my fork
telegram: @GeorgiIkov
discord: @goshacodes

KuceraMartin · 2024-01-10T08:56:26Z

Hi, is someone working on the code review? Can we do something to help/facilitate it?

goshacodes · 2024-01-21T10:20:37Z

I guess nobody is going to review it, so we should leave it as it is and publish a candidate like M1 or RC1

goshacodes · 2024-01-22T12:10:16Z

@barkhorn

goshacodes · 2024-01-30T05:40:02Z

@barkhorn @paulbutcher Guys, all this is ridiculous, I think we can manage it without waiting another few years passing by

maxcom · 2024-01-31T10:10:21Z

Please release milestone artifacts with Scala 3 support.

SethTisue · 2024-01-31T12:48:17Z

I'm guessing the maintainers aren't seeing these notifications. Has anyone tried contacting them by other means?

barkhorn · 2024-01-31T18:38:13Z

I can take a look at the weekend, but don't have proper access to things at the moment. If anyone else wants to start put some comments in for now, that would be appreciated. Given the size of the change, would make sense to have some more eyes on it.

.github/workflows/scala.yml

SethTisue · 2024-01-31T19:15:30Z

build.sbt

-    }
-  },
-  scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xcheckinit", "-target:jvm-1.8")
+  scalaVersion := "3.3.0",


Suggested change

scalaVersion := "3.3.0",

scalaVersion := "3.3.1",

There is a bug in 3.3.0 which allows us not to use @experimental on every test suite. I think we should use it.

Worth a comment, then.

build.sbt

SethTisue · 2024-01-31T19:18:49Z

I noticed that the assertDoesNotCompile calls in the tests were commented out — what's the reason for that?

goshacodes · 2024-02-01T04:00:13Z

I'll add a comment, thought I did.

scalatest/scalatest#2283

henricook · 2024-02-01T07:57:53Z

Thanks for your activity here both, I was about to start writing scalamock out of my project to get to Scala 3 but what you're doing here gives me hope 🙏🏻

Co-authored-by: Seth Tisue <[email protected]>

barkhorn · 2024-02-04T09:02:32Z

jvm/src/test/scala/com.paulbutcher.test/proxy/ProxyMockTest.scala

        assertResult("it worked") { m.byNameParam(42) }
      }
    }

+/*
+
+    //! TODO - in scala 3 we can't distinguish abstract var setters with non abstract vars setters


this should go into the documentation pages as a known caveat

Added to readme for now

barkhorn · 2024-02-04T09:05:32Z

shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala

@@ -0,0 +1,189 @@
+// Copyright (c) 2011-2015 ScalaMock Contributors (https://github.com/paulbutcher/ScalaMock/graphs/contributors)


i'd remove the year in this line on new files, but not a big deal

barkhorn · 2024-02-04T09:11:38Z

shared/src/test/scala/com/paulbutcher/test/matchers/MatchEpsilonTest.scala

-      assert(new MatchEpsilon(1.0) == 1.0001)
-      assert(new MatchEpsilon(1.0) == 1.0001f)
-      assert(new MatchEpsilon(1.0) == 1)
+      assert(new MatchEpsilon(1.0).equals(1.0))


is .equals() different to ==?
what is this change meant to do?

Scala 3 check types at compile time when using ==. So it is a compile time error

barkhorn · 2024-02-04T09:13:23Z

shared/src/test/scala/com/paulbutcher/test/mock/MockTest.scala

@@ -216,16 +199,16 @@ class MockTest extends AnyFreeSpec with MockFactory with Matchers {
      }
    }

-    //! TODO - currently doesn't work because we can't override concrete vars


worth adding this to the docs, including a brief example, and, if suitable, a workaround?

Added migration notes to readme of this repo

barkhorn · 2024-02-04T09:16:19Z

shared/src/test/scala/org/scalamock/test/scalatest/AsyncSyncMixinTest.scala

  "MockFactory" should "be mixed only with Any*Spec and not Async*Spec traits" in {
    assertCompiles("new AnyFlatSpec with MockFactory")
-    assertDoesNotCompile("new AsyncFlatSpec with MockFactory")
+    //assertDoesNotCompile("new AsyncFlatSpec with MockFactory")


instead of commenting this out, can we mark the test as skipped please?
or at least add a FIXME as that first assertion still holds true.

Added FIXME with issue

barkhorn · 2024-02-04T09:18:19Z

.github/workflows/scala.yml

+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11


is JDK 11 still the best runtime?
17/21 are available as LTS versions now but the class-version may be too high for Scala?

No, we can user latter version

Play framework still supports JDK 11 and I use ScalaMock in a library released for Play, it would be awesome supporting JDK 11 for a while

barkhorn · 2024-02-04T09:23:59Z

A lot of work has clearly gone into that, thank for cleaning up in general. It looks good to me.

As a general comment, I think it would be great if the documentation could follow to explain any caveats with some of the changes. That doesn't have to be right now but I hope someone would pick that up.

goshacodes · 2024-02-13T06:21:52Z

Should I do anything else so we could proceed?

barkhorn · 2024-02-13T07:00:19Z

something has changed in one of the sbt plugins i think. couldn't release to sonatype just now because of missing signature (why is that even still a requirement...). I'll take a look over the coming days to push it out

barkhorn · 2024-02-13T07:28:53Z

released! 🚢

henricook · 2024-02-13T07:40:25Z

I'm probably just jumping the gun before the repositories have updated but it's:

"org.scalamock" %% "scalamock" % "6.0.0-M1" right?

barkhorn · 2024-02-13T08:19:11Z

it's on maven central as usual, so you can reference it the same way: https://central.sonatype.com/artifact/org.scalamock/scalamock_3

henricook · 2024-02-13T08:47:25Z

Thanks, I didn't have the _3 in my previous dep line

Edit: "org.scalamock" %% "scalamock" % "6.0.0-M1" eventually started working for 2.13 - I was just jumping the gun on the repository publishing the artifacts

rbscgh · 2024-03-14T06:22:37Z

great work @goshacodes! really uplifting news this got out 💟

goshacodes added 5 commits September 4, 2023 19:50

prepare build for scala 3

fecf1eb

resolve warnings for scala 3

4257c04

changed 2.13.8 to 2.13.11

8847328

remove 2.11 and move scala-2 macro to scala-2 directory

db8e040

fix crossScalaVersions and tests

a7d15bd

goshacodes force-pushed the scala_3 branch from 67f5599 to fe56569 Compare September 7, 2023 18:23

goshacodes mentioned this pull request Sep 8, 2023

Scala 3 Support #429

Closed

goshacodes force-pushed the scala_3 branch from fe56569 to 4e86d80 Compare September 12, 2023 09:35

goshacodes force-pushed the scala_3 branch from 4e86d80 to 22eea91 Compare September 14, 2023 12:30

goshacodes force-pushed the scala_3 branch from 22eea91 to 9e9f312 Compare September 24, 2023 14:05

tests prepared for scala 3

1fef344

goshacodes force-pushed the scala_3 branch 6 times, most recently from 41ff4b6 to 7092a2a Compare September 28, 2023 19:29

goshacodes force-pushed the scala_3 branch 4 times, most recently from b786953 to 4554e94 Compare October 17, 2023 15:27

goshacodes changed the title ~~[WIP] Scala 3~~ Scala 3 Oct 17, 2023

goshacodes force-pushed the scala_3 branch from 681b8e2 to 4554e94 Compare October 17, 2023 16:19

goshacodes added 3 commits October 17, 2023 22:25

mocks reimplemented with scala 3

c32eedd

restricted vars support

b40375e

java workaround

19dc384

goshacodes force-pushed the scala_3 branch from 26a38f6 to 19dc384 Compare October 17, 2023 16:25

SethTisue reviewed Jan 31, 2024

View reviewed changes

goshacodes and others added 3 commits February 1, 2024 22:54

Update build.sbt

f41f74d

Co-authored-by: Seth Tisue <[email protected]>

Update .github/workflows/scala.yml

8365357

Co-authored-by: Seth Tisue <[email protected]>

add comment about scala 3.3.0

81de4e2

barkhorn reviewed Feb 4, 2024

View reviewed changes

barkhorn mentioned this pull request Feb 4, 2024

update github pages docs for scala 3 #501

Open

KarelCemus mentioned this pull request Feb 4, 2024

Support Scala Version 3 KarelCemus/play-redis#264

Closed

goshacodes added 3 commits February 7, 2024 18:26

review fixes

abd8ead

return java 11 in pipeline

e7ebb7e

review fixes

d53474a

barkhorn merged commit bb5d373 into paulbutcher:master Feb 13, 2024

		@@ -0,0 +1,189 @@
		// Copyright (c) 2011-2015 ScalaMock Contributors (https://github.com/paulbutcher/ScalaMock/graphs/contributors)

Scala 3 #490

Scala 3 #490

Conversation

goshacodes commented Sep 7, 2023 • edited Loading

Pull Request Checklist

Purpose

lrytz commented Sep 13, 2023

goshacodes commented Sep 14, 2023 • edited Loading

goshacodes commented Sep 14, 2023

KuceraMartin commented Jan 10, 2024

goshacodes commented Jan 21, 2024

goshacodes commented Jan 22, 2024

goshacodes commented Jan 30, 2024

maxcom commented Jan 31, 2024

SethTisue commented Jan 31, 2024

barkhorn commented Jan 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SethTisue Feb 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SethTisue commented Jan 31, 2024

goshacodes commented Feb 1, 2024

henricook commented Feb 1, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

barkhorn commented Feb 4, 2024

goshacodes commented Feb 13, 2024

barkhorn commented Feb 13, 2024

barkhorn commented Feb 13, 2024

henricook commented Feb 13, 2024

barkhorn commented Feb 13, 2024

henricook commented Feb 13, 2024 • edited Loading

rbscgh commented Mar 14, 2024

goshacodes commented Sep 7, 2023 •

edited

Loading

goshacodes commented Sep 14, 2023 •

edited

Loading

SethTisue Feb 1, 2024 •

edited

Loading

henricook commented Feb 13, 2024 •

edited

Loading