diff --git a/com.ibm.wala.cast.js.html.nu_validator/.classpath b/com.ibm.wala.cast.js.html.nu_validator/.classpath index c36ab88fd..509e0933a 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/.classpath +++ b/com.ibm.wala.cast.js.html.nu_validator/.classpath @@ -2,6 +2,7 @@ + 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 e9ff0fd64..94a0e7885 100644 --- a/com.ibm.wala.cast.js.html.nu_validator/build.gradle +++ b/com.ibm.wala.cast.js.html.nu_validator/build.gradle @@ -1,6 +1,9 @@ sourceSets { main.java.srcDir 'src' - test.java.srcDir 'tests' + test { + java.srcDir 'tests' + resources.srcDir project(':com.ibm.wala.cast.js.test.data').file('examples-src') + } } dependencies { diff --git a/com.ibm.wala.cast.js.test.data/build.gradle b/com.ibm.wala.cast.js.test.data/build.gradle index 8d0fa25d5..5819a8098 100644 --- a/com.ibm.wala.cast.js.test.data/build.gradle +++ b/com.ibm.wala.cast.js.test.data/build.gradle @@ -30,6 +30,10 @@ task unversionAjaxslt(type: Sync, dependsOn: unpackAjaxslt) { into 'examples-src/ajaxslt' } +task processTestResources(dependsOn: unversionAjaxslt) { +} + clean { delete unversionAjaxslt + delete downloadAjaxslt } diff --git a/com.ibm.wala.cast.js.test/build.gradle b/com.ibm.wala.cast.js.test/build.gradle index ee6135640..90e235e53 100644 --- a/com.ibm.wala.cast.js.test/build.gradle +++ b/com.ibm.wala.cast.js.test/build.gradle @@ -16,4 +16,7 @@ dependencies { testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests') } -processTestResources.dependsOn tasks.getByPath(':com.ibm.wala.cast.js.test.data:unversionAjaxslt') +processTestResources { + // TODO: figure out why we cannot get at tasks from ':com.ibm.wala.cast.js.test.data' + // dependsOn project(':com.ibm.wala.cast.js.test.data').tasks.processTestResources +} diff --git a/com.ibm.wala.ide.jdt.test/build.gradle b/com.ibm.wala.ide.jdt.test/build.gradle index 8bbd93669..91b89f859 100644 --- a/com.ibm.wala.ide.jdt.test/build.gradle +++ b/com.ibm.wala.ide.jdt.test/build.gradle @@ -8,6 +8,8 @@ dependencies { testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214' testCompile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50' testCompile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0' + testCompile 'org.eclipse.platform:org.eclipse.osgi:3.12.50' + testCompile 'org.osgi:org.osgi.core:4.2.0' testCompile project(':com.ibm.wala.cast') testCompile project(':com.ibm.wala.cast.java') testCompile project(':com.ibm.wala.cast.java.ecj') @@ -19,5 +21,4 @@ dependencies { testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.cast.java.test') testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests') testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests') - testRuntime 'org.eclipse.platform:org.eclipse.osgi:3.12.50' } diff --git a/com.ibm.wala.ide.jsdt.tests/build.gradle b/com.ibm.wala.ide.jsdt.tests/build.gradle index 5b8b696cb..6cac0c8f3 100644 --- a/com.ibm.wala.ide.jsdt.tests/build.gradle +++ b/com.ibm.wala.ide.jsdt.tests/build.gradle @@ -5,9 +5,7 @@ dependencies { testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214' testCompile 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0' testCompile 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0' - testCompile 'org.eclipse.platform:org.eclipse.osgi:3.12.50' testCompile 'org.eclipse.wst.jsdt:core:1.0.201.v2010012803' - testCompile 'org.osgi:org.osgi.core:4.2.0' testCompile project(':com.ibm.wala.cast') testCompile project(':com.ibm.wala.cast.js') testCompile project(':com.ibm.wala.cast.js.rhino') @@ -15,4 +13,5 @@ dependencies { testCompile project(':com.ibm.wala.ide.jsdt') testCompile project(':com.ibm.wala.util') testCompile project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests') + testRuntime 'org.eclipse.platform:org.eclipse.osgi:3.12.50' }