natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop mockito lib, replace with ad-hoc solution, fix the tests.

This commit is contained in:
Fedor Isakov 2020-10-24 23:58:36 +02:00
parent ab31a8fe0d
commit 93b782122a
5 changed files with 2060 additions and 1600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.xml
View File

@ -362,9 +362,6 @@
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" /> <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
<language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" /> <language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
</uses> </uses>
<library jar="lib/objenesis-2.1.jar" />
<library jar="lib/byte-buddy-1.10.17.jar" />
<library jar="lib/mockito-core-2.24.0.jar" />
<classpath> <classpath>
<entry path="." /> <entry path="." />
</classpath> </classpath>
@ -2073,9 +2070,6 @@
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels1" prefix="module/languageModels" /> <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels1" prefix="module/languageModels" />
</jar> </jar>
<mkdir dir="${build.layout}/deploy/lib" /> <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"> <copy todir="${build.layout}/deploy/lib">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib" /> <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib" />
</copy> </copy>
@ -4272,9 +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/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/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.reactor/lib/conreactor-core-0.9.14.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/byte-buddy-1.10.17.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.24.0.jar" />
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.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/junit-4.12.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" /> <fileset file="${artifacts.mps}/lib/annotations.jar" />
@ -4860,9 +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/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/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.reactor/lib/conreactor-core-0.9.14.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/byte-buddy-1.10.17.jar" />
<fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.24.0.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.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/hamcrest-core-1.3.jar" />
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" /> <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />

83
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -753,28 +753,6 @@
</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="1SiIV0" id="1POzLwzdJ2H" role="3bR37C">
<node concept="3bR9La" id="1POzLwzdJ2I" role="1SiIV1"> <node concept="3bR9La" id="1POzLwzdJ2I" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" /> <ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" />
@ -805,50 +783,6 @@
</node> </node>
</node> </node>
</node> </node>
<node concept="1SiIV0" id="1LBj9wAY88D" role="3bR37C">
<node concept="1BurEX" id="1LBj9wAY88E" role="1SiIV1">
<node concept="398BVA" id="1LBj9wAY88t" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
<node concept="2Ry0Ak" id="1LBj9wAY88u" role="iGT6I">
<property role="2Ry0Am" value="coderules" />
<node concept="2Ry0Ak" id="1LBj9wAY88v" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1LBj9wAY88w" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
<node concept="2Ry0Ak" id="1LBj9wAY88x" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="1LBj9wAY88y" role="2Ry0An">
<property role="2Ry0Am" value="byte-buddy-1.10.17.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="1LBj9wB2B9E" role="3bR37C">
<node concept="1BurEX" id="1LBj9wB2B9F" role="1SiIV1">
<node concept="398BVA" id="1LBj9wB2B9u" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
<node concept="2Ry0Ak" id="1LBj9wB2B9v" role="iGT6I">
<property role="2Ry0Am" value="coderules" />
<node concept="2Ry0Ak" id="1LBj9wB2B9w" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1LBj9wB2B9x" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
<node concept="2Ry0Ak" id="1LBj9wB2B9y" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="1LBj9wB2B9z" role="2Ry0An">
<property role="2Ry0Am" value="mockito-core-2.24.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node> </node>
</node> </node>
<node concept="2G$12M" id="65DJywFj0uW" role="3989C9"> <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@ -3239,23 +3173,6 @@
<property role="3MwjfP" value="lib" /> <property role="3MwjfP" value="lib" />
</node> </node>
</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="2HvfSZ" id="46o4wsHoMT0" role="39821P">
<node concept="398BVA" id="46o4wsHoMT1" role="2HvfZ0"> <node concept="398BVA" id="46o4wsHoMT1" role="2HvfZ0">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" /> <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />

3
coderules/solutions/jetbrains.mps.logic.test/build.gradle
View File

@ -3,9 +3,6 @@ configurations {
} }
dependencies { dependencies {
logicTest 'org.objenesis:objenesis:2.1@jar'
logicTest 'org.mockito:mockito-core:2.24.0@jar'
logicTest 'net.bytebuddy:byte-buddy:1.10.17@jar'
} }
task copyDependencies (type: Copy) { task copyDependencies (type: Copy) {

9
coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
View File

@ -4,9 +4,7 @@
<modelRoot contentPath="${module}" type="default"> <modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" /> <sourceRoot location="models" />
</modelRoot> </modelRoot>
<modelRoot contentPath="${module}" type="java_classes"> <modelRoot contentPath="${module}" type="java_classes" />
<sourceRoot location="lib/mockito-core-2.24.0.jar" />
</modelRoot>
</models> </models>
<facets> <facets>
<facet type="tests" /> <facet type="tests" />
@ -14,11 +12,6 @@
<classes generated="true" path="${module}/classes_gen" /> <classes generated="true" path="${module}/classes_gen" />
</facet> </facet>
</facets> </facets>
<stubModelEntries>
<stubModelEntry path="${module}/lib/objenesis-2.1.jar" />
<stubModelEntry path="${module}/lib/byte-buddy-1.10.17.jar" />
<stubModelEntry path="${module}/lib/mockito-core-2.24.0.jar" />
</stubModelEntries>
<sourcePath /> <sourcePath />
<dependencies> <dependencies>
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency> <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>

3553
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
View File

File diff suppressed because it is too large Load Diff