Author: pferraro Date: 2008-10-31 17:34:10 -0400 (Fri, 31 Oct 2008) New Revision: 2044 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java Log: Refactored reset request source logic to support multiple virtual hosts Reset request logic will now handle missing vhosts. Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-10-31 20:56:32 UTC (rev 2043) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/ha/HASingletonAwareResetRequestSourceTestCase.java 2008-10-31 21:34:10 UTC (rev 2044) @@ -99,7 +99,6 @@ Server server = EasyMock.createStrictMock(Server.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); Host host = EasyMock.createStrictMock(Host.class); Connector connector = new Connector("AJP/1.3"); @@ -132,19 +131,18 @@ EasyMock.expect(this.balancerConfig.getWorkerTimeout()).andReturn(6); EasyMock.expect(this.balancerConfig.getMaxAttempts()).andReturn(7); - EasyMock.expect(engine.findChildren()).andReturn(new Container[] { container }); - EasyMock.expect(container.findChildren()).andReturn(new Container[] { context }); - EasyMock.expect(context.getPath()).andReturn("/context"); - EasyMock.expect(context.isStarted()).andReturn(true); - EasyMock.expect(context.getParent()).andReturn(host); - EasyMock.expect(host.getName()).andReturn("host"); + EasyMock.expect(engine.findChildren()).andReturn(new Container[] { host }); + EasyMock.expect(host.getName()).andReturn("host").times(2); EasyMock.expect(host.findAliases()).andReturn(new String[] { "alias1", "alias2" }); + EasyMock.expect(host.findChildren()).andReturn(new Container[] { context }); + EasyMock.expect(context.getPath()).andReturn("/context"); + EasyMock.expect(context.isStarted()).andReturn(true); - EasyMock.replay(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.replay(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); results = this.source.getResetRequests(emptyResponseMap); - EasyMock.verify(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.verify(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); Assert.assertEquals(4, results.size()); @@ -185,9 +183,8 @@ Assert.assertSame(request1, results.get(2)); Assert.assertSame(request2, results.get(3)); - EasyMock.reset(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.reset(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); - // Test non-master results = this.source.getResetRequests(emptyResponseMap); @@ -208,7 +205,6 @@ Server server = EasyMock.createStrictMock(Server.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); Host host = EasyMock.createStrictMock(Host.class); Connector connector = new Connector("AJP/1.3"); @@ -235,19 +231,18 @@ EasyMock.expect(this.balancerConfig.getWorkerTimeout()).andReturn(6); EasyMock.expect(this.balancerConfig.getMaxAttempts()).andReturn(7); - EasyMock.expect(engine.findChildren()).andReturn(new Container[] { container }); - EasyMock.expect(container.findChildren()).andReturn(new Container[] { context }); - EasyMock.expect(context.getPath()).andReturn("/context"); - EasyMock.expect(context.isStarted()).andReturn(true); - EasyMock.expect(context.getParent()).andReturn(host); - EasyMock.expect(host.getName()).andReturn("host"); + EasyMock.expect(engine.findChildren()).andReturn(new Container[] { host }); + EasyMock.expect(host.getName()).andReturn("host").times(2); EasyMock.expect(host.findAliases()).andReturn(new String[] { "alias1", "alias2" }); + EasyMock.expect(host.findChildren()).andReturn(new Container[] { context }); + EasyMock.expect(context.getPath()).andReturn("/context"); + EasyMock.expect(context.isStarted()).andReturn(true); - EasyMock.replay(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.replay(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); results = this.source.getLocalResetRequests(emptyResponseMap); - EasyMock.verify(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.verify(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); Assert.assertEquals(2, results.size()); @@ -285,6 +280,6 @@ Assert.assertEquals("/context", parameters.get("Context")); Assert.assertEquals("host,alias1,alias2", parameters.get("Alias")); - EasyMock.reset(this.singleton, this.key, this.partition, server, service, engine, container, context, host, this.nodeConfig, this.balancerConfig); + EasyMock.reset(this.singleton, this.key, this.partition, server, service, engine, context, host, this.nodeConfig, this.balancerConfig); } }