luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TestFingerprintWrapper no longer necessary

This commit is contained in:
Mark Harrah 2013-06-28 11:18:17 -04:00
parent 851451a90a
commit 3e74b92bf8
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
testing/agent/src/main/java/sbt/FrameworkWrapper.java
View File

@ -2,7 +2,7 @@ package sbt;
import sbt.testing.*; import sbt.testing.*;
public class FrameworkWrapper implements Framework { final class FrameworkWrapper implements Framework {
private org.scalatools.testing.Framework oldFramework; private org.scalatools.testing.Framework oldFramework;
@ -21,7 +21,7 @@ public class FrameworkWrapper implements Framework {
for (int i=0; i < length; i++) { for (int i=0; i < length; i++) {
org.scalatools.testing.Fingerprint oldFingerprint = oldFingerprints[i]; org.scalatools.testing.Fingerprint oldFingerprint = oldFingerprints[i];
if (oldFingerprint instanceof org.scalatools.testing.TestFingerprint) if (oldFingerprint instanceof org.scalatools.testing.TestFingerprint)
fingerprints[i] = new TestFingerprintWrapper((org.scalatools.testing.TestFingerprint) oldFingerprint); fingerprints[i] = new SubclassFingerprintWrapper((org.scalatools.testing.TestFingerprint) oldFingerprint);
else if (oldFingerprint instanceof org.scalatools.testing.SubclassFingerprint) else if (oldFingerprint instanceof org.scalatools.testing.SubclassFingerprint)
fingerprints[i] = new SubclassFingerprintWrapper((org.scalatools.testing.SubclassFingerprint) oldFingerprint); fingerprints[i] = new SubclassFingerprintWrapper((org.scalatools.testing.SubclassFingerprint) oldFingerprint);
else else
@ -35,7 +35,7 @@ public class FrameworkWrapper implements Framework {
} }
} }
class SubclassFingerprintWrapper implements SubclassFingerprint { final class SubclassFingerprintWrapper implements SubclassFingerprint {
private String superclassName; private String superclassName;
private boolean isModule; private boolean isModule;
private boolean requireNoArgConstructor; private boolean requireNoArgConstructor;
@ -59,7 +59,7 @@ class SubclassFingerprintWrapper implements SubclassFingerprint {
} }
} }
class AnnotatedFingerprintWrapper implements AnnotatedFingerprint { final class AnnotatedFingerprintWrapper implements AnnotatedFingerprint {
private String annotationName; private String annotationName;
private boolean isModule; private boolean isModule;
@ -77,14 +77,7 @@ class AnnotatedFingerprintWrapper implements AnnotatedFingerprint {
} }
} }
class TestFingerprintWrapper extends SubclassFingerprintWrapper { final class EventHandlerWrapper implements org.scalatools.testing.EventHandler {
public TestFingerprintWrapper(org.scalatools.testing.TestFingerprint oldFingerprint) {
super(oldFingerprint);
}
}
class EventHandlerWrapper implements org.scalatools.testing.EventHandler {
private EventHandler newEventHandler; private EventHandler newEventHandler;
private String fullyQualifiedName; private String fullyQualifiedName;
@ -101,7 +94,7 @@ class EventHandlerWrapper implements org.scalatools.testing.EventHandler {
} }
} }
class EventWrapper implements Event { final class EventWrapper implements Event {
private org.scalatools.testing.Event oldEvent; private org.scalatools.testing.Event oldEvent;
private String className; private String className;
@ -155,7 +148,7 @@ class EventWrapper implements Event {
} }
} }
class RunnerWrapper implements Runner { final class RunnerWrapper implements Runner {
private org.scalatools.testing.Framework oldFramework; private org.scalatools.testing.Framework oldFramework;
private ClassLoader testClassLoader; private ClassLoader testClassLoader;