Skip to content

Commit

Permalink
fix some incorrect documentation and messages, add missing author tag
Browse files Browse the repository at this point in the history
  • Loading branch information
jnizet committed Jan 21, 2019
1 parent d93e8af commit 44a92ec
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 4 deletions.
Expand Up @@ -13,6 +13,7 @@ import org.springframework.util.ClassUtils
* {@link MockkClear}.
*
* @author Phillip Webb
* @author JB Nizet
* @since 1.4.0
*/
class ClearMocksTestExecutionListener : AbstractTestExecutionListener() {
Expand Down
Expand Up @@ -12,8 +12,8 @@ import kotlin.collections.LinkedHashSet
import kotlin.reflect.KClass

/**
* Parser to create {@link MockDefinition} and {@link SpyDefinition} instances from
* {@link MockBean @MockBean} and {@link SpyBean @SpyBean} annotations declared on or in a
* Parser to create {@link MockkDefinition} and {@link SpykDefinition} instances from
* {@link MockkBean @MockkBean} and {@link SpykBean @SpykBean} annotations declared on or in a
* class.
*
* @author Phillip Webb
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/ninjasquad/springmockk/MockkClear.kt
Expand Up @@ -7,6 +7,7 @@ import java.util.concurrent.ConcurrentHashMap
* [MockkBean] annotation.
*
* @author Phillip Webb
* @author JB Nizet
* @since 1.4.0
* @see ClearMocksTestExecutionListener
*/
Expand Down
Expand Up @@ -9,6 +9,7 @@ import org.springframework.test.context.MergedContextConfiguration
* A {@link ContextCustomizer} to add MockK support.
*
* @author Phillip Webb
* @author JB Nizet
*/
data class MockkContextCustomizer(private val definitions: Set<Definition>) : ContextCustomizer {

Expand Down
Expand Up @@ -8,6 +8,7 @@ import org.springframework.test.context.ContextCustomizerFactory
* A {@link ContextCustomizerFactory} to add MockK support.
*
* @author Phillip Webb
* @author JB Nizet
*/
class MockkContextCustomizerFactory : ContextCustomizerFactory {
override fun createContextCustomizer(
Expand Down
Expand Up @@ -63,7 +63,7 @@ class MockkPostProcessor(private val definitions: Set<Definition>) : Instantiati
Assert.isInstanceOf(
ConfigurableListableBeanFactory::class.java,
beanFactory,
"Mock beans can only be used with a ConfigurableListableBeanFactory"
"Mockk beans can only be used with a ConfigurableListableBeanFactory"
)
this.beanFactory = beanFactory
}
Expand All @@ -73,7 +73,7 @@ class MockkPostProcessor(private val definitions: Set<Definition>) : Instantiati
Assert.isInstanceOf(
BeanDefinitionRegistry::class.java,
beanFactory,
"@MockBean can only be used on bean factories that implement BeanDefinitionRegistry"
"@MockkBean can only be used on bean factories that implement BeanDefinitionRegistry"
)
postProcessBeanFactory(beanFactory, beanFactory as BeanDefinitionRegistry)
}
Expand Down

0 comments on commit 44a92ec

Please sign in to comment.