Make getSql public for better testability

pesse · pesse · commit 166720b28434 · 2019-07-22T22:12:53.000+02:00
diff --git a/src/main/java/org/utplsql/api/testRunner/AbstractTestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/AbstractTestRunnerStatement.java
@@ -32,7 +32,7 @@ public AbstractTestRunnerStatement(TestRunnerOptions options, Connection conn) t
         createStatement();
     }
 
-    protected abstract String getSql();
+    public abstract String getSql();
 
     protected int createStatement() throws SQLException {
 
diff --git a/src/main/java/org/utplsql/api/testRunner/ActualTestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/ActualTestRunnerStatement.java
@@ -19,7 +19,7 @@ public ActualTestRunnerStatement(TestRunnerOptions options, Connection connectio
     }
 
     @Override
-    protected String getSql() {
+    public String getSql() {
         // Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.
         String colorConsoleStr = Boolean.toString(options.colorConsole);
         String failOnErrors = Boolean.toString(options.failOnErrors);
diff --git a/src/main/java/org/utplsql/api/testRunner/Pre303TestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/Pre303TestRunnerStatement.java
@@ -18,7 +18,7 @@ public Pre303TestRunnerStatement(TestRunnerOptions options, Connection conn) thr
     }
 
     @Override
-    protected String getSql() {
+    public String getSql() {
         // Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.
         String colorConsoleStr = Boolean.toString(options.colorConsole);
 
diff --git a/src/main/java/org/utplsql/api/testRunner/Pre312TestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/Pre312TestRunnerStatement.java
@@ -18,7 +18,7 @@ public Pre312TestRunnerStatement(TestRunnerOptions options, Connection connectio
     }
 
     @Override
-    protected String getSql() {
+    public String getSql() {
         // Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.
         String colorConsoleStr = Boolean.toString(options.colorConsole);
         String failOnErrors = Boolean.toString(options.failOnErrors);
diff --git a/src/main/java/org/utplsql/api/testRunner/Pre317TestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/Pre317TestRunnerStatement.java
@@ -18,7 +18,7 @@ public Pre317TestRunnerStatement(TestRunnerOptions options, Connection connectio
     }
 
     @Override
-    protected String getSql() {
+    public String getSql() {
         // Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.
         String colorConsoleStr = Boolean.toString(options.colorConsole);
         String failOnErrors = Boolean.toString(options.failOnErrors);
diff --git a/src/main/java/org/utplsql/api/testRunner/TestRunnerStatement.java b/src/main/java/org/utplsql/api/testRunner/TestRunnerStatement.java
@@ -11,6 +11,8 @@ public interface TestRunnerStatement extends AutoCloseable {
 
     void execute() throws SQLException;
 
+    String getSql();
+
     @Override
     void close() throws SQLException;
 }
diff --git a/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java b/src/test/java/org/utplsql/api/testRunner/TestRunnerStatementProviderIT.java
@@ -19,7 +19,7 @@
 
 class TestRunnerStatementProviderIT extends AbstractDatabaseTest {
 
-    TestRunnerOptions getCompletelyFilledOptions() {
+    public static TestRunnerOptions getCompletelyFilledOptions() {
         TestRunnerOptions options = new TestRunnerOptions();
         options.pathList.add("path");
         options.reporterList.add(ReporterFactory.createEmpty().createReporter(CoreReporters.UT_DOCUMENTATION_REPORTER.name()));

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public AbstractTestRunnerStatement(TestRunnerOptions options, Connection conn) t`
`32`	`32`	`createStatement();`
`33`	`33`	`}`
`34`	`34`
`35`		`- protected abstract String getSql();`
	`35`	`+ public abstract String getSql();`
`36`	`36`
`37`	`37`	`protected int createStatement() throws SQLException {`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ActualTestRunnerStatement(TestRunnerOptions options, Connection connectio`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- protected String getSql() {`
	`22`	`+ public String getSql() {`
`23`	`23`	`// Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.`
`24`	`24`	`String colorConsoleStr = Boolean.toString(options.colorConsole);`
`25`	`25`	`String failOnErrors = Boolean.toString(options.failOnErrors);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Pre303TestRunnerStatement(TestRunnerOptions options, Connection conn) thr`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- protected String getSql() {`
	`21`	`+ public String getSql() {`
`22`	`22`	`// Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.`
`23`	`23`	`String colorConsoleStr = Boolean.toString(options.colorConsole);`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Pre312TestRunnerStatement(TestRunnerOptions options, Connection connectio`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- protected String getSql() {`
	`21`	`+ public String getSql() {`
`22`	`22`	`// Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.`
`23`	`23`	`String colorConsoleStr = Boolean.toString(options.colorConsole);`
`24`	`24`	`String failOnErrors = Boolean.toString(options.failOnErrors);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public Pre317TestRunnerStatement(TestRunnerOptions options, Connection connectio`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- protected String getSql() {`
	`21`	`+ public String getSql() {`
`22`	`22`	`// Workaround because Oracle JDBC doesn't support passing boolean to stored procedures.`
`23`	`23`	`String colorConsoleStr = Boolean.toString(options.colorConsole);`
`24`	`24`	`String failOnErrors = Boolean.toString(options.failOnErrors);`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ public interface TestRunnerStatement extends AutoCloseable {`
`11`	`11`
`12`	`12`	`void execute() throws SQLException;`
`13`	`13`
	`14`	`+ String getSql();`
	`15`	`+`
`14`	`16`	`@Override`
`15`	`17`	`void close() throws SQLException;`
`16`	`18`	`}`