Skip to content

Commit 568c829

Browse files
krzykkrzyk
authored
Stop publishing mockito-inline (#2945)
The tests will remain in the new `inlineTest` subproject. Fixes #2877
1 parent 393f0a1 commit 568c829

28 files changed

+14
-11
lines changed

‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
include("subclass",
6-
"inline",
6+
"inlineTest",
77
"proxy",
88
"extTest",
99
"groovyTest",

‎subprojects/androidTest/androidTest.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ apply from: "$rootDir/gradle/dependencies.gradle"
3838
dependencies {
3939
implementation libraries.kotlin.stdlib
4040

41-
testImplementation project(":inline")
41+
testImplementation project(":")
4242
testImplementation libraries.junit4
4343
testImplementation libraries.junitJupiterApi
4444
testImplementation libraries.junitJupiterEngine

‎subprojects/groovyInlineTest/groovyInlineTest.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Integration test for using mockito-inline with Groovy."
55
apply from: "$rootDir/gradle/dependencies.gradle"
66

77
dependencies {
8-
testImplementation project(":inline")
8+
testImplementation project(":")
99
testImplementation libraries.groovy
1010
testImplementation libraries.junit4
1111
}

‎subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor

-1
This file was deleted.

‎subprojects/inline/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker

-1
This file was deleted.

‎subprojects/inline/inline.gradle renamed to ‎subprojects/inlineTest/inlineTest.gradle

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1+
plugins {
2+
id 'java'
3+
}
4+
15
description = "Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version)"
26

3-
apply from: "$rootDir/gradle/java-library.gradle"
7+
apply from: "$rootDir/gradle/dependencies.gradle"
8+
9+
sourceCompatibility = 11
10+
targetCompatibility = 11
411

512
dependencies {
6-
api project.rootProject
13+
implementation project.rootProject
714
testImplementation libraries.junit4
815
testImplementation libraries.assertj
916
}
1017

1118
tasks.javadoc.enabled = false
1219

13-
//required by the "StressTest.java" and "OneLinerStubStressTest.java"
14-
test.maxHeapSize = "256m"
15-
retryTest.maxHeapSize = "256m"
16-
1720
test {
1821
jvmArgs '--illegal-access=deny'
22+
//required by the "StressTest.java" and "OneLinerStubStressTest.java"
23+
maxHeapSize '256m'
1924
}

‎subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockRuleTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/ConstructionMockRuleTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/ConstructionMockTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/ConstructionMockTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/EnumMockingTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/EnumMockingTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/FinalClassMockingTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/FinalClassMockingTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/HierarchyPreInitializationTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/InOrderVerificationTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/InOrderVerificationTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/InitializationTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/InitializationTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/OneLinerStubStressTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/OneLinerStubStressTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/PluginTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/PluginTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/RecursionTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/RecursionTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/SpyWithConstructorTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/SpyWithConstructorTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StaticMockRuleTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StaticMockRuleTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StaticMockTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StaticMockTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StaticRuleTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StaticRuleTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StaticRunnerTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StaticRunnerTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StressTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StressTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/StubbingLocationTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/StubbingLocationTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/SubconstructorMockTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/SubconstructorMockTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/SuperCallTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/SuperCallTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/bugs/CyclicMockMethodArgumentMemoryLeakTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/bugs/CyclicMockMethodArgumentMemoryLeakTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/bugs/OngoingStubShiftTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/bugs/OngoingStubShiftTest.java

File renamed without changes.

‎subprojects/inline/src/test/java/org/mockitoinline/bugs/SelfSpyReferenceMemoryLeakTest.java renamed to ‎subprojects/inlineTest/src/test/java/org/mockitoinline/bugs/SelfSpyReferenceMemoryLeakTest.java

File renamed without changes.

0 commit comments

Comments
 (0)