aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-12-12 16:29:57 +0000
committerPaul Duffin <paulduffin@google.com>2016-12-14 14:19:07 +0000
commit055ce94b84b94c5118327f9593fd9b3e359e23a3 (patch)
tree2d5086b9cf43861f21935f3babe1415f2a654b10 /src
parent3035e230109ea6f83dc170f33b49970a76f1d60b (diff)
downloadjunit-055ce94b84b94c5118327f9593fd9b3e359e23a3.tar.gz
Remove core-junit/core-junit-static and revert to JUnit 4.10
Removes the core-junit/core-junit-static targets as they are no no longer used, the core-junit-files variable and removes any Android specific patches needed to maintain backwards compatibility with the Android API. Also, removes the Common.mk file which is no longer needed. Bug: 30188076 Test: make checkbuild Change-Id: I6212d15495574573890ae3fdf73fdba4374759d1
Diffstat (limited to 'src')
-rw-r--r--src/junit/extensions/package.html6
-rw-r--r--src/junit/framework/ComparisonCompactor.java23
-rw-r--r--src/junit/framework/TestResult.java19
-rw-r--r--src/junit/framework/package.html5
-rw-r--r--src/org/junit/experimental/theories/internal/package.html5
-rw-r--r--src/org/junit/internal/builders/package.html5
-rw-r--r--src/org/junit/internal/matchers/package.html5
-rw-r--r--src/org/junit/internal/package.html5
-rw-r--r--src/org/junit/internal/requests/package-info.java3
-rw-r--r--src/org/junit/internal/requests/package.html5
-rw-r--r--src/org/junit/internal/runners/model/package.html5
-rw-r--r--src/org/junit/internal/runners/package-info.java3
-rw-r--r--src/org/junit/internal/runners/package.html5
-rw-r--r--src/org/junit/internal/runners/rules/package.html5
-rw-r--r--src/org/junit/internal/runners/statements/package.html5
15 files changed, 13 insertions, 91 deletions
diff --git a/src/junit/extensions/package.html b/src/junit/extensions/package.html
deleted file mode 100644
index 6b4be72..0000000
--- a/src/junit/extensions/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<BODY>
-Utility classes supporting the junit test framework.
-{@hide} - Not needed for 1.0 SDK
-</BODY>
-</HTML>
diff --git a/src/junit/framework/ComparisonCompactor.java b/src/junit/framework/ComparisonCompactor.java
index e540f03..bbc3ba1 100644
--- a/src/junit/framework/ComparisonCompactor.java
+++ b/src/junit/framework/ComparisonCompactor.java
@@ -1,9 +1,5 @@
package junit.framework;
-// android-changed add @hide
-/**
- * @hide not needed for public API
- */
public class ComparisonCompactor {
private static final String ELLIPSIS= "...";
@@ -23,17 +19,14 @@ public class ComparisonCompactor {
}
public String compact(String message) {
- if (fExpected == null || fActual == null || areStringsEqual()) {
- // android-changed use local method instead of Assert.format, since
- // the later is not part of Android API till API 16
- return format(message, fExpected, fActual);
- }
+ if (fExpected == null || fActual == null || areStringsEqual())
+ return Assert.format(message, fExpected, fActual);
+
findCommonPrefix();
findCommonSuffix();
String expected= compactString(fExpected);
String actual= compactString(fActual);
- // android-changed use local format method
- return format(message, expected, actual);
+ return Assert.format(message, expected, actual);
}
private String compactString(String source) {
@@ -76,12 +69,4 @@ public class ComparisonCompactor {
private boolean areStringsEqual() {
return fExpected.equals(fActual);
}
-
- // android-changed copy of Assert.format for reasons described above
- private static String format(String message, Object expected, Object actual) {
- String formatted= "";
- if (message != null && message.length() > 0)
- formatted= message+" ";
- return formatted+"expected:<"+expected+"> but was:<"+actual+">";
- }
}
diff --git a/src/junit/framework/TestResult.java b/src/junit/framework/TestResult.java
index 3052e94..5768e9a 100644
--- a/src/junit/framework/TestResult.java
+++ b/src/junit/framework/TestResult.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import java.util.Vector;
/**
* A <code>TestResult</code> collects the results of executing
@@ -16,20 +15,16 @@ import java.util.Vector;
* @see Test
*/
public class TestResult extends Object {
- // BEGIN android-changed changed types from List<> to Vector<> for API compatibility
- protected Vector<TestFailure> fFailures;
- protected Vector<TestFailure> fErrors;
- protected Vector<TestListener> fListeners;
- // END android-changed
+ protected List<TestFailure> fFailures;
+ protected List<TestFailure> fErrors;
+ protected List<TestListener> fListeners;
protected int fRunTests;
private boolean fStop;
public TestResult() {
- // BEGIN android-changed to Vector
- fFailures= new Vector<TestFailure>();
- fErrors= new Vector<TestFailure>();
- fListeners= new Vector<TestListener>();
- // END android-changed
+ fFailures= new ArrayList<TestFailure>();
+ fErrors= new ArrayList<TestFailure>();
+ fListeners= new ArrayList<TestListener>();
fRunTests= 0;
fStop= false;
}
@@ -171,4 +166,4 @@ public class TestResult extends Object {
public synchronized boolean wasSuccessful() {
return failureCount() == 0 && errorCount() == 0;
}
-}
+} \ No newline at end of file
diff --git a/src/junit/framework/package.html b/src/junit/framework/package.html
deleted file mode 100644
index 770d470..0000000
--- a/src/junit/framework/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<BODY>
-The junit test framework.
-</BODY>
-</HTML>
diff --git a/src/org/junit/experimental/theories/internal/package.html b/src/org/junit/experimental/theories/internal/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/experimental/theories/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/builders/package.html b/src/org/junit/internal/builders/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/builders/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/matchers/package.html b/src/org/junit/internal/matchers/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/matchers/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/package.html b/src/org/junit/internal/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/requests/package-info.java b/src/org/junit/internal/requests/package-info.java
index 493f21a..66d2928 100644
--- a/src/org/junit/internal/requests/package-info.java
+++ b/src/org/junit/internal/requests/package-info.java
@@ -2,6 +2,5 @@
* Provides implementations of {@link org.junit.runner.Request}.
*
* @since 4.0
- * @hide
*/
-package org.junit.internal.requests;
+package org.junit.internal.requests; \ No newline at end of file
diff --git a/src/org/junit/internal/requests/package.html b/src/org/junit/internal/requests/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/requests/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/runners/model/package.html b/src/org/junit/internal/runners/model/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/runners/model/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/runners/package-info.java b/src/org/junit/internal/runners/package-info.java
index 8ee0e61..5ab7e7b 100644
--- a/src/org/junit/internal/runners/package-info.java
+++ b/src/org/junit/internal/runners/package-info.java
@@ -2,6 +2,5 @@
* Provides implementations of {@link org.junit.runner.Runner}
*
* @since 4.0
- * @hide
*/
-package org.junit.internal.runners;
+package org.junit.internal.runners; \ No newline at end of file
diff --git a/src/org/junit/internal/runners/package.html b/src/org/junit/internal/runners/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/runners/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/runners/rules/package.html b/src/org/junit/internal/runners/rules/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/runners/rules/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
diff --git a/src/org/junit/internal/runners/statements/package.html b/src/org/junit/internal/runners/statements/package.html
deleted file mode 100644
index 1c9bf9d..0000000
--- a/src/org/junit/internal/runners/statements/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
- {@hide}
-</body>
-</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 15:00:33 +0000