Update mockito lib, fix the tests.
This commit is contained in:
Fedor Isakov
parent
51606b56c7
commit
ab31a8fe0d
|
|
@ -362,8 +362,9 @@
|
|||
<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" />
|
||||
<library jar="lib/byte-buddy-1.10.17.jar" />
|
||||
<library jar="lib/mockito-core-2.24.0.jar" />
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
|
|
@ -4271,8 +4272,9 @@
|
|||
<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="${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/junit-4.12.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
|
|
@ -4858,8 +4860,9 @@
|
|||
<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="${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/hamcrest-core-1.3.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
|
||||
|
|
|
|||
|
|
@ -753,28 +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">
|
||||
|
|
@ -827,6 +805,50 @@
|
|||
</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 concept="2G$12M" id="65DJywFj0uW" role="3989C9">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ configurations {
|
|||
|
||||
dependencies {
|
||||
logicTest 'org.objenesis:objenesis:2.1@jar'
|
||||
logicTest 'org.mockito:mockito-core:2.0.3-beta@jar'
|
||||
logicTest 'org.mockito:mockito-core:2.24.0@jar'
|
||||
logicTest 'net.bytebuddy:byte-buddy:1.10.17@jar'
|
||||
}
|
||||
|
||||
task copyDependencies (type: Copy) {
|
||||
|
|
|
|||
|
|
@ -5,18 +5,19 @@
|
|||
<sourceRoot location="models" />
|
||||
</modelRoot>
|
||||
<modelRoot contentPath="${module}" type="java_classes">
|
||||
<sourceRoot location="lib/mockito-core-2.0.3-beta.jar" />
|
||||
<sourceRoot location="lib/mockito-core-2.24.0.jar" />
|
||||
</modelRoot>
|
||||
</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" />
|
||||
<stubModelEntry path="${module}/lib/byte-buddy-1.10.17.jar" />
|
||||
<stubModelEntry path="${module}/lib/mockito-core-2.24.0.jar" />
|
||||
</stubModelEntries>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFEJ9d" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -269,7 +269,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="6MYr6JxszWa" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -293,7 +293,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -314,7 +314,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="6YPNC4Oxbib" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -335,7 +335,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="6YPNC4P9XGv" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -356,7 +356,7 @@
|
|||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFEHVa" role="10QFUP">
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -380,8 +380,8 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFF1GZ" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -403,8 +403,8 @@
|
|||
<node concept="3clFbF" id="5YVX0wIlg0e" role="3cqZAp">
|
||||
<node concept="10QFUN" id="5YVX0wIlg0f" role="3clFbG">
|
||||
<node concept="2YIFZM" id="5YVX0wIlg0i" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
<node concept="3uibUv" id="5YVX0wIlhe5" role="10QFUM">
|
||||
<ref role="3uigEE" to="33ny:~List" resolve="List" />
|
||||
|
|
@ -436,8 +436,8 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFF1T1" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.anyObject()" resolve="anyObject" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -463,8 +463,8 @@
|
|||
<ref role="16sUi3" node="6MYr6Jxs5Fh" resolve="T" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFFamJ" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<node concept="37vLTw" id="2ev$9JFFa$M" role="37wK5m">
|
||||
<ref role="3cqZAo" node="2ev$9JFF9OQ" resolve="root" />
|
||||
</node>
|
||||
|
|
@ -499,8 +499,8 @@
|
|||
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="5YVX0wIlmGB" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<node concept="37vLTw" id="5YVX0wIlmGC" role="37wK5m">
|
||||
<ref role="3cqZAo" node="5YVX0wIlmGv" resolve="root" />
|
||||
</node>
|
||||
|
|
@ -535,8 +535,8 @@
|
|||
</node>
|
||||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFFaOH" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<node concept="37vLTw" id="2ev$9JFFaOI" role="37wK5m">
|
||||
<ref role="3cqZAo" node="2ev$9JFFaOy" resolve="root" />
|
||||
</node>
|
||||
|
|
@ -644,8 +644,8 @@
|
|||
<ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
|
||||
</node>
|
||||
<node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
|
||||
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
|
||||
<ref role="37wK5l" to="n4y8:~ArgumentMatchers.eq(java.lang.Object)" resolve="eq" />
|
||||
<node concept="37vLTw" id="2ev$9JFDJDR" role="37wK5m">
|
||||
<ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
|
||||
</node>
|
||||
|
|
|
|||
Loading…
Reference in New Issue