Skip to content

Commit

Permalink
exclude artifact methods from generation
Browse files Browse the repository at this point in the history
  • Loading branch information
hughsimpson committed Sep 21, 2024
1 parent c254ce1 commit f966130
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
7 changes: 5 additions & 2 deletions shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ private[clazz] object MockMaker:
privateWithin = Symbol.noSymbol
)

List(mockFunctionSym, overrideSym)
if (definition.symbol.flags.is(Flags.Artifact)) Nil
else List(mockFunctionSym, overrideSym)
},
selfType = None
)
Expand All @@ -143,7 +144,9 @@ private[clazz] object MockMaker:
ClassDef(
cls = classSymbol,
parents = parents,
body = defaultMockName :: mockableDefinitions.flatMap { definition =>
body = defaultMockName :: mockableDefinitions.flatMap {
case definition if definition.symbol.flags.is(Flags.Artifact) => Nil
case definition =>
val mockFunctionValDef: ValDef =
val valSym = classSymbol.declaredField(definition.mockValName)
val mockFunctionClassSymbol = valSym.typeRef.classSymbol.get
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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.test.scalatest

import org.scalamock.scalatest.MockFactory
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class AbstractOverrideMethodTest extends AnyFlatSpec with Matchers with MockFactory {
class A extends B with D
trait B extends C { def foo(): Int = 1 }
trait C { def foo(): Int }
trait D extends C { abstract override def foo(): Int = super.foo() * 2 }

"ScalaTest suite" should "permit mocking classes build with stackable trait pattern" in {
val mockedClass = mock[A]
(mockedClass.foo _).expects().returning(42)
mockedClass.foo() shouldBe 42
}
}

0 comments on commit f966130

Please sign in to comment.