azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Idea moved to junit-4.12

Browse Source
This commit is contained in:
Nikolay Krasko
2015-03-24 17:16:00 +03:00
parent 2ebdd32267
commit 8e51f1aadd
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/junit_4_11.xml → .idea/libraries/junit_4_12.xml
Generated
+3 -3
View File
@@ -1,16 +1,16 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="junit-4.11"> <library name="junit-4.12">
<ANNOTATIONS> <ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" /> <root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS> </ANNOTATIONS>
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/hamcrest-core-1.3.jar!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/lib/hamcrest-core-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.11.jar!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/lib/junit-4.12.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-1.3-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-1.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/junit-4.11-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/junit-4.12-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
eval4j/eval4j.iml
+2 -3
View File
@@ -10,7 +10,6 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-runtime" level="project" /> <orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="library" name="asm" level="project" /> <orderEntry type="library" name="asm" level="project" />
<orderEntry type="library" scope="TEST" name="junit-4.11" level="project" /> <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
</component> </component>
</module> </module>
idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ import java.util.List;
public class JUnitMembersSearcherTest extends AbstractSearcherTest { public class JUnitMembersSearcherTest extends AbstractSearcherTest {
private static final LightProjectDescriptor junitProjectDescriptor = private static final LightProjectDescriptor junitProjectDescriptor =
new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar")); new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar"));
public void testJunit3() throws IOException { public void testJunit3() throws IOException {
doJUnit3test(); doJUnit3test();
update_dependencies.xml
+1 -1
View File
@@ -218,7 +218,7 @@
<!-- <get-asm-sources-and-rename-packages asm.version="5.0.1"/> --> <!-- <get-asm-sources-and-rename-packages asm.version="5.0.1"/> -->
<!-- Junit Sources --> <!-- Junit Sources -->
<get-maven-library prefix="junit" lib="junit" version="4.11" bin="false"/> <get-maven-library prefix="junit" lib="junit" version="4.12" bin="false"/>
<get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" bin="false"/> <get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" bin="false"/>
<!-- Protocol Buffers --> <!-- Protocol Buffers -->