JDBC-193: Add test for quoted procedure name + invert logic for check…

…ing expected procedures to get count of all returned procedures
FirebirdSQL · Jan 21, 2012 · 6f4a06c · 6f4a06c
1 parent 886fd32
commit 6f4a06c
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java b/src/test/org/firebirdsql/jdbc/TestFBDatabaseMetaDataProcedures.java
@@ -155,6 +155,15 @@ public void testProcedureMetaData_specificProcedure() throws Exception {
         validateProcedures(procedures, expectedProcedures);
     }
 
+    /**
+     * Tests getProcedures with specific procedure name (quoted), expecting only that specific procedure to be returned.
+     */
+    public void testProcedureMetaData_specificProcedureQuoted() throws Exception {
+        List<ProcedureTestData> expectedProcedures = Arrays.asList(ProcedureTestData.QUOTED_PROC_NO_RETURN);
+        ResultSet procedures = dbmd.getProcedures(null, null, expectedProcedures.get(0).getName());
+        validateProcedures(procedures, expectedProcedures);
+    }
+
     // TODO Add tests for more complex patterns
 
     /**
@@ -166,13 +175,12 @@ public void testProcedureMetaData_specificProcedure() throws Exception {
     private void validateProcedures(ResultSet procedures, List<ProcedureTestData> expectedProcedures) throws Exception {
         int procedureCount = 0;
         while(procedures.next()) {
-            if (procedureCount > expectedProcedures.size()) {
-                continue;
+            if (procedureCount < expectedProcedures.size()) {
+                ProcedureTestData expectedProcedure = expectedProcedures.get(procedureCount);
+                Map<ProcedureMetaData, Object> rules = expectedProcedure.getSpecificValidationRules(getDefaultValueValidationRules());
+                checkValidationRulesComplete(rules);
+                validateRowValues(procedures, rules);
             }
-            ProcedureTestData expectedProcedure = expectedProcedures.get(procedureCount);
-            Map<ProcedureMetaData, Object> rules = expectedProcedure.getSpecificValidationRules(getDefaultValueValidationRules());
-            checkValidationRulesComplete(rules);
-            validateRowValues(procedures, rules);
             procedureCount++;
         }
         assertEquals("Unexpected number of procedures returned", expectedProcedures.size(), procedureCount);