From 56ad69b3f636ae2446043c92d803569235e83e02 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 23 Jan 2014 13:18:23 -0500 Subject: [PATCH] INT-3276 Failing CI Tests * Add test diagnostics * Increase timers JIRA: https://jira.springsource.org/browse/INT-3276 --- ...regatorWithCustomReleaseStrategyTests.java | 4 ++-- ...nitionHandlerAwareEndpointParserTests.java | 10 ++++++---- .../util/BeanFactoryTypeConverterTests.java | 19 ++++++++++++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java index 751a08b8a3..380c0a1235 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java @@ -91,7 +91,7 @@ public class AggregatorWithCustomReleaseStrategyTests { }); } - assertTrue("Sends failed to complete", latch.await(60, TimeUnit.SECONDS)); + assertTrue("Sends failed to complete: " + latch.getCount() + " remain", latch.await(60, TimeUnit.SECONDS)); Message message = resultChannel.receive(1000); int counter = 0; @@ -135,7 +135,7 @@ public class AggregatorWithCustomReleaseStrategyTests { }); } - assertTrue("Sends failed to complete", latch.await(60, TimeUnit.SECONDS)); + assertTrue("Sends failed to complete: " + latch.getCount() + " remain", latch.await(60, TimeUnit.SECONDS)); Message message = resultChannel.receive(1000); int counter = 0; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java index 50c251a243..9b5f22106a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -29,6 +29,7 @@ import java.util.Properties; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; @@ -38,11 +39,11 @@ import org.springframework.core.io.InputStreamResource; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; -import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.CollectionUtils; @@ -51,6 +52,7 @@ import org.springframework.util.StringUtils; /** * @author Oleg Zhurakousky * @author Gunnar Hillert + * @author Gary Russell */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -252,11 +254,11 @@ public class InnerDefinitionHandlerAwareEndpointParserTests { MessageChannel inChannel = (MessageChannel) ac.getBean("inChannel"); for (int i = 0; i < 5; i++) { Map headers = stubHeaders(i, 5, 1); - Message message = MessageBuilder.withPayload(i).copyHeaders(headers).build(); + Message message = MessageBuilder.withPayload(i).copyHeaders(headers).build(); inChannel.send(message); } PollableChannel output = (PollableChannel) ac.getBean("outChannel"); - Message receivedMessage = output.receive(2000); + Message receivedMessage = output.receive(10000); assertNotNull(receivedMessage); assertEquals(0 + 1 + 2 + 3 + 4, receivedMessage.getPayload()); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index f3505a67cb..0ef6707149 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -15,11 +15,13 @@ */ package org.springframework.integration.util; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; @@ -58,10 +60,10 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.MethodInvokingMessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.history.MessageHistory; -import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.support.context.NamedComponent; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.GenericMessage; /** * @author Oleg Zhurakousky @@ -112,10 +114,12 @@ public class BeanFactoryTypeConverterTests { typeConverter.setBeanFactory(new DefaultListableBeanFactory()); Message message = new GenericMessage("foo"); message = MessageHistory.write(message, new NamedComponent(){ + @Override public String getComponentName() { return "bar"; } + @Override public String getComponentType() { return "baz"; } @@ -159,6 +163,7 @@ public class BeanFactoryTypeConverterTests { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); DefaultConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter() { + @Override public Bar convert(Foo source) { return new Bar(); } @@ -182,7 +187,7 @@ public class BeanFactoryTypeConverterTests { foos.put("foo", fooMap); bars = (Map>>) typeConverter.convertValue(foos, sourceType, targetType); - assertTrue(bars.get("foo").get("foo").iterator().next() instanceof Bar); + assertThat(bars.get("foo").get("foo").iterator().next(), instanceOf(Bar.class)); Service service = new Service(); MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(service, "handle"); @@ -201,6 +206,7 @@ public class BeanFactoryTypeConverterTests { DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); DefaultConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter() { + @Override public Bar convert(Foo source) { return new Bar(); } @@ -254,6 +260,7 @@ public class BeanFactoryTypeConverterTests { DefaultConversionService conversionService = new DefaultConversionService(); final Foo foo = new Foo(); conversionService.addConverter(new Converter() { + @Override public Foo convert(String source) { return foo; } @@ -286,6 +293,7 @@ public class BeanFactoryTypeConverterTests { final AtomicBoolean concurrentlyInGetDefaultEditor = new AtomicBoolean(); final AtomicInteger count = new AtomicInteger(); doAnswer(new Answer() { + @Override public Object answer(InvocationOnMock invocation) throws Throwable { count.incrementAndGet(); Thread.sleep(500); @@ -300,6 +308,7 @@ public class BeanFactoryTypeConverterTests { final TypeDescriptor targetType = TypeDescriptor.valueOf(String.class); ExecutorService exec = Executors.newFixedThreadPool(2); Runnable test = new Runnable() { + @Override public void run() { beanFactoryTypeConverter.canConvert(sourceType, targetType); beanFactoryTypeConverter.convertValue(UUID.randomUUID(), sourceType, targetType); @@ -324,12 +333,12 @@ public class BeanFactoryTypeConverterTests { public static class Service { public String handle(Map>> payload) { - assertTrue(payload.get("foo").get("foo").iterator().next() instanceof Bar); + assertThat(payload.get("foo").get("foo").iterator().next(), instanceOf(Bar.class)); return "bar"; } public String handle(Collection payload) { - assertTrue(payload.iterator().next() instanceof Bar); + assertThat(payload.iterator().next(), instanceOf(Bar.class)); return "baz"; } }