summaryrefslogtreecommitdiff
path: root/jsr166-tests
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-03-02 19:28:56 +0000
committerTobias Thierer <tobiast@google.com>2017-03-06 11:21:55 +0000
commit5d175dd4d7b128492ef7e3da6a77d80b8fd0aa22 (patch)
tree4d5aff2e7df775316aaae64bc5de73cf06ce77ab /jsr166-tests
parent6975f84c2ed72e1e26d20190b6f318718c849008 (diff)
Automated: Canonicalize spelling of Android-changed across libcore
This applies the same regexp replacement across libcore that http://r.android.com/345826 had only applied to ojluni. Most of the previous noncanonical spellings were a lowercased "android-" that should be "Android-". This CL was created by running the following command on top of the above CL. No manual changes were made. find . -name \*\.java | xargs sed -i \ -e 's/Android[- ]changed/Android-changed/ig' \ -e 's/Android-changed :/Android-changed:/g' \ -e 's/Android-changed \(BEGIN\|END\)/\1 Android-changed/g' \ -e 's/Android-changed - /Android-changed: /g' \ -e 's/Android[- ]removed/Android-removed/ig' \ -e 's/Android-removed :/Android-removed:/g' \ -e 's/Android-removed \(BEGIN\|END\)/\1 Android-removed/g' \ -e 's/Android-removed - /Android-removed: /g' \ -e 's/Android[- ]added/Android-added/ig' \ -e 's/Android-added :/Android-added:/g' \ -e 's/Android-added \(BEGIN\|END\)/\1 Android-added/g' \ -e 's/Android-added - /Android-added: /g' \ -e 's/----- \(BEGIN\|END\) android\( -----\)\?/\1 Android-changed/g' \ -e 's/\/\* \(BEGIN\|END\) Android-changed \*\//\/\/ \1 Android-changed/g' Bug: 35841464 Test: make droid cts Change-Id: I060c7236b7607763e5d27d60aa395d2507703a95
Diffstat (limited to 'jsr166-tests')
-rw-r--r--jsr166-tests/src/test/java/jsr166/DelayQueueTest.java2
-rw-r--r--jsr166-tests/src/test/java/jsr166/JSR166TestCase.java4
-rw-r--r--jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java b/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
index e42ac2dfbc..61e8f8bd04 100644
--- a/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
+++ b/jsr166-tests/src/test/java/jsr166/DelayQueueTest.java
@@ -27,7 +27,7 @@ import junit.framework.Test;
public class DelayQueueTest extends JSR166TestCase {
- // android-changed: Extend BlockingQueueTest directly instead of creating
+ // Android-changed: Extend BlockingQueueTest directly instead of creating
// an inner class and its associated suite.
//
// public static class Generic extends BlockingQueueTest {
diff --git a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
index ca2add3310..ea6e576574 100644
--- a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
+++ b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
@@ -1089,7 +1089,7 @@ public class JSR166TestCase extends TestCase {
* getPolicy/setPolicy.
*/
public void runWithPermissions(Runnable r, Permission... permissions) {
- // Android-changed - no SecurityManager
+ // Android-changed: no SecurityManager
// SecurityManager sm = System.getSecurityManager();
// if (sm == null) {
// r.run();
@@ -1107,7 +1107,7 @@ public class JSR166TestCase extends TestCase {
*/
public void runWithSecurityManagerWithPermissions(Runnable r,
Permission... permissions) {
- // Android-changed - no SecurityManager
+ // Android-changed: no SecurityManager
// SecurityManager sm = System.getSecurityManager();
// if (sm == null) {
// Policy savedPolicy = Policy.getPolicy();
diff --git a/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java b/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
index 2546626e81..0865ed4f66 100644
--- a/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
+++ b/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
@@ -1371,11 +1371,11 @@ public class ThreadPoolExecutorTest extends JSR166TestCase {
assertEquals(s, p.getMaximumPoolSize());
try {
p.setCorePoolSize(s + 1);
- // android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
+ // Android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
// disables this check for compatibility reason.
// shouldThrow();
} catch (IllegalArgumentException success) {}
- // android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
+ // Android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
// disables maximumpoolsize check for compatibility reason.
// assertEquals(s, p.getCorePoolSize());
assertEquals(s + 1, p.getCorePoolSize());