Author: rareddy Date: 2009-04-20 22:41:33 -0400 (Mon, 20 Apr 2009) New Revision: 812 Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java Log: TEIID-177: adding language processors such that same code can be compiled aginst java 1.5 and java 1.6. Also between JDBC 4.0 and JDBC 3.0 Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java =================================================================== --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-04-21 02:16:03 UTC (rev 811) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/client/TestSocketServerConnection.java 2009-04-21 02:41:33 UTC (rev 812) @@ -59,20 +59,26 @@ Throwable t; + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public void assertIdentity(SessionToken sessionId) throws InvalidSessionException, MetaMatrixComponentException { } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public ResultsFuture<?> logoff() throws InvalidSessionException, MetaMatrixComponentException { return null; } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public LogonResult logon( Properties connectionProperties) throws LogonException, @@ -80,7 +86,9 @@ return new LogonResult(new SessionToken(new MetaMatrixSessionID(1), "fooUser"), new Properties(), "fake"); //$NON-NLS-1$ //$NON-NLS-2$ } + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public ResultsFuture<?> ping() throws InvalidSessionException, MetaMatrixComponentException { @@ -120,7 +128,9 @@ public void testLogonFailsWithMultipleHosts() throws Exception { Properties p = new Properties(); SocketServerInstanceFactory instanceFactory = new SocketServerInstanceFactory() { + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public SocketServerInstance getServerInstance(HostInfo info, boolean ssl) throws CommunicationException, IOException { throw new SingleInstanceCommunicationException(); @@ -182,7 +192,9 @@ Properties p = new Properties(); ServerDiscovery discovery = new UrlServerDiscovery(new MMURL(hostInfo.getHostName(), hostInfo.getPortNumber(), false)); SocketServerInstanceFactory instanceFactory = new SocketServerInstanceFactory() { + //## JDBC4.0-begin ## @Override + //## JDBC4.0-end ## public SocketServerInstance getServerInstance(final HostInfo info, boolean ssl) throws CommunicationException, IOException { SocketServerInstance instance = Mockito.mock(SocketServerInstance.class);