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

Fix JmsMockTests for bad Mockito usage

Browse Source 
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2074

Upgrade to SK-2.0 M1 and SIK-3.0 M1

Fix JPA sample adding `SEQUENCE HIBERNATE_SEQUENCE` DDL
into the `schema.sql`

https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2078/

The latest Hibernate version doesn't create such a DB entity if
we use `hibernate.ddl-auto: none`

Increase timeouts in the JMS and TCP tests
This commit is contained in:
Artem Bilan
2017-04-27 16:19:02 -04:00
parent fdb9ddceeb
commit be0e24aea5
11 changed files with 79 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.tcpclientserver;
import static org.hamcrest.Matchers.containsString;
@@ -53,7 +54,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @since 2.1
*
*/
@ContextConfiguration(loader=CustomTestContextLoader.class, locations={"/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml"})
@ContextConfiguration(loader = CustomTestContextLoader.class,
locations = { "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml" })
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
public class TcpClientServerDemoTest {
@@ -84,15 +86,17 @@ public class TcpClientServerDemoTest {
results.add(i);
final int j = i;
executor.execute(new Runnable() {
@Override
public void run() {
String result = gw.send(j + "Hello world!"); // first 3 bytes is correlationid
assertEquals(j + "Hello world!:echo", result);
results.remove(j);
latch.countDown();
}});
}
});
}
assertTrue(latch.await(10, TimeUnit.SECONDS));
assertTrue(latch.await(20, TimeUnit.SECONDS));
assertEquals(0, results.size());
}