Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1495: change domain= to default-deomain=

Browse Source
This commit is contained in:
Dave Syer
2010-10-06 10:56:08 -07:00
parent 84415d6f53
commit 71f171b163
14 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java
View File

@@ -82,7 +82,7 @@ public class ControlBusOperationChannelTests {
context.registerBeanDefinition("mbeanServer", serverDef);
BeanDefinition exporterDef = new RootBeanDefinition(IntegrationMBeanExporter.class);
exporterDef.getPropertyValues().addPropertyValue("server", new RuntimeBeanReference("mbeanServer"));
exporterDef.getPropertyValues().addPropertyValue("domain", domain);
exporterDef.getPropertyValues().addPropertyValue("defaultDomain", domain);
context.registerBeanDefinition("exporter", exporterDef);
BeanDefinition controlBusDef = new RootBeanDefinition(ControlBus.class);
controlBusDef.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference("mbeanServer"));

2
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
View File

@@ -188,7 +188,7 @@ public class ControlBusTests {
private BeanDefinition registerControlBus(GenericApplicationContext context, String domain) {
BeanDefinition exporterDef = new RootBeanDefinition(IntegrationMBeanExporter.class);
exporterDef.getPropertyValues().addPropertyValue("server", new RuntimeBeanReference("mbeanServer"));
exporterDef.getPropertyValues().addPropertyValue("domain", domain);
exporterDef.getPropertyValues().addPropertyValue("defaultDomain", domain);
context.registerBeanDefinition("exporter", exporterDef);
BeanDefinition controlBusDef = new RootBeanDefinition(ControlBus.class);
controlBusDef.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference("mbeanServer"));

2
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml
View File

@@ -29,7 +29,7 @@
<bean id="mbeanExporter" class="org.springframework.integration.monitor.IntegrationMBeanExporter">
<property name="server" ref="mbeanServer" />
<property name="domain" value="control.bus.xml.test" />
<property name="defaultDomain" value="control.bus.xml.test" />
</bean>
<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">

2
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests-context.xml
View File

@@ -19,6 +19,6 @@
<jmx:control-bus mbean-exporter="mbeanExporter" operation-channel="testChannel"/>
<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.ControlBusParser"/>
<jmx:mbean-export id="mbeanExporter" server="mbs" default-domain="tests.ControlBusParser"/>
</beans>

2
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml
View File

@@ -17,6 +17,6 @@
<si:channel id="testChannel"/>
<jmx:mbean-export id="mbeanExporter" server="mbs" domain="tests.MBeanExpoerterParser"/>
<jmx:mbean-export id="mbeanExporter" server="mbs" default-domain="tests.MBeanExpoerterParser"/>
</beans>

2
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests-context.xml
View File

@@ -25,6 +25,6 @@
</int:payload-type-router>
<jmx:mbean-export id="mbeanExporter" server="mbs"
domain="tests.RouterMBean" />
default-domain="test.RouterMBean" />
</beans>

4
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java
View File

@@ -39,7 +39,7 @@ public class RouterMBeanTests {
@Test
public void testRouterMBeanExists() throws Exception {
Set<ObjectName> names = server.queryNames(new ObjectName("*:type=MessageHandler,name=ptRouter,*"), null);
Set<ObjectName> names = server.queryNames(new ObjectName("test.RouterMBean:type=MessageHandler,name=ptRouter,*"), null);
assertEquals(1, names.size());
}
@@ -47,7 +47,7 @@ public class RouterMBeanTests {
public void testRouterMBeanOnlyRegisteredOnce() throws Exception {
// System.err.println(server.queryNames(new ObjectName("*:type=MessageHandler,*"), null));
// The errorLogger and the router
assertEquals(2, server.queryNames(new ObjectName("*:type=MessageHandler,*"), null).size());
assertEquals(2, server.queryNames(new ObjectName("test.RouterMBean:type=MessageHandler,*"), null).size());
}
}

2
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml
View File

@@ -16,7 +16,7 @@
<bean id="mbeanExporter"
class="org.springframework.integration.monitor.IntegrationMBeanExporter"
p:server-ref="mbeanServer" p:domain="forum" />
p:server-ref="mbeanServer" p:defaultDomain="forum" />
<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"
p:locateExistingServerIfPossible="true" />

2
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java
View File

@@ -24,7 +24,7 @@ public class ChainWithMessageProducingHandlersTests {
private ApplicationContext applicationContext;
@Test
public void testSuccessfullApplicationContext(){
public void testSuccessfulApplicationContext(){
// this is all we need to do. Until INT-1431 was solved initialization of this AC would fail.
assertNotNull(applicationContext);
}

2
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests-context.xml
View File

@@ -15,7 +15,7 @@
<bean id="mbeanExporter" class="org.springframework.integration.monitor.IntegrationMBeanExporter">
<property name="server" ref="mbeanServer" />
<property name="domain" value="test.ChannelIntegrationTests"/>
<property name="defaultDomain" value="test.ChannelIntegrationTests"/>
</bean>
<bean id="mbeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean">

33
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ExponentialMovingAverageRateTests.java
View File

@@ -1,17 +1,14 @@
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.integration.monitor;
@@ -27,8 +24,7 @@ import org.junit.Test;
*/
public class ExponentialMovingAverageRateTests {
private ExponentialMovingAverageRate history = new ExponentialMovingAverageRate(
1., 10., 10);
private ExponentialMovingAverageRate history = new ExponentialMovingAverageRate(1., 10., 10);
@Test
public void testGetCount() {
@@ -49,7 +45,7 @@ public class ExponentialMovingAverageRateTests {
assertEquals(0, history.getMean(), 0.01);
Thread.sleep(20L);
history.increment();
assertEquals(50, history.getMean(), 10);
assertTrue(history.getMean() > 10);
}
@Test
@@ -59,9 +55,10 @@ public class ExponentialMovingAverageRateTests {
history.increment();
Thread.sleep(20L);
history.increment();
assertEquals(50, history.getMean(), 10);
double before = history.getMean();
assertTrue(before > 10);
Thread.sleep(20L);
assertEquals(35, history.getMean(), 10);
assertTrue(history.getMean() < before);
}
@Test
@@ -74,7 +71,7 @@ public class ExponentialMovingAverageRateTests {
history.increment();
Thread.sleep(18L);
// System.err.println(history);
assertTrue("Standard deviation should be non-zero: "+history, history.getStandardDeviation()>0);
assertTrue("Standard deviation should be non-zero: " + history, history.getStandardDeviation() > 0);
}
}