@@ -19,18 +19,20 @@ package org.spockframework.mock.runtime.mockito
1919import org.mockito.MockMakers
2020import org.mockito.Mockito
2121import org.mockito.exceptions.base.MockitoException
22- import org.spockframework.mock.CannotCreateMockException
23- import org.spockframework.mock.MockUtil
24- import org.spockframework.mock.runtime.ByteBuddyTestClassLoader
25- import org.spockframework.runtime.GroovyRuntimeUtil
2622import spock.lang.Issue
2723import spock.lang.Requires
2824import spock.lang.Specification
2925import spock.mock.DetachedMockFactory
26+ import spock.util.environment.Jvm
3027
3128import java.lang.reflect.Proxy
3229import java.util.concurrent.Callable
3330
31+ import org.spockframework.mock.CannotCreateMockException
32+ import org.spockframework.mock.MockUtil
33+ import org.spockframework.mock.runtime.ByteBuddyTestClassLoader
34+ import org.spockframework.runtime.GroovyRuntimeUtil
35+
3436import static spock.mock.MockMakers.mockito
3537
3638@SuppressWarnings (" GroovyAssignabilityCheck" )
@@ -442,12 +444,17 @@ Can not mock final classes with the following settings :
442444 }
443445
444446 def " Class is not mockable sample for asking org.mockito.plugins.MockMaker.isTypeMockable" () {
447+ given :
448+ def expectedMessage = Jvm . current. java8
449+ ? " Cannot create mock for class java.lang.Class. mockito: Cannot mock wrapper types, String.class or Class.class"
450+ : " Cannot create mock for class java.lang.Class. mockito: Cannot mock primitive wrapper types, String, Class, or WeakReference"
451+
445452 when :
446453 Mock (mockMaker : mockito, Class )
447454
448455 then :
449456 CannotCreateMockException ex = thrown()
450- ex. message == " Cannot create mock for class java.lang.Class. mockito: Cannot mock wrapper types, String.class or Class.class "
457+ ex. message == expectedMessage
451458 }
452459
453460 def " mockito mock setting without mockito settings shall not fail" () {
0 commit comments