commit d943f38ce56cd5b3280359975722ec9270a050e7
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Mar 17 14:05:28 2016 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Mar 17 14:05:28 2016 +0000
tree 47579d616e79e49829ff75c7ee470af3e2decfd2
parent 81471d9e72be21a4f5648f8b891e7d7417508e3b

Adjust ThreadPoolExecutorTest#testPoolSizeInvariants

Commit dfec9b5386ca028cc1468f3e2717120ab6274702 alters how
ThreadPoolExecutor#setCorePoolSize behaves. This change
fixes #testPoolSizeInvariants to take it into account.

Bug: 27702221
Change-Id: If294e734136dfca39c047776b925c4f8d49a1ec2

jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java

diff --git a/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java b/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
index 7fe26f4..2546626 100644
--- a/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
+++ b/jsr166-tests/src/test/java/jsr166/ThreadPoolExecutorTest.java
@@ -1371,9 +1371,14 @@
                 assertEquals(s, p.getMaximumPoolSize());
                 try {
                     p.setCorePoolSize(s + 1);
-                    shouldThrow();
+                    // android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
+                    // disables this check for compatibility reason.
+                    //    shouldThrow();
                 } catch (IllegalArgumentException success) {}
-                assertEquals(s, p.getCorePoolSize());
+                // android-changed: changeset dfec9b5386ca028cc1468f3e2717120ab6274702
+                // disables maximumpoolsize check for compatibility reason.
+                // assertEquals(s, p.getCorePoolSize());
+                assertEquals(s + 1, p.getCorePoolSize());
                 assertEquals(s, p.getMaximumPoolSize());
             }
         }