diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-11-17 10:19:58 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-11-17 10:19:58 +0300 |
| commit | 42fb6114389249c493899915d821105a84d38552 (patch) | |
| tree | 417dd584ec2c1cbcb82b2f115093900e780b01e1 | |
| parent | 1eabd0410f9dc79eafec7297c235ba5ec97bdfe4 (diff) | |
| download | jdk8u-42fb6114389249c493899915d821105a84d38552.tar.gz | |
gradle project: Added junit tests supportjb8u112-b578jb8u112-b576jb8u112-b574jb8u112-b573jb8u112-b572jb8u112-b558jb8u112-b556jb8u112-b555jb8u112-b552jb8u112-b551jb8u112-b550
| -rw-r--r-- | idea/java/.idea/modules/java.iml | 10 | ||||
| -rw-r--r-- | idea/java/build.gradle | 17 |
2 files changed, 22 insertions, 5 deletions
diff --git a/idea/java/.idea/modules/java.iml b/idea/java/.idea/modules/java.iml index 79cc3df..fb4ab9c 100644 --- a/idea/java/.idea/modules/java.iml +++ b/idea/java/.idea/modules/java.iml @@ -28,5 +28,15 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library name="JUnit4"> + <CLASSES> + <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" /> + <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> </component> </module>
\ No newline at end of file diff --git a/idea/java/build.gradle b/idea/java/build.gradle index b094eaf..a8a40cb 100644 --- a/idea/java/build.gradle +++ b/idea/java/build.gradle @@ -1,8 +1,6 @@ apply plugin: 'java' import org.gradle.internal.os.OperatingSystem -import static java.lang.System.out -import static java.lang.System.err repositories { mavenCentral() @@ -21,8 +19,13 @@ def test_jvm = { file('../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath } } + dependencies { antClasspath 'ant-contrib:ant-contrib:20020829', 'org.apache.ant:ant-junit:1.8.1' + testCompile('junit:junit:4.12'){ + exclude group: 'org.hamcrest' + } + testCompile 'org.hamcrest:hamcrest-library:1.3' } @@ -43,10 +46,12 @@ sourceSets.main.java.srcDirs = ["../../jdk/src/share/classes", "../../jdk/src/macosx/classes", "../../jdk/src/windows/classes", - "../../jdk/src/solaris/classes", - "../../jdk/idea/java/tests/src" + "../../jdk/src/solaris/classes" ] + +sourceSets.test.java.srcDirs = ["../../jdk/idea/java/tests/src"] + def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile task make_images << { @@ -66,5 +71,7 @@ task make_clean << { } tasks.compileJava.enabled = false -classes.dependsOn tasks.make_images +tasks.compileTestJava.dependsOn.clear() +classes.dependsOn.clear() +classes.dependsOn tasks.make_images, tasks.compileTestJava tasks.cleanClasses.dependsOn tasks.make_clean |