Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

TestFingerprintWrapper no longer necessary

  • Loading branch information...
commit 3e74b92bf81f5cd736a4e0b4143677c86b75e713 1 parent 851451a
@harrah harrah authored
Showing with 7 additions and 14 deletions.
  1. +7 −14 testing/agent/src/main/java/sbt/FrameworkWrapper.java
View
21 testing/agent/src/main/java/sbt/FrameworkWrapper.java
@@ -2,7 +2,7 @@
import sbt.testing.*;
-public class FrameworkWrapper implements Framework {
+final class FrameworkWrapper implements Framework {
private org.scalatools.testing.Framework oldFramework;
@@ -21,7 +21,7 @@ public String name() {
for (int i=0; i < length; i++) {
org.scalatools.testing.Fingerprint oldFingerprint = oldFingerprints[i];
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)
fingerprints[i] = new SubclassFingerprintWrapper((org.scalatools.testing.SubclassFingerprint) oldFingerprint);
else
@@ -35,7 +35,7 @@ public Runner runner(String[] args, String[] remoteArgs, ClassLoader testClassLo
}
}
-class SubclassFingerprintWrapper implements SubclassFingerprint {
+final class SubclassFingerprintWrapper implements SubclassFingerprint {
private String superclassName;
private boolean isModule;
private boolean requireNoArgConstructor;
@@ -59,7 +59,7 @@ public boolean requireNoArgConstructor() {
}
}
-class AnnotatedFingerprintWrapper implements AnnotatedFingerprint {
+final class AnnotatedFingerprintWrapper implements AnnotatedFingerprint {
private String annotationName;
private boolean isModule;
@@ -77,14 +77,7 @@ public String annotationName() {
}
}
-class TestFingerprintWrapper extends SubclassFingerprintWrapper {
-
- public TestFingerprintWrapper(org.scalatools.testing.TestFingerprint oldFingerprint) {
- super(oldFingerprint);
- }
-}
-
-class EventHandlerWrapper implements org.scalatools.testing.EventHandler {
+final class EventHandlerWrapper implements org.scalatools.testing.EventHandler {
private EventHandler newEventHandler;
private String fullyQualifiedName;
@@ -101,7 +94,7 @@ public void handle(org.scalatools.testing.Event oldEvent) {
}
}
-class EventWrapper implements Event {
+final class EventWrapper implements Event {
private org.scalatools.testing.Event oldEvent;
private String className;
@@ -155,7 +148,7 @@ public long duration() {
}
}
-class RunnerWrapper implements Runner {
+final class RunnerWrapper implements Runner {
private org.scalatools.testing.Framework oldFramework;
private ClassLoader testClassLoader;
Please sign in to comment.
Something went wrong with that request. Please try again.