Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.cvsignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java2
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/.cvsignore b/plugins/org.eclipse.emf.cdo.tests/.cvsignore
index f43b3874ca..ef2fbf6ec2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.tests/.cvsignore
@@ -1,3 +1,5 @@
bin
doc
model1X.ecore
+state
+*.log
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch b/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
index d13c4a9d2a..2ac930003e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/tdd/AllTests.java"/>
+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
index 4787a8f259..a1f5e632b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
@@ -68,7 +68,7 @@ public class TDD
}
}
- private static Throwable filterException(Throwable t, Class entry)
+ private static Throwable filterException(Throwable t, Class<? extends Object> entry)
{
StackTraceElement[] stackTrace = t.getStackTrace();
int len;

Back to the top