TEIID-3177 improving error message and adding a test

client/src/test/java/org/teiid/jdbc/util/ResultSetUtil.java

@@ -49,7 +49,7 @@ public class ResultSetUtil {
     public static void printResultSet(ResultSet rs) throws SQLException, IOException {
     	PrintWriter pw = new PrintWriter(System.out);
     	printResultSet(rs, 100, true, pw);
-    	pw.close();
+    	pw.flush();
     }
 
     /**

runtime/src/main/resources/org/teiid/runtime/i18n.properties

@@ -126,4 +126,4 @@ TEIID40121=In VDB {1}.{2} model "{0}" has an invalid name.  Model names must be
 TEIID40122=Could not initialize ODBC SSL.  No connections will be allowed since SSL is required.
 TEIID40123=SSL is required.
 TEIID40124=SSL is required, but not configured properly on the server.
-TEIID40125=A secure authentication is required - either a SSL connection or GSS authentication.  Alternatively org.teiid.ODBCRequireSecure can be set to false.
+TEIID40125=A secure authentication is required, such as a GSS authentication.

test-integration/common/src/test/java/org/teiid/transport/TestODBCSSL.java

@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.transport;
+
+import static org.junit.Assert.*;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Test;
+import org.postgresql.Driver;
+import org.teiid.jdbc.TestMMDatabaseMetaData;
+import org.teiid.transport.TestODBCSocketTransport.AnonSSLSocketFactory;
+import org.teiid.transport.TestODBCSocketTransport.FakeOdbcServer;
+import org.teiid.transport.TestODBCSocketTransport.Mode;
+
+@SuppressWarnings("nls")
+public class TestODBCSSL {
+
+	FakeOdbcServer odbcServer = new FakeOdbcServer();
+
+	@After public void tearDown() {
+		odbcServer.stop();
+	}
+
+	@Test public void testSelectSsl() throws Exception {
+		odbcServer.start(Mode.ENABLED);
+		Driver d = new Driver();
+		Properties p = new Properties();
+		p.setProperty("user", "testuser");
+		p.setProperty("password", "testpassword");
+		p.setProperty("ssl", "true");
+		p.setProperty("sslfactory", AnonSSLSocketFactory.class.getName());
+		Connection conn = d.connect("jdbc:postgresql://"+odbcServer.addr.getHostName()+":" +odbcServer.odbcTransport.getPort()+"/parts", p);
+		Statement s = conn.createStatement();
+		assertTrue(s.execute("select * from tables order by name"));
+		TestMMDatabaseMetaData.compareResultSet("TestODBCSocketTransport/testSelect", s.getResultSet());
+
+		p.remove("ssl");
+		try {
+			conn = d.connect("jdbc:postgresql://"+odbcServer.addr.getHostName()+":" +odbcServer.odbcTransport.getPort()+"/parts", p);
+			fail("should require ssl");
+		} catch (SQLException e) {
+
+		}
+	}
+
+	@Test(expected=SQLException.class) public void testLogin() throws Exception {
+		odbcServer.start(Mode.LOGIN);
+		Driver d = new Driver();
+		Properties p = new Properties();
+		p.setProperty("user", "testuser");
+		p.setProperty("password", "testpassword");
+		d.connect("jdbc:postgresql://"+odbcServer.addr.getHostName()+":" +odbcServer.odbcTransport.getPort()+"/parts", p);
+	}
+
+	@Test(expected=SQLException.class) public void testNonSSL() throws Exception {
+		odbcServer.start(Mode.DISABLED);
+		Driver d = new Driver();
+		Properties p = new Properties();
+		p.setProperty("user", "testuser");
+		p.setProperty("password", "testpassword");
+		p.setProperty("ssl", "true");
+		p.setProperty("sslfactory", AnonSSLSocketFactory.class.getName());
+		d.connect("jdbc:postgresql://"+odbcServer.addr.getHostName()+":" +odbcServer.odbcTransport.getPort()+"/parts", p);
+	}
+
+}