summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-23 03:22:45 (EDT)
committer sefftinge2009-03-23 03:22:45 (EDT)
commit0258857c4a592ef13e7fc2de08c8f920b46a02fb (patch)
tree5f9afd5fb231e20574be45554cbb43da68ef96dd
parentc9a5b4b5b79acee281d9d1b81795aa7e05b4a2e3 (diff)
downloadorg.eclipse.xtext-0258857c4a592ef13e7fc2de08c8f920b46a02fb.zip
org.eclipse.xtext-0258857c4a592ef13e7fc2de08c8f920b46a02fb.tar.gz
org.eclipse.xtext-0258857c4a592ef13e7fc2de08c8f920b46a02fb.tar.bz2
Fixed failing test in IndexAwareResourcesetTest
-rw-r--r--plugins/org.eclipse.emf.index/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java7
2 files changed, 4 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.index/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.index/META-INF/MANIFEST.MF
index 46a2a58..4691276 100644
--- a/plugins/org.eclipse.emf.index/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.index/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.emf.index
Bundle-Version: 0.7.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.4.0";visibility:=reexport
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.4.0";visibility:=reexport,
+ com.google.guice;resolution:=optional
Export-Package: org.eclipse.emf.index,
org.eclipse.emf.index.ecore,
org.eclipse.emf.index.ecore.impl,
diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java
index 38864aa..e13b7a7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java
+++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/indexbased/IndexAwareResourcesetTest.java
@@ -39,9 +39,9 @@ public class IndexAwareResourcesetTest extends AbstractGeneratorTest {
public void testStuff() throws Exception {
IndexAwareResourceSet set = get(IndexAwareResourceSet.class);
+ set.setClasspathURIContext(IndexAwareResourcesetTest.class);
URI uri = URI.createURI("classpath:/" + getClass().getName().replace('.', '/')
+ ".importuritestlanguage");
- System.out.println(uri);
set.getResource(uri, true);
Iterator<EObjectDescriptor> result = set.getStore().eObjectDAO().createQuery().executeListResult()
.iterator();
@@ -96,10 +96,7 @@ public class IndexAwareResourcesetTest extends AbstractGeneratorTest {
}
});
}
-
- /**
- * @return
- */
+
protected INameProvider getNameProvider() {
return this.nameProvider;
}