diff options
| author | Pete Bentley <prb@google.com> | 2021-02-24 08:57:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-24 08:57:22 +0000 |
| commit | d1359663578e2a49e74ed74eb10d4b663d58cf3f (patch) | |
| tree | 1331fa1b743d5d0a341f82ff555ce4c602f40ab9 /src/main/java/org/junit/rules/Timeout.java | |
| parent | e938015d2d5a2157ed20eb622fcd9750a12bb4af (diff) | |
| parent | 7db56fab8af99e12a7644349d14109235ec584b9 (diff) | |
| download | junit-d1359663578e2a49e74ed74eb10d4b663d58cf3f.tar.gz | |
Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df
* changes:
Remove support for stuck threads
Remove DisableOnDebug (new in 4.12) as it is not supported on Android
Extra generic type information to aid certain javacs.
Upgrade external/junit to 4.13.2
Diffstat (limited to 'src/main/java/org/junit/rules/Timeout.java')
| -rw-r--r-- | src/main/java/org/junit/rules/Timeout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/junit/rules/Timeout.java b/src/main/java/org/junit/rules/Timeout.java index 8d382df..5cf905a 100644 --- a/src/main/java/org/junit/rules/Timeout.java +++ b/src/main/java/org/junit/rules/Timeout.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; * public static class HasGlobalLongTimeout { * * @Rule - * public Timeout globalTimeout= new Timeout(20); + * public Timeout globalTimeout = Timeout.millis(20); * * @Test * public void run1() throws InterruptedException { @@ -82,7 +82,7 @@ public class Timeout implements TestRule { } /** - * Create a {@code Timeout} instance initialized with values form + * Create a {@code Timeout} instance initialized with values from * a builder. * * @since 4.12 |