1 files changed, 22 insertions, 19 deletions
diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java
index 7372b6bbb4..7d05946d1e 100644
--- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java
+++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java
@@ -4,44 +4,47 @@
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
 // and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
+// The Eclipse Public License is available at
 // http://www.eclipse.org/legal/epl-v10.html
 // The Apache License v2.0 is available at
 // http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
+// You may elect to redistribute this code under either of these licenses.
 // ========================================================================
 package org.eclipse.jetty.rewrite.handler;
 
 import java.io.IOException;
 
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
 public class RewriteRegexRuleTest extends AbstractRuleTestCase
 {
-    private RewriteRegexRule _rule;
-
-    String[][] _tests=
-    {       
+    private String[][] _tests=
+    {
             {"/foo/bar",".*","/replace","/replace"},
-            {"/foo/bar","/xxx.*","/replace",null},       
+            {"/foo/bar","/xxx.*","/replace",null},
             {"/foo/bar","/(.*)/(.*)","/$2/$1/xxx","/bar/foo/xxx"},
     };
-    
-    public void setUp() throws Exception
+    private RewriteRegexRule _rule;
+
+    @Before
+    public void init() throws Exception
     {
-        super.setUp();
+        start(false);
         _rule=new RewriteRegexRule();
     }
-    
+
+    @Test
     public void testRequestUriEnabled() throws IOException
     {
-        for (int i=0;i<_tests.length;i++)
+        for (String[] test : _tests)
         {
-            _rule.setRegex(_tests[i][1]);
-            _rule.setReplacement(_tests[i][2]);
-            
-            String result = _rule.matchAndApply(_tests[i][0], _request, _response);
-        
-            assertEquals(_tests[i][1],_tests[i][3], result);
+            _rule.setRegex(test[1]);
+            _rule.setReplacement(test[2]);
+            String result = _rule.matchAndApply(test[0], _request, _response);
+            assertEquals(test[1], test[3], result);
         }
     }
-
 }