[tomcat] 02/02: Silence checkstyle warnings

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 920ee0899343ca98dd2e57382627a5d3ea74eda2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 9 17:58:30 2020 +0000

    Silence checkstyle warnings
---
 .../catalina/valves/rewrite/TestQuotedStringTokenizer.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
index 59d63fb..ec228ae 100644
--- a/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
+++ b/test/org/apache/catalina/valves/rewrite/TestQuotedStringTokenizer.java
@@ -16,15 +16,15 @@
  */
 package org.apache.catalina.valves.rewrite;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.hamcrest.CoreMatchers;
+
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -60,12 +60,12 @@ public class TestQuotedStringTokenizer {
         List<String> result = new ArrayList<>();
         int count = tokens.size();
         while (tokenizer.hasMoreTokens()) {
-            assertThat(tokenizer.countTokens(), is(count));
+            Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), CoreMatchers.is(Integer.valueOf(count)));
             result.add(tokenizer.nextToken());
             count--;
         }
-        assertThat(tokenizer.countTokens(), is(0));
-        assertThat(tokens, is(result));
+        Assert.assertThat(Integer.valueOf(tokenizer.countTokens()), CoreMatchers.is(Integer.valueOf(0)));
+        Assert.assertThat(tokens, CoreMatchers.is(result));
     }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org