diff --git a/build.gradle b/build.gradle index ff076f589..2756fe90e 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,6 @@ version '1.5.0-SNAPSHOT' subprojects { subproject -> // skip generic Java setup for the few projects that have no Java code whatsoever switch (subproject.name) { - case 'com.ibm.wala.cast.js.test.data': case 'com.ibm.wala-repository': case ~/.*_feature/: return @@ -79,6 +78,7 @@ subprojects { subproject -> jar.manifest.from('META-INF/MANIFEST.MF') task afterEclipseBuildshipImport(dependsOn: processTestResources) + task afterIntelliJIDEAOpen test { include '**/*Test.class' diff --git a/com.ibm.wala.cast.js.html.nu_validator/build.gradle b/com.ibm.wala.cast.js.html.nu_validator/build.gradle index aa1a76da1..08fc0b6b8 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/build.gradle +++ b/com.ibm.wala.cast.js.html.nu_validator/build.gradle @@ -1,9 +1,6 @@ sourceSets { main.java.srcDirs = ['src'] - test { - java.srcDirs = ['tests'] - resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')] - } + test.java.srcDirs = ['tests'] } dependencies { @@ -21,6 +18,12 @@ dependencies { ) } +processTestResources { + def data = project(':com.ibm.wala.cast.js.test.data') + dependsOn data.processTestResources + from data.sourceSets.test.resources +} + test { maxHeapSize = '800M' } diff --git a/com.ibm.wala.cast.js.rhino.test/build.gradle b/com.ibm.wala.cast.js.rhino.test/build.gradle index 44c9f1677..21ad888b3 100644 --- a/com.ibm.wala.cast.js.rhino.test/build.gradle +++ b/com.ibm.wala.cast.js.rhino.test/build.gradle @@ -2,10 +2,7 @@ plugins { id 'com.github.hauner.jarTest' } -sourceSets.test { - java.srcDirs = ['harness-src'] - resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')] -} +sourceSets.test.java.srcDirs = ['harness-src'] dependencies { testCompile( @@ -22,6 +19,12 @@ dependencies { ) } +processTestResources { + def data = project(':com.ibm.wala.cast.js.test.data') + dependsOn data.processTestResources + from data.sourceSets.test.resources +} + test { environment 'TRAVIS', 1 maxHeapSize = '800M' diff --git a/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..35068d95f --- /dev/null +++ b/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/com.ibm.wala.cast.js.test.data/build.gradle b/com.ibm.wala.cast.js.test.data/build.gradle index 0f3d1ad90..89232a1e8 100644 --- a/com.ibm.wala.cast.js.test.data/build.gradle +++ b/com.ibm.wala.cast.js.test.data/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'base' -} +sourceSets.test.resources.srcDirs = ['examples-src'] task downloadAjaxslt(type: VerifiedDownload) { def version = '0.8.1' @@ -21,3 +19,5 @@ task unpackAjaxslt(type: Sync, dependsOn: downloadAjaxslt) { } clean.dependsOn cleanUnpackAjaxslt + +processTestResources.dependsOn(unpackAjaxslt) diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle index 350c43d03..37007296f 100644 --- a/com.ibm.wala.cast.js.test/build.gradle +++ b/com.ibm.wala.cast.js.test/build.gradle @@ -2,10 +2,7 @@ plugins { id 'com.github.hauner.jarTest' } -sourceSets.test { - java.srcDirs = ['harness-src'] - resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')] -} +sourceSets.test.java.srcDirs = ['harness-src'] dependencies { testCompile( @@ -21,7 +18,11 @@ dependencies { ) } -processTestResources.dependsOn ':com.ibm.wala.cast.js.test.data:unpackAjaxslt' +processTestResources { + def data = project(':com.ibm.wala.cast.js.test.data') + dependsOn data.processTestResources + from data.sourceSets.test.resources +} test { maxHeapSize = '800M' diff --git a/com.ibm.wala.cast.test/build.gradle b/com.ibm.wala.cast.test/build.gradle index b570fb2d0..0c2d4f35a 100644 --- a/com.ibm.wala.cast.test/build.gradle +++ b/com.ibm.wala.cast.test/build.gradle @@ -6,6 +6,7 @@ plugins { } eclipse.project.natures 'org.eclipse.pde.PluginNature' +afterIntelliJIDEAOpen.dependsOn jarTest sourceSets.test.java.srcDirs = ['harness-src/java'] diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index edc5a89a2..7cbae0395 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -93,6 +93,7 @@ clean.dependsOn cleanCopyDxJar compileTestJava.dependsOn copyDxJar afterEclipseBuildshipImport.dependsOn copyDxJar +afterIntelliJIDEAOpen.dependsOn copyDxJar task copyAndroidJar(type: Sync, dependsOn: installAndroidSdk) { from "${installAndroidSdk.destinationDir}/platforms/${installAndroidSdk.components['platforms']}/android.jar"