368240 - Fixed test.

jetty-monitor/src/test/java/org/eclipse/jetty/monitor/AttrEventTriggerTest.java

@@ -4,17 +4,15 @@
 // 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.monitor;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -22,7 +20,6 @@ import java.lang.management.ManagementFactory;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.TreeSet;
-
 import javax.management.MBeanServer;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -35,13 +32,12 @@ import org.eclipse.jetty.client.security.SimpleRealmResolver;
 import org.eclipse.jetty.http.HttpMethods;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.jmx.MBeanContainer;
-import org.eclipse.jetty.monitor.JMXMonitor;
 import org.eclipse.jetty.monitor.jmx.ConsoleNotifier;
 import org.eclipse.jetty.monitor.jmx.EventNotifier;
 import org.eclipse.jetty.monitor.jmx.EventState;
+import org.eclipse.jetty.monitor.jmx.EventState.TriggerState;
 import org.eclipse.jetty.monitor.jmx.EventTrigger;
 import org.eclipse.jetty.monitor.jmx.MonitorAction;
-import org.eclipse.jetty.monitor.jmx.EventState.TriggerState;
 import org.eclipse.jetty.monitor.triggers.AndEventTrigger;
 import org.eclipse.jetty.monitor.triggers.AttrEventTrigger;
 import org.eclipse.jetty.monitor.triggers.EqualToAttrEventTrigger;
@@ -61,6 +57,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 
 /* ------------------------------------------------------------ */
 /**
@@ -81,93 +79,93 @@ public class AttrEventTriggerTest
         File docRoot = new File("target/test-output/docroot/");
         docRoot.mkdirs();
         docRoot.deleteOnExit();
-        
+
         System.setProperty("org.eclipse.jetty.util.log.DEBUG","");
         _server = new Server();
-        
+
         SelectChannelConnector connector = new SelectChannelConnector();
         _server.addConnector(connector);
-        
+
         _handler = new TestHandler();
         _server.setHandler(_handler);
-        
+
         MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
         MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
         mBeanContainer.addBean(Log.getLog());
 
         _counter = _handler.getRequestCounter();
         mBeanContainer.addBean(_counter);
-        
+
-        _server.addBean(mBeanContainer);
+        _server.addBean(mBeanContainer, true);
-        _server.getContainer().addEventListener(mBeanContainer);       
+        _server.getContainer().addEventListener(mBeanContainer);
         _server.start();
-       
+
         startClient(null);
-        
+
         _monitor = new JMXMonitor();
-        
+
-        int port = _server.getConnectors()[0].getLocalPort();
+        int port = connector.getLocalPort();
         _requestUrl = "http://localhost:"+port+ "/";
     }
-    
+
     @After
     public void tearDown()
         throws Exception
     {
         stopClient();
-        
+
         if (_server != null)
         {
             _server.stop();
             _server = null;
-        }       
+        }
     }
-    
+
     @Test
     public void testNoCondition()
         throws Exception
     {
         long requestCount = 10;
- 
+
-        AttrEventTrigger<Long> trigger = 
+        AttrEventTrigger<Long> trigger =
             new AttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter");
 
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-        
+
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(1,requestCount);
         assertEquals(result, action.getHits());
     }
-    
+
     @Test
     public void testEqual_TRUE()
         throws Exception
     {
         long requestCount = 10;
         long testValue = 5;
-         
+
-        EqualToAttrEventTrigger<Long> trigger = 
+        EqualToAttrEventTrigger<Long> trigger =
             new EqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",testValue);
 
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
 
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(testValue);
         assertEquals(result, action.getHits());
     }
-        
+
     @Test
     public void testEqual_FALSE()
         throws Exception
     {
         long requestCount = 10;
         long testValue = 11;
-        
+
-        EqualToAttrEventTrigger<Long> trigger = 
+        EqualToAttrEventTrigger<Long> trigger =
             new EqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                               testValue);
 
@@ -175,19 +173,19 @@ public class AttrEventTriggerTest
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
 
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet();
         assertEquals(result, action.getHits());
    }
-   
+
     @Test
     public void testLowerLimit()
         throws Exception
     {
         long requestCount = 10;
         long testRangeLow = 5;
-        
+
-        GreaterThanAttrEventTrigger<Long> trigger = 
+        GreaterThanAttrEventTrigger<Long> trigger =
             new GreaterThanAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                   testRangeLow);
 
@@ -195,27 +193,27 @@ public class AttrEventTriggerTest
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
 
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(6,10);
         assertEquals(result, action.getHits());
     }
-    
+
     @Test
     public void testLowerLimitIncl()
         throws Exception
     {
         long requestCount = 10;
         long testRangeLow = 5;
-        
+
-        GreaterThanOrEqualToAttrEventTrigger<Long> trigger = 
+        GreaterThanOrEqualToAttrEventTrigger<Long> trigger =
             new GreaterThanOrEqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                   testRangeLow);
-    
+
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-    
+
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(5,10);
         assertEquals(result, action.getHits());
     }
@@ -226,8 +224,8 @@ public class AttrEventTriggerTest
     {
         long requestCount = 10;
         long testRangeHigh = 5;
-        
+
-        LessThanAttrEventTrigger<Long> trigger = 
+        LessThanAttrEventTrigger<Long> trigger =
             new LessThanAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                   testRangeHigh);
 
@@ -235,11 +233,11 @@ public class AttrEventTriggerTest
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
 
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(1,4);
         assertEquals(result, action.getHits());
     }
-    
+
 
     @Test
     public void testUpperLimitIncl()
@@ -247,8 +245,8 @@ public class AttrEventTriggerTest
     {
         long requestCount = 10;
         long testRangeHigh = 5;
-        
+
-        LessThanOrEqualToAttrEventTrigger<Long> trigger = 
+        LessThanOrEqualToAttrEventTrigger<Long> trigger =
             new LessThanOrEqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                   testRangeHigh);
 
@@ -256,11 +254,11 @@ public class AttrEventTriggerTest
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
 
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(1,5);
         assertEquals(result, action.getHits());
     }
-    
+
     @Test
     public void testRangeInclusive()
         throws Exception
@@ -268,20 +266,20 @@ public class AttrEventTriggerTest
         long requestCount = 10;
         long testRangeLow  = 3;
         long testRangeHigh = 8;
-        
+
-        RangeInclAttrEventTrigger<Long> trigger = 
+        RangeInclAttrEventTrigger<Long> trigger =
             new RangeInclAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                 testRangeLow, testRangeHigh);
-    
+
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-    
+
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(testRangeLow,testRangeHigh);
         assertEquals(result, action.getHits());
     }
-    
+
     @Test
     public void testInsideRangeExclusive()
         throws Exception
@@ -289,20 +287,20 @@ public class AttrEventTriggerTest
         long requestCount = 10;
         long testRangeLow  = 3;
         long testRangeHigh = 8;
-        
+
-        RangeAttrEventTrigger<Long> trigger = 
+        RangeAttrEventTrigger<Long> trigger =
             new RangeAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                             testRangeLow, testRangeHigh);
-    
+
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-    
+
         performTest(action, requestCount, 1000);
-                
+
         ResultSet result = new ResultSet(testRangeLow+1,testRangeHigh-1);
         assertEquals(result, action.getHits());
     }
-    
+
     @Test
     public void testRangeComposite()
         throws Exception
@@ -310,23 +308,23 @@ public class AttrEventTriggerTest
         long requestCount = 10;
         long testRangeLow  = 4;
         long testRangeHigh = 7;
-        
+
-        GreaterThanAttrEventTrigger<Long> trigger1 = 
+        GreaterThanAttrEventTrigger<Long> trigger1 =
             new GreaterThanAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                 testRangeLow);
-        LessThanOrEqualToAttrEventTrigger<Long> trigger2 = 
+        LessThanOrEqualToAttrEventTrigger<Long> trigger2 =
             new LessThanOrEqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                 testRangeHigh);
         AndEventTrigger trigger = new AndEventTrigger(trigger1, trigger2);
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-    
+
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(testRangeLow+1,testRangeHigh);
         assertEquals(result, action.getHits());
     }
-       
+
     @Test
     public void testRangeOuter()
         throws Exception
@@ -334,23 +332,23 @@ public class AttrEventTriggerTest
         long requestCount = 10;
         long testRangeLow  = 4;
         long testRangeHigh = 7;
-        
+
-        LessThanOrEqualToAttrEventTrigger<Long> trigger1 = 
+        LessThanOrEqualToAttrEventTrigger<Long> trigger1 =
             new LessThanOrEqualToAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                 testRangeLow);
-        GreaterThanAttrEventTrigger<Long> trigger2 = 
+        GreaterThanAttrEventTrigger<Long> trigger2 =
             new GreaterThanAttrEventTrigger<Long>("org.eclipse.jetty.monitor:type=requestcounter,id=0", "counter",
                                                 testRangeHigh);
         OrEventTrigger trigger = new OrEventTrigger(trigger1, trigger2);
         EventNotifier notifier = new ConsoleNotifier("%s");
         CounterAction action = new CounterAction(trigger, notifier, 500, 100);
-    
+
         performTest(action, requestCount, 1000);
-        
+
         ResultSet result = new ResultSet(1,testRangeLow,testRangeHigh+1, requestCount);
         assertEquals(result, action.getHits());
     }
-     
+
     protected void performTest(MonitorAction action, long count, long interval)
         throws Exception
     {
@@ -363,17 +361,17 @@ public class AttrEventTriggerTest
                 ContentExchange getExchange = new ContentExchange();
                 getExchange.setURL(_requestUrl);
                 getExchange.setMethod(HttpMethods.GET);
-                
+
                 _client.send(getExchange);
                 int state = getExchange.waitForDone();
-                
+
                 String content = "";
                 int responseStatus = getExchange.getResponseStatus();
                 if (responseStatus == HttpStatus.OK_200)
                 {
                     content = getExchange.getResponseContent();
-                }           
+                }
-                
+
                 assertEquals(HttpStatus.OK_200,responseStatus);
                 Thread.sleep(interval);
             }
@@ -382,12 +380,12 @@ public class AttrEventTriggerTest
                 break;
             }
         }
-        
+
         Thread.sleep(interval);
 
         _monitor.removeActions(action);
     }
-    
+
     protected void startClient(Realm realm)
         throws Exception
     {
@@ -397,7 +395,7 @@ public class AttrEventTriggerTest
             _client.setRealmResolver(new SimpleRealmResolver(realm));
         _client.start();
     }
-    
+
     protected void stopClient()
         throws Exception
     {
@@ -412,7 +410,7 @@ public class AttrEventTriggerTest
         extends AbstractHandler
     {
         private RequestCounter _counter = new RequestCounter();
-        
+
         public void handle(String target, Request baseRequest,
                 HttpServletRequest request, HttpServletResponse response)
             throws IOException, ServletException
@@ -421,40 +419,40 @@ public class AttrEventTriggerTest
                 return;
             }
             _counter.increment();
-            
+
             response.setContentType("text/plain");
             response.setStatus(HttpServletResponse.SC_OK);
             PrintWriter writer = response.getWriter();
             writer.println("===TEST RESPONSE===");
             baseRequest.setHandled(true);
         }
-        
+
         public RequestCounter getRequestCounter()
         {
             return _counter;
         }
     }
-    
+
     protected static class ResultSet extends TreeSet<Long>
-    {        
+    {
         public ResultSet() {}
-        
+
         public ResultSet(long value)
         {
             add(value);
         }
-        
+
         public ResultSet(long start, long end)
         {
             addEntries(start, end);
         }
-        
+
         public ResultSet(long start, long pause, long resume, long end)
         {
             addEntries(start, pause);
             addEntries(resume, end);
         }
-        
+
         public void addEntries(long start, long stop)
         {
             if (start > 0 && stop > 0)
@@ -471,23 +469,23 @@ public class AttrEventTriggerTest
             return (this.size() == set.size()) && containsAll(set);
         }
     }
-    
+
     protected static class CounterAction
         extends MonitorAction
     {
         private ResultSet _hits = new ResultSet();
-        
+
         public CounterAction(EventTrigger trigger, EventNotifier notifier, long interval, long delay)
         {
             super(trigger, notifier, interval, delay);
         }
-        
+
         public void execute(EventTrigger trigger, EventState<?> state, long timestamp)
         {
             if (trigger != null && state != null)
             {
                 Collection<?> values = state.values();
-            
+
                 Iterator<?> it = values.iterator();
                 while(it.hasNext())
                 {
@@ -500,7 +498,7 @@ public class AttrEventTriggerTest
                 }
             }
         }
-        
+
         public ResultSet getHits()
         {
             return _hits;