luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-01 02:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly wrap unknown test data structures in serializable ones

Browse Source
This commit is contained in:
Mark Harrah
2013-06-28 12:12:58 -04:00
parent 3e74b92bf8
commit a1a00526ff
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/agent/src/main/java/sbt/ForkMain.java
+6 -5
View File
@@ -147,7 +147,7 @@ public class ForkMain {
public void warn(String s) { write(os, new Object[]{ForkTags.Warn, s}); }
public void info(String s) { write(os, new Object[]{ForkTags.Info, s}); }
public void debug(String s) { write(os, new Object[]{ForkTags.Debug, s}); }
public void trace(Throwable t) { write(os, t); }
public void trace(Throwable t) { write(os, new ForkError(t)); }
}
};
@@ -254,7 +254,7 @@ public class ForkMain {
} catch (Throwable t) {
try {
logError(os, "Uncaught exception when running tests: " + t.toString());
write(os, t);
write(os, new ForkError(t));
} catch (Throwable t2) {
internalError(t2);
}
@@ -263,7 +263,7 @@ public class ForkMain {
void internalError(Throwable t) {
System.err.println("Internal error when running tests: " + t.toString());
}
ForkEvent testEvent(final String fullyQualifiedName, final Fingerprint fingerprint, final Selector selector, final Status r, final Throwable err, final long duration) {
ForkEvent testEvent(final String fullyQualifiedName, final Fingerprint fingerprint, final Selector selector, final Status r, final ForkError err, final long duration) {
final OptionalThrowable throwable;
if (err == null)
throwable = new OptionalThrowable();
@@ -288,8 +288,9 @@ public class ForkMain {
}
ForkEvent testError(ObjectOutputStream os, TaskDef taskDef, String message, Throwable t) {
logError(os, message);
write(os, t);
return testEvent(taskDef.fullyQualifiedName(), taskDef.fingerprint(), new SuiteSelector(), Status.Error, t, 0);
ForkError fe = new ForkError(t);
write(os, fe);
return testEvent(taskDef.fullyQualifiedName(), taskDef.fingerprint(), new SuiteSelector(), Status.Error, fe, 0);
}
}
}
testing/agent/src/main/java/sbt/FrameworkWrapper.java
+1
View File
@@ -1,6 +1,7 @@
package sbt;
import sbt.testing.*;
import java.io.Serializable;
final class FrameworkWrapper implements Framework {