[jbossnative-commits] JBoss Native SVN: r1911 - trunk/mod_cluster/src/test/java/org/jboss/modcluster.

Author: pferraro Date: 2008-09-26 18:23:13 -0400 (Fri, 26 Sep 2008) New Revision: 1911 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java Log: Minor refactoring. Unit tests work again. Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-26 22:20:57 UTC (rev 1910) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-09-26 22:23:13 UTC (rev 1911) @@ -59,7 +59,7 @@ { private final NodeConfiguration nodeConfig = EasyMock.createStrictMock(NodeConfiguration.class); private final BalancerConfiguration balancerConfig = EasyMock.createStrictMock(BalancerConfiguration.class); - private final MCMPHandlerConfiguration mcmpHandlerConfig = EasyMock.createStrictMock(MCMPHandlerConfiguration.class); + private final MCMPHandlerConfiguration mcmpConfig = EasyMock.createStrictMock(MCMPHandlerConfiguration.class); private final MCMPHandler mcmpHandler = EasyMock.createStrictMock(MCMPHandler.class); private final LoadBalanceFactorProvider provider = EasyMock.createStrictMock(LoadBalanceFactorProvider.class); private final AdvertiseListenerFactory listenerFactory = EasyMock.createStrictMock(AdvertiseListenerFactory.class); @@ -73,7 +73,7 @@ @Override protected void setUp() throws Exception { - this.handler = new DefaultJBossWebEventHandler(this.nodeConfig, this.balancerConfig, this.mcmpHandlerConfig, this.mcmpHandler, this.provider, this.listenerFactory); + this.handler = new DefaultJBossWebEventHandler(this.nodeConfig, this.balancerConfig, this.mcmpConfig, this.mcmpHandler, this.provider, this.listenerFactory); } public void testInit() throws IOException @@ -84,73 +84,73 @@ AdvertiseListener listener = EasyMock.createStrictMock(AdvertiseListener.class); // Test advertise = false - EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.FALSE); + EasyMock.expect(this.mcmpConfig.getAdvertise()).andReturn(Boolean.FALSE); - EasyMock.replay(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.replay(this.mcmpHandler, this.mcmpConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.mcmpHandlerConfig, listener); - EasyMock.reset(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.verify(this.mcmpHandler, this.mcmpConfig, listener); + EasyMock.reset(this.mcmpHandler, this.mcmpConfig, listener); // Test advertise = true - EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.TRUE); + EasyMock.expect(this.mcmpConfig.getAdvertise()).andReturn(Boolean.TRUE); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); // Test advertise = null, proxies configured - EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(null); + EasyMock.expect(this.mcmpConfig.getAdvertise()).andReturn(null); - EasyMock.replay(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.replay(this.mcmpHandler, this.mcmpConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.mcmpHandlerConfig, listener); - EasyMock.reset(this.mcmpHandler, this.mcmpHandlerConfig, listener); + EasyMock.verify(this.mcmpHandler, this.mcmpConfig, listener); + EasyMock.reset(this.mcmpHandler, this.mcmpConfig, listener); // Test advertise = null, no proxies configured - EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(null); + EasyMock.expect(this.mcmpConfig.getProxyList()).andReturn(null); List<AddressPort> emptyList = Collections.emptyList(); this.mcmpHandler.init(emptyList); - EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(null); + EasyMock.expect(this.mcmpConfig.getAdvertise()).andReturn(null); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); } public void testShutdown() throws IOException @@ -173,22 +173,22 @@ AdvertiseListener listener = EasyMock.createStrictMock(AdvertiseListener.class); - EasyMock.expect(this.mcmpHandlerConfig.getProxyList()).andReturn(localHostName); + EasyMock.expect(this.mcmpConfig.getProxyList()).andReturn(localHostName); this.mcmpHandler.init(Collections.singletonList(new AddressPort(localAddress, 8000))); - EasyMock.expect(this.mcmpHandlerConfig.getAdvertise()).andReturn(Boolean.TRUE); + EasyMock.expect(this.mcmpConfig.getAdvertise()).andReturn(Boolean.TRUE); - EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpHandlerConfig)).andReturn(listener); + EasyMock.expect(this.listenerFactory.createListener(this.mcmpHandler, this.mcmpConfig)).andReturn(listener); listener.start(); - EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.replay(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); this.handler.init(); - EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); - EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpHandlerConfig, listener); + EasyMock.verify(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); + EasyMock.reset(this.mcmpHandler, this.listenerFactory, this.mcmpConfig, listener); // Now test shutdown() listener.destroy(); @@ -502,150 +502,6 @@ EasyMock.expect(engine.getJvmRoute()).andReturn(null); } - public void testConfig() throws Exception - { - Engine engine = EasyMock.createStrictMock(Engine.class); - Service service = EasyMock.createStrictMock(Service.class); - - Capture<MCMPRequest> capturedRequest = recordConfig(engine, service); - - EasyMock.replay(this.mcmpHandler, this.nodeConfig, this.balancerConfig, engine, service); - - this.handler.config(engine); - - EasyMock.verify(this.mcmpHandler, this.nodeConfig, this.balancerConfig, engine, service); - - MCMPRequest request = capturedRequest.getValue(); - - assertSame(MCMPRequestType.CONFIG, request.getRequestType()); - assertFalse(request.isWildcard()); - - Map<String, String> parameters = request.getParameters(); - - assertEquals(17, parameters.size()); - assertEquals("host1", parameters.get("JVMRoute")); - assertEquals("127.0.0.1", parameters.get("Host")); - assertEquals("0", parameters.get("Port")); - assertEquals("ajp", parameters.get("Type")); - assertEquals("domain", parameters.get("Domain")); - assertEquals("On", parameters.get("flushpackets")); - assertEquals("1", parameters.get("flushwait")); - assertEquals("2", parameters.get("ping")); - assertEquals("3", parameters.get("smax")); - assertEquals("4", parameters.get("ttl")); - assertEquals("5", parameters.get("Timeout")); - assertEquals("S", parameters.get("Balancer")); - assertEquals("No", parameters.get("StickySession")); - assertEquals("Yes", parameters.get("StickySessionRemove")); - assertEquals("No", parameters.get("StickySessionForce")); - assertEquals("6", parameters.get("WaitWorker")); - assertEquals("7", parameters.get("Maxattempts")); - - EasyMock.reset(this.mcmpHandler, this.nodeConfig, this.balancerConfig, engine, service); - } - - private Capture<MCMPRequest> recordConfig(Engine engine, Service service) throws Exception - { - Capture<MCMPRequest> capturedRequest = new Capture<MCMPRequest>(); - Connector connector = new Connector("AJP/1.3"); - - // Expect log message - EasyMock.expect(engine.getName()).andReturn("engine"); - - EasyMock.expect(engine.getService()).andReturn(service); - EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector }); - EasyMock.expect(engine.getJvmRoute()).andReturn(null); - Set<MCMPServerState> states = Collections.emptySet(); - EasyMock.expect(this.mcmpHandler.getProxyStates()).andReturn(states); - - EasyMock.expect(engine.getService()).andReturn(service); - EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector }); - EasyMock.expect(engine.getJvmRoute()).andReturn("host1"); - - EasyMock.expect(this.nodeConfig.getDomain()).andReturn("domain"); - EasyMock.expect(this.nodeConfig.getFlushPackets()).andReturn(Boolean.TRUE); - EasyMock.expect(this.nodeConfig.getFlushWait()).andReturn(1); - EasyMock.expect(this.nodeConfig.getPing()).andReturn(2); - EasyMock.expect(this.nodeConfig.getSmax()).andReturn(3); - EasyMock.expect(this.nodeConfig.getTtl()).andReturn(4); - EasyMock.expect(this.nodeConfig.getNodeTimeout()).andReturn(5); - EasyMock.expect(this.nodeConfig.getBalancer()).andReturn("S"); - - EasyMock.expect(this.balancerConfig.getStickySession()).andReturn(Boolean.FALSE); - EasyMock.expect(this.balancerConfig.getStickySessionRemove()).andReturn(Boolean.TRUE); - EasyMock.expect(this.balancerConfig.getStickySessionForce()).andReturn(Boolean.FALSE); - EasyMock.expect(this.balancerConfig.getWorkerTimeout()).andReturn(6); - EasyMock.expect(this.balancerConfig.getMaxAttempts()).andReturn(7); - - this.mcmpHandler.sendRequest(EasyMock.capture(capturedRequest)); - - return capturedRequest; - } - - public void testRemoveAll() throws IOException - { - Engine engine = EasyMock.createStrictMock(Engine.class); - - // Test not initialized - try - { - this.handler.removeAll(engine); - - fail(); - } - catch (IllegalStateException e) - { - // Expected - } - - testInit(); - - // Test initialized - no jvm route - // Expect log message - EasyMock.expect(engine.getName()).andReturn("engine"); - - EasyMock.expect(engine.getJvmRoute()).andReturn(null); - - EasyMock.replay(engine); - - this.handler.removeAll(engine); - - EasyMock.verify(engine); - EasyMock.reset(engine); - - - // Test initialized - jvm route exists - Capture<MCMPRequest> capturedRequest = this.recordRemoveAll(engine); - - EasyMock.replay(this.mcmpHandler, engine); - - this.handler.removeAll(engine); - - EasyMock.verify(this.mcmpHandler, engine); - - MCMPRequest request = capturedRequest.getValue(); - - assertSame(MCMPRequestType.REMOVE_APP, request.getRequestType()); - assertTrue(request.isWildcard()); - assertEquals(Collections.singletonMap("JVMRoute", "host1"), request.getParameters()); - - EasyMock.reset(this.mcmpHandler, engine); - } - - private Capture<MCMPRequest> recordRemoveAll(Engine engine) - { - Capture<MCMPRequest> capturedRequest = new Capture<MCMPRequest>(); - - // Expect log message - EasyMock.expect(engine.getName()).andReturn("engine"); - - EasyMock.expect(engine.getJvmRoute()).andReturn("host1").times(2); - - this.mcmpHandler.sendRequest(EasyMock.capture(capturedRequest)); - - return capturedRequest; - } - public void testStatus() throws IOException { Engine engine = EasyMock.createStrictMock(Engine.class); @@ -653,7 +509,7 @@ // Test not initialized try { - this.handler.removeAll(engine); + this.handler.status(engine); fail(); } @@ -716,35 +572,84 @@ testInit(); // Test initialized - Service service1 = EasyMock.createStrictMock(Service.class); - Service service2 = EasyMock.createStrictMock(Service.class); - Engine engine1 = EasyMock.createStrictMock(Engine.class); - Engine engine2 = EasyMock.createStrictMock(Engine.class); - Container container1 = EasyMock.createStrictMock(Container.class); - Container container2 = EasyMock.createStrictMock(Container.class); - Context context1 = EasyMock.createStrictMock(Context.class); - Context context2 = EasyMock.createStrictMock(Context.class); + Service service = EasyMock.createStrictMock(Service.class); + Engine engine = EasyMock.createStrictMock(Engine.class); + Container container = EasyMock.createStrictMock(Container.class); + Context context = EasyMock.createStrictMock(Context.class); + Capture<MCMPRequest> capturedRequest = new Capture<MCMPRequest>(); + Connector connector = new Connector("AJP/1.3"); - EasyMock.expect(server.findServices()).andReturn(new Service[] { service1, service2 }); + EasyMock.expect(server.findServices()).andReturn(new Service[] { service }); - EasyMock.expect(service1.getContainer()).andReturn(engine1); - this.recordConfig(engine1, service1); - EasyMock.expect(engine1.findChildren()).andReturn(new Container[] { container1 }); - EasyMock.expect(container1.findChildren()).andReturn(new Container[] { context1 }); - this.recordAddContext(context1, container1); + EasyMock.expect(service.getContainer()).andReturn(engine); + + // Expect log message + EasyMock.expect(engine.getName()).andReturn("engine"); - EasyMock.expect(service2.getContainer()).andReturn(engine2); - this.recordConfig(engine2, service2); - EasyMock.expect(engine2.findChildren()).andReturn(new Container[] { container2 }); - EasyMock.expect(container2.findChildren()).andReturn(new Container[] { context2 }); - this.recordAddContext(context2, container2); + EasyMock.expect(engine.getService()).andReturn(service); + EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector }); + EasyMock.expect(engine.getJvmRoute()).andReturn(null); + Set<MCMPServerState> states = Collections.emptySet(); + EasyMock.expect(this.mcmpHandler.getProxyStates()).andReturn(states); - EasyMock.replay(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); + EasyMock.expect(engine.getService()).andReturn(service); + EasyMock.expect(service.findConnectors()).andReturn(new Connector[] { connector }); + EasyMock.expect(engine.getJvmRoute()).andReturn("host1"); + EasyMock.expect(this.nodeConfig.getDomain()).andReturn("domain"); + EasyMock.expect(this.nodeConfig.getFlushPackets()).andReturn(Boolean.TRUE); + EasyMock.expect(this.nodeConfig.getFlushWait()).andReturn(1); + EasyMock.expect(this.nodeConfig.getPing()).andReturn(2); + EasyMock.expect(this.nodeConfig.getSmax()).andReturn(3); + EasyMock.expect(this.nodeConfig.getTtl()).andReturn(4); + EasyMock.expect(this.nodeConfig.getNodeTimeout()).andReturn(5); + EasyMock.expect(this.nodeConfig.getBalancer()).andReturn("S"); + + EasyMock.expect(this.balancerConfig.getStickySession()).andReturn(Boolean.FALSE); + EasyMock.expect(this.balancerConfig.getStickySessionRemove()).andReturn(Boolean.TRUE); + EasyMock.expect(this.balancerConfig.getStickySessionForce()).andReturn(Boolean.FALSE); + EasyMock.expect(this.balancerConfig.getWorkerTimeout()).andReturn(6); + EasyMock.expect(this.balancerConfig.getMaxAttempts()).andReturn(7); + + this.mcmpHandler.sendRequest(EasyMock.capture(capturedRequest)); + + EasyMock.expect(engine.findChildren()).andReturn(new Container[] { container }); + EasyMock.expect(container.findChildren()).andReturn(new Container[] { context }); + this.recordAddContext(context, container); + + EasyMock.replay(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); + this.handler.startServer(server); - EasyMock.verify(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); - EasyMock.reset(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); + EasyMock.verify(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); + + MCMPRequest request = capturedRequest.getValue(); + + assertSame(MCMPRequestType.CONFIG, request.getRequestType()); + assertFalse(request.isWildcard()); + + Map<String, String> parameters = request.getParameters(); + + assertEquals(17, parameters.size()); + assertEquals("host1", parameters.get("JVMRoute")); + assertEquals("127.0.0.1", parameters.get("Host")); + assertEquals("0", parameters.get("Port")); + assertEquals("ajp", parameters.get("Type")); + assertEquals("domain", parameters.get("Domain")); + assertEquals("On", parameters.get("flushpackets")); + assertEquals("1", parameters.get("flushwait")); + assertEquals("2", parameters.get("ping")); + assertEquals("3", parameters.get("smax")); + assertEquals("4", parameters.get("ttl")); + assertEquals("5", parameters.get("Timeout")); + assertEquals("S", parameters.get("Balancer")); + assertEquals("No", parameters.get("StickySession")); + assertEquals("Yes", parameters.get("StickySessionRemove")); + assertEquals("No", parameters.get("StickySessionForce")); + assertEquals("6", parameters.get("WaitWorker")); + assertEquals("7", parameters.get("Maxattempts")); + + EasyMock.reset(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); } public void testStopServer() throws IOException @@ -766,34 +671,38 @@ testInit(); // Test initialized - Service service1 = EasyMock.createStrictMock(Service.class); - Service service2 = EasyMock.createStrictMock(Service.class); - Engine engine1 = EasyMock.createStrictMock(Engine.class); - Engine engine2 = EasyMock.createStrictMock(Engine.class); - Container container1 = EasyMock.createStrictMock(Container.class); - Container container2 = EasyMock.createStrictMock(Container.class); - Context context1 = EasyMock.createStrictMock(Context.class); - Context context2 = EasyMock.createStrictMock(Context.class); - - EasyMock.expect(server.findServices()).andReturn(new Service[] { service1, service2 }); + Service service = EasyMock.createStrictMock(Service.class); + Engine engine = EasyMock.createStrictMock(Engine.class); + Container container = EasyMock.createStrictMock(Container.class); + Context context = EasyMock.createStrictMock(Context.class); + Capture<MCMPRequest> capturedRequest = new Capture<MCMPRequest>(); + + EasyMock.expect(server.findServices()).andReturn(new Service[] { service }); + EasyMock.expect(service.getContainer()).andReturn(engine); - EasyMock.expect(service1.getContainer()).andReturn(engine1); - this.recordRemoveAll(engine1); - EasyMock.expect(engine1.findChildren()).andReturn(new Container[] { container1 }); - EasyMock.expect(container1.findChildren()).andReturn(new Container[] { context1 }); - this.recordRemoveContext(context1, container1, engine1); + // Expect log message + EasyMock.expect(engine.getName()).andReturn("engine"); - EasyMock.expect(service2.getContainer()).andReturn(engine2); - this.recordRemoveAll(engine2); - EasyMock.expect(engine2.findChildren()).andReturn(new Container[] { container2 }); - EasyMock.expect(container2.findChildren()).andReturn(new Container[] { context2 }); - this.recordRemoveContext(context2, container2, engine2); + EasyMock.expect(engine.getJvmRoute()).andReturn("host1").times(2); - EasyMock.replay(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); + this.mcmpHandler.sendRequest(EasyMock.capture(capturedRequest)); + EasyMock.expect(engine.findChildren()).andReturn(new Container[] { container }); + EasyMock.expect(container.findChildren()).andReturn(new Container[] { context }); + this.recordRemoveContext(context, container, engine); + + EasyMock.replay(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); + this.handler.stopServer(server); - EasyMock.verify(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); - EasyMock.reset(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service1, service2, engine1, engine2, container1, container2, context1, context2); + EasyMock.verify(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); + + MCMPRequest request = capturedRequest.getValue(); + + assertSame(MCMPRequestType.REMOVE_APP, request.getRequestType()); + assertTrue(request.isWildcard()); + assertEquals(Collections.singletonMap("JVMRoute", "host1"), request.getParameters()); + + EasyMock.reset(this.mcmpHandler, this.nodeConfig, this.balancerConfig, server, service, engine, container, context); } } \ No newline at end of file