Drop mockito lib, replace with ad-hoc solution, fix the tests.
This commit is contained in:
Fedor Isakov
parent
51606b56c7
commit
bf7bad4b4a
|
|
@ -362,8 +362,6 @@
|
|||
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
|
||||
<language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
|
||||
</uses>
|
||||
<library jar="lib/mockito-core-2.0.3-beta.jar" />
|
||||
<library jar="lib/objenesis-2.1.jar" />
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
|
|
@ -2072,9 +2070,6 @@
|
|||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels1" prefix="module/languageModels" />
|
||||
</jar>
|
||||
<mkdir dir="${build.layout}/deploy/lib" />
|
||||
<copy todir="${build.layout}/deploy/lib">
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib" />
|
||||
</copy>
|
||||
<copy todir="${build.layout}/deploy/lib">
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib" />
|
||||
</copy>
|
||||
|
|
@ -4271,8 +4266,6 @@
|
|||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
|
|
@ -4858,8 +4851,6 @@
|
|||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.14.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
|
||||
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
|
||||
|
|
|
|||
|
|
@ -753,50 +753,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="2telgBuBczr" role="3bR37C">
|
||||
<node concept="1BurEX" id="2telgBuBczs" role="1SiIV1">
|
||||
<node concept="398BVA" id="2telgBuBczf" role="1BurEY">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczg" role="iGT6I">
|
||||
<property role="2Ry0Am" value="coderules" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczh" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczi" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczj" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczk" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="mockito-core-2.0.3-beta.jar" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="2telgBuBczD" role="3bR37C">
|
||||
<node concept="1BurEX" id="2telgBuBczE" role="1SiIV1">
|
||||
<node concept="398BVA" id="2telgBuBczt" role="1BurEY">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczu" role="iGT6I">
|
||||
<property role="2Ry0Am" value="coderules" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczv" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczw" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczx" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
<node concept="2Ry0Ak" id="2telgBuBczy" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="objenesis-2.1.jar" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1POzLwzdJ2H" role="3bR37C">
|
||||
<node concept="3bR9La" id="1POzLwzdJ2I" role="1SiIV1">
|
||||
<ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" />
|
||||
|
|
@ -3217,23 +3173,6 @@
|
|||
<property role="3MwjfP" value="lib" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2HvfSZ" id="7Ant4WkHLmU" role="39821P">
|
||||
<node concept="398BVA" id="46o4wsH3plp" role="2HvfZ0">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
|
||||
<node concept="2Ry0Ak" id="46o4wsH3plv" role="iGT6I">
|
||||
<property role="2Ry0Am" value="coderules" />
|
||||
<node concept="2Ry0Ak" id="46o4wsH3plw" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="46o4wsH3plx" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
|
||||
<node concept="2Ry0Ak" id="46o4wsH3ply" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="lib" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2HvfSZ" id="46o4wsHoMT0" role="39821P">
|
||||
<node concept="398BVA" id="46o4wsHoMT1" role="2HvfZ0">
|
||||
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
logicTest 'org.objenesis:objenesis:2.1@jar'
|
||||
logicTest 'org.mockito:mockito-core:2.0.3-beta@jar'
|
||||
}
|
||||
|
||||
task copyDependencies (type: Copy) {
|
||||
|
|
|
|||
|
|
@ -4,20 +4,14 @@
|
|||
<modelRoot contentPath="${module}" type="default">
|
||||
<sourceRoot location="models" />
|
||||
</modelRoot>
|
||||
<modelRoot contentPath="${module}" type="java_classes">
|
||||
<sourceRoot location="lib/mockito-core-2.0.3-beta.jar" />
|
||||
</modelRoot>
|
||||
<modelRoot contentPath="${module}" type="java_classes" />
|
||||
</models>
|
||||
<facets>
|
||||
<facet type="tests" />
|
||||
<facet type="java">
|
||||
<facet type="java" languageLevel="JAVA_8">
|
||||
<classes generated="true" path="${module}/classes_gen" />
|
||||
</facet>
|
||||
</facets>
|
||||
<stubModelEntries>
|
||||
<stubModelEntry path="${module}/lib/mockito-core-2.0.3-beta.jar" />
|
||||
<stubModelEntry path="${module}/lib/objenesis-2.1.jar" />
|
||||
</stubModelEntries>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue