Author: vhalbert(a)redhat.com Date: 2010-01-13 09:57:32 -0500 (Wed, 13 Jan 2010) New Revision: 1734 Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestConnectionWrapper.java Log: Teiid-931 TestSocketServerInstanceImpl - added logic to check the array bounds TestConnectionWrapper - increased the Thread.sleep to 50 Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2010-01-13 06:06:07 UTC (rev 1733) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerInstanceImpl.java 2010-01-13 14:57:32 UTC (rev 1734) @@ -84,6 +84,10 @@ //## JDBC4.0-end ## public Object read() throws IOException, ClassNotFoundException { + if (readCount >= readMsgs.size()) { + return ""; + } + Object msg = readMsgs.get(readCount++); if (msg instanceof IOException) { if (msg instanceof SocketTimeoutException) { Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestConnectionWrapper.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestConnectionWrapper.java 2010-01-13 06:06:07 UTC (rev 1733) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestConnectionWrapper.java 2010-01-13 14:57:32 UTC (rev 1734) @@ -35,7 +35,7 @@ public void testIdleTime() throws Exception { ConnectionWrapper wrapper = new ConnectionWrapper(Mockito.mock(BasicConnection.class), Mockito.mock(ConnectionPool.class), 1); long time = wrapper.getTimeReturnedToPool(); - Thread.sleep(5); + Thread.sleep(50); wrapper.close(); assertTrue(wrapper.getTimeReturnedToPool() - time > 0); }