From c2b1930248f64a81a91120b886c01c990f430ea7 Mon Sep 17 00:00:00 2001
From: Ben Liblit <liblit@cs.wisc.edu>
Date: Wed, 14 Feb 2018 17:46:05 -0600
Subject: [PATCH] Add some Eclipse dependencies needed only when running tests

This allows two test classes to pass that previously were failing.
Yay!
---
 build.gradle                             | 2 ++
 com.ibm.wala.cast.java.test/build.gradle | 1 -
 com.ibm.wala.ide.jdt.test/build.gradle   | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 202a6a29b..68f8be7b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,11 +21,13 @@ p2AsMaven {
 		repoEclipse '4.7.2'
 		slicingOption 'latestVersionOnly', 'true'
 		iu 'org.eclipse.core.commands'
+		iu 'org.eclipse.core.contenttype'
 		iu 'org.eclipse.core.jobs'
 		iu 'org.eclipse.core.resources'
 		iu 'org.eclipse.core.runtime'
 		iu 'org.eclipse.equinox.app'
 		iu 'org.eclipse.equinox.common'
+		iu 'org.eclipse.equinox.preferences'
 		iu 'org.eclipse.jdt.core'
 		iu 'org.eclipse.jface'
 		iu 'org.eclipse.osgi'
diff --git a/com.ibm.wala.cast.java.test/build.gradle b/com.ibm.wala.cast.java.test/build.gradle
index 0e33e9859..1f6b7e47e 100644
--- a/com.ibm.wala.cast.java.test/build.gradle
+++ b/com.ibm.wala.cast.java.test/build.gradle
@@ -7,7 +7,6 @@ sourceSets.test.java.srcDirs = ['src']
 
 dependencies {
 	testCompile(
-		'eclipse-deps:org.eclipse.core.runtime:+',
 		'junit:junit:4.11',
 		'org.osgi:org.osgi.core:4.2.0',
 		project(':com.ibm.wala.cast'),
diff --git a/com.ibm.wala.ide.jdt.test/build.gradle b/com.ibm.wala.ide.jdt.test/build.gradle
index cd3857279..4358d7ff3 100644
--- a/com.ibm.wala.ide.jdt.test/build.gradle
+++ b/com.ibm.wala.ide.jdt.test/build.gradle
@@ -22,14 +22,16 @@ dependencies {
 		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
 		project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests'),
 		)
+	testRuntime(
+		'eclipse-deps:org.eclipse.core.contenttype:+',
+		'eclipse-deps:org.eclipse.equinox.preferences:+',
+		)
 }
 
 test {
 	maxHeapSize = '1200M'
 
 	// https://github.com/liblit/WALA/issues/5
-	exclude '**/ECJJavaIRTest.class'
-	exclude '**/ECJSyncDuplicatorTest.class'
 	exclude '**/JDTJava15IRTests.class'
 	exclude '**/JDTJavaIRTests.class'