Improved required coverage

Author: valdasraps

src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java

@@ -28,8 +28,11 @@
 import net.sf.jsqlparser.statement.select.Select;
 import org.junit.After;
 import org.junit.AfterClass;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -102,4 +105,30 @@ public void visit(InExpression expr) {
         assertTrue(exprList.get(1) instanceof ItemsList);
         assertTrue(exprList.get(2) instanceof ItemsList);
     }
+    
+    @Test
+    public void testOracleHintExpressions() throws JSQLParserException {
+        testOracleHintExpression("select --+ MYHINT \n * from foo", "MYHINT", true);
+        testOracleHintExpression("select /*+ MYHINT */ * from foo", "MYHINT", false);
+    }
+
+    public static void testOracleHintExpression(String sql, String hint, boolean singleLine) throws JSQLParserException {
+        Select select = (Select) CCJSqlParserUtil.parse(sql);
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        final OracleHint[] holder = new OracleHint[1];
+        assertNotNull(plainSelect.getOracleHint());
+        plainSelect.getOracleHint().accept(new ExpressionVisitorAdapter() {
+
+            @Override
+            public void visit(OracleHint hint) {
+                super.visit(hint);
+                holder[0] = hint;
+            }
+        });
+        
+        assertNotNull(holder[0]);
+        assertEquals(singleLine, holder[0].isSingleLine());
+        assertEquals(hint, holder[0].getValue());
+    }
+    
 }

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -1991,5 +1991,14 @@ public void testOracleHint() throws JSQLParserException {
         assertOracleHintExists("(SELECT --+ HINT1 HINT2 HINT3\n * from t1) UNION (select /*+ HINT4 HINT5 */ * from dual)", true, "HINT1 HINT2 HINT3", "HINT4 HINT5");
 
     }
+    
+    public void testOracleHintExpression() throws JSQLParserException {
+        String statement = "SELECT --+ HINT\n * FROM tab1";
+        Statement parsed = parserManager.parse(new StringReader(statement));
+
+        assertEquals(statement, parsed.toString());
+        PlainSelect plainSelect = (PlainSelect) ((Select) parsed).getSelectBody();
+        assertExpressionCanBeDeparsedAs(plainSelect.getOracleHint(), "--+ HINT\n");
+    }
 
 }

src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java

@@ -9,6 +9,7 @@
 import java.util.StringTokenizer;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.OracleHint;
 
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -333,4 +334,24 @@ public void testExpr() throws JSQLParserException {
 	private String getLine(BufferedReader in) throws Exception {
 		return CCJSqlParserManagerTest.getLine(in);
 	}
+        
+    @Test
+    public void testOracleHint() throws JSQLParserException {
+        String sql = "select --+ HINT\ncol2 from mytable";
+        Select select = (Select) CCJSqlParserUtil.parse(sql);
+        final OracleHint[] holder = new OracleHint[1];
+        TablesNamesFinder tablesNamesFinder = new TablesNamesFinder() {
+
+            @Override
+            public void visit(OracleHint hint) {
+                super.visit(hint);
+                holder[0] = hint;
+            }
+            
+        };
+        tablesNamesFinder.getTableList(select);
+        assertNull(holder[0]);
+
+    }
+        
 }