jdk annotations for some java.sql methods, related cleanup in stdlib & tests

compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt

@@ -0,0 +1,33 @@
+import java.sql.DriverManager
+
+fun getConnection(url: String?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url)
+  DriverManager.getConnection(url!!) : java.sql.Connection
+}
+
+fun getConnection(url: String?, props: java.util.Properties?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url, props)
+  DriverManager.getConnection(url!!, props) : java.sql.Connection
+}
+
+fun getConnection(url: String?, user: String?, password: String?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url, user!!, password!!)
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url!!, user, password!!)
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url!!, user!!, password)
+  DriverManager.getConnection(url!!, user!!, password!!) : java.sql.Connection
+}
+
+fun getDriver(url: String?) {
+  DriverManager.getDriver(<!TYPE_MISMATCH!>url<!>)
+  DriverManager.getDriver(url!!) : java.sql.Driver
+}
+
+fun registerDriver(driver: java.sql.Driver?) {
+   DriverManager.registerDriver(<!TYPE_MISMATCH!>driver<!>)
+   DriverManager.registerDriver(driver!!)
+}
+
+fun getDrivers() {
+   // todo fix to java.util.Enumeration<java.sql.Driver> bug in compiler fixed
+   DriverManager.getDrivers() : java.util.Enumeration<*>
+}

compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt

@@ -0,0 +1,3 @@
+fun getMetaData(rs: java.sql.ResultSet) {
+  rs.getMetaData() : java.sql.ResultSetMetaData
+}

compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt

@@ -0,0 +1,13 @@
+fun executeQuery(statement: java.sql.Statement, cmd: String?) {
+  statement.executeQuery(<!TYPE_MISMATCH!>cmd<!>)
+  statement.executeQuery(cmd!!) : java.sql.ResultSet
+}
+
+fun executeQuery(statement: java.sql.PreparedStatement) {
+  statement.executeQuery() : java.sql.ResultSet
+}
+
+fun executeUpdate(statement: java.sql.Statement, cmd: String?) {
+  statement.<!NONE_APPLICABLE!>executeUpdate<!>(cmd)
+  statement.executeUpdate(cmd!!)
+}

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java

@@ -13,18 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.jetbrains.jet.checkers;
 
-import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
-import java.io.File;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
+import java.io.File;
 
 /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve}. DO NOT MODIFY MANUALLY */
 @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class})
@@ -2047,6 +2045,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations")
+        @InnerTestClasses({Jdk_annotations.Sql.class})
         public static class Jdk_annotations extends AbstractDiagnosticsTestWithEagerResolve {
             public void testAllFilesPresentInJdk_annotations() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/jdk-annotations"), "kt", true);
@@ -2067,6 +2066,35 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt");
             }
             
+            @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql")
+            public static class Sql extends AbstractDiagnosticsTestWithEagerResolve {
+                public void testAllFilesPresentInSql() throws Exception {
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), "kt", true);
+                }
+                
+                @TestMetadata("DriverManager.kt")
+                public void testDriverManager() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt");
+                }
+                
+                @TestMetadata("ResultSet.kt")
+                public void testResultSet() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt");
+                }
+                
+                @TestMetadata("Statement.kt")
+                public void testStatement() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt");
+                }
+                
+            }
+            
+            public static Test innerSuite() {
+                TestSuite suite = new TestSuite("Jdk_annotations");
+                suite.addTestSuite(Jdk_annotations.class);
+                suite.addTestSuite(Sql.class);
+                return suite;
+            }
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/library")
@@ -3446,7 +3474,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             suite.addTest(Inference.innerSuite());
             suite.addTestSuite(Infos.class);
             suite.addTestSuite(J_k.class);
-            suite.addTestSuite(Jdk_annotations.class);
+            suite.addTest(Jdk_annotations.innerSuite());
             suite.addTestSuite(Library.class);
             suite.addTestSuite(NullabilityAndAutoCasts.class);
             suite.addTestSuite(Objects.class);