include testDiscovery in coverage.jar; remove duplicated asm-all

This commit is contained in:
Anna Kozlova
2015-09-15 15:00:18 +03:00
parent 6d50f65056
commit fb7d3b8147
22 changed files with 24 additions and 908 deletions
@@ -22,7 +22,7 @@ public abstract class TestDiscoveryListener {
public void testStarted(String className, String methodName) {
try {
final Object data = getData();
Method testStarted = data.getClass().getMethod("testStarted", new Class[] {String.class});
Method testStarted = data.getClass().getMethod("testDiscoveryStarted", new Class[] {String.class});
testStarted.invoke(data, new Object[] {className + "-" + methodName});
} catch (Throwable t) {
t.printStackTrace();
@@ -33,7 +33,7 @@ public abstract class TestDiscoveryListener {
if (succeed) {
try {
final Object data = getData();
Method testEnded = data.getClass().getMethod("testEnded", new Class[] {String.class});
Method testEnded = data.getClass().getMethod("testDiscoveryEnded", new Class[] {String.class});
testEnded.invoke(data, new Object[] {getFrameworkId() + className + "-" + methodName});
} catch (Throwable t) {
t.printStackTrace();
@@ -42,7 +42,7 @@ public abstract class TestDiscoveryListener {
}
protected Object getData() throws Exception {
return Class.forName("org.jetbrains.testme.instrumentation.ProjectData")
return Class.forName("com.intellij.rt.coverage.data.ProjectData")
.getMethod("getProjectData", new Class[0])
.invoke(null, new Object[0]);
}