For #660: refactor unsupported sql test case folder

sharding-sql-test/src/main/java/io/shardingjdbc/test/sql/SQLCasesLoader.java

@@ -52,7 +52,7 @@ public final class SQLCasesLoader {
     
     static {
         STATEMENT_MAP = loadSQLCases("sql");
-        UNSUPPORTED_STATEMENT_MAP = loadSQLCases("sql/unsupported");
+        UNSUPPORTED_STATEMENT_MAP = loadSQLCases("unsupported_sql");
     }
     
     private static Map<String, SQLCase> loadSQLCases(final String path) {
@@ -71,7 +71,7 @@ public final class SQLCasesLoader {
             while (entries.hasMoreElements()) {
                 String name = entries.nextElement().getName();
                 if (name.startsWith(path + "/") && name.endsWith(".xml")) {
-                    fillStatementMap(result, SQLCasesLoader.class.getClassLoader().getResourceAsStream(name));
+                    fillSQLMap(result, SQLCasesLoader.class.getClassLoader().getResourceAsStream(name));
                 }
             }
         }
@@ -105,17 +105,17 @@ public final class SQLCasesLoader {
                 return;
             }
             for (File each : files) {
-                fillStatementMap(sqlStatementMap, new FileInputStream(each));
+                fillSQLMap(sqlStatementMap, new FileInputStream(each));
             }
         } else {
-            fillStatementMap(sqlStatementMap, new FileInputStream(file));
+            fillSQLMap(sqlStatementMap, new FileInputStream(file));
         }
     }
     
-    private static void fillStatementMap(final Map<String, SQLCase> result, final InputStream inputStream) throws JAXBException {
+    private static void fillSQLMap(final Map<String, SQLCase> sqlCaseMap, final InputStream inputStream) throws JAXBException {
         SQLCases sqlCases = (SQLCases) JAXBContext.newInstance(SQLCases.class).createUnmarshaller().unmarshal(inputStream);
         for (SQLCase statement : sqlCases.getSqlCases()) {
-            result.put(statement.getId(), statement);
+            sqlCaseMap.put(statement.getId(), statement);
         }
     }
     

sharding-sql-test/src/main/resources/sql/unsupported/common.xml → sharding-sql-test/src/main/resources/unsupported_sql/unsupported.xml

@@ -2,10 +2,10 @@
 <sql-cases>
     <sql-case id="assertSelectDistinctWithSingleTable" value="SELECT DISTINCT item_id FROM t_order_item ORDER BY item_id" />
     <sql-case id="assertSelectIntoSQL" value="SELECT * INTO t_order_new FROM t_order" />
-    <sql-case id="assertSelectWindow" value="SELECT * FROM t_order WINDOW w AS (PARTITION BY order_id)" db-types="PostgreSQL"/>
-    <sql-case id="assertSelectFetch" value="SELECT * FROM t_order FETCH NEXT 1 ROW ONLY" db-types="PostgreSQL"/>
-    <sql-case id="assertSelectFor" value="SELECT * FROM t_order FOR UPDATE OF t_order" db-types="PostgreSQL"/>
-    <sql-case id="assertSelectRowNumberAndPartition" value="SELECT ROW_NUMBER() OVER(PARTITION BY user_id ORDER BY order_id ASC) AS row_, user_id, order_id FROM t_order" db-types="SQLServer"/>
-    <sql-case id="assertSelectWithStartWith" value="SELECT * FROM t_order_item START WITH order_id = %s CONNECT BY NOCYCLE PRIOR item_id=item_id-1" db-types="Oracle"/>
-    <sql-case id="assertSelectWithModelIn" value="SELECT order_id_value,order_item_id_value FROM (select 1001 as order_id_value, 100001 as order_item_id_value from dual) MODEL RETURN UPDATED ROWS DIMENSION BY(order_item_id_value) MEASURES(order_id_value) RULES(order_id_value[1] = 10001)" db-types="Oracle"/>
+    <sql-case id="assertSelectWindow" value="SELECT * FROM t_order WINDOW w AS (PARTITION BY order_id)" db-types="PostgreSQL" />
+    <sql-case id="assertSelectFetch" value="SELECT * FROM t_order FETCH NEXT 1 ROW ONLY" db-types="PostgreSQL" />
+    <sql-case id="assertSelectFor" value="SELECT * FROM t_order FOR UPDATE OF t_order" db-types="PostgreSQL" />
+    <sql-case id="assertSelectRowNumberAndPartition" value="SELECT ROW_NUMBER() OVER(PARTITION BY user_id ORDER BY order_id ASC) AS row_, user_id, order_id FROM t_order" db-types="SQLServer" />
+    <sql-case id="assertSelectWithStartWith" value="SELECT * FROM t_order_item START WITH order_id = %s CONNECT BY NOCYCLE PRIOR item_id=item_id-1" db-types="Oracle" />
+    <sql-case id="assertSelectWithModelIn" value="SELECT order_id_value,order_item_id_value FROM (select 1001 as order_id_value, 100001 as order_item_id_value from dual) MODEL RETURN UPDATED ROWS DIMENSION BY(order_item_id_value) MEASURES(order_id_value) RULES(order_id_value[1] = 10001)" db-types="Oracle" />
 </sql-cases>