From: <mro...@us...> - 2014-04-29 13:03:25
|
Revision: 59498 http://sourceforge.net/p/firebird/code/59498 Author: mrotteveel Date: 2014-04-29 13:03:22 +0000 (Tue, 29 Apr 2014) Log Message: ----------- Make test compile on Java 6 Modified Paths: -------------- client-java/trunk/src/test/org/firebirdsql/gds/ng/wire/version10/TestV10InputBlobMock.java Modified: client-java/trunk/src/test/org/firebirdsql/gds/ng/wire/version10/TestV10InputBlobMock.java =================================================================== --- client-java/trunk/src/test/org/firebirdsql/gds/ng/wire/version10/TestV10InputBlobMock.java 2014-04-29 12:33:58 UTC (rev 59497) +++ client-java/trunk/src/test/org/firebirdsql/gds/ng/wire/version10/TestV10InputBlobMock.java 2014-04-29 13:03:22 UTC (rev 59498) @@ -26,6 +26,7 @@ import org.firebirdsql.gds.ng.listeners.TransactionListener; import org.firebirdsql.gds.ng.wire.FbWireDatabase; import org.firebirdsql.gds.ng.wire.FbWireTransaction; +import org.hamcrest.CoreMatchers; import org.jmock.Expectations; import org.jmock.integration.junit4.JUnitRuleMockery; import org.junit.Before; @@ -37,7 +38,6 @@ import java.sql.SQLNonTransientException; import static org.firebirdsql.common.matchers.SQLExceptionMatchers.*; -import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.startsWith; import static org.jmock.Expectations.returnValue; @@ -93,8 +93,9 @@ @Test public void testGetSegment_requestedSizeZero() throws Exception { expectedException.expect(SQLException.class); + //noinspection RedundantTypeArguments expectedException.expect( - message(allOf( + message(CoreMatchers.<String>allOf( /* generic param required for Java 6 */ startsWith("getSegment called with sizeRequested"), endsWith(", should be > 0")))); @@ -110,8 +111,9 @@ @Test public void testGetSegment_requestedSizeLessThanZero() throws Exception { expectedException.expect(SQLException.class); + //noinspection RedundantTypeArguments expectedException.expect( - message(allOf( + message(CoreMatchers.<String>allOf( /* generic param required for Java 6 */ startsWith("getSegment called with sizeRequested"), endsWith(", should be > 0")))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |