Calling right function to run tests and typo fix

viniciusam · viniciusam · commit b04f4be60d37 · 2017-04-13T22:07:27.000-03:00
diff --git a/src/main/java/io/github/utplsql/OutputBuffer.java b/src/main/java/io/github/utplsql/OutputBuffer.java
@@ -20,17 +20,17 @@ public static List<String> getAllLines(String reporterId) throws SQLException {
         ResultSet resultSet = null;
         try {
             callableStatement = UTPLSQL.getConnection()
-                    .prepareCall("BEGIN :lines := ut_output_buffer.get_lines_cursor(:reporter_id); END;");
+                    .prepareCall("BEGIN ? := ut_output_buffer.get_lines_cursor(?); END;");
 
-            callableStatement.registerOutParameter(":lines", OracleTypes.CURSOR);
-            callableStatement.setString(":reporter_id", reporterId);
+            callableStatement.registerOutParameter(1, OracleTypes.CURSOR);
+            callableStatement.setString(2, reporterId);
             callableStatement.execute();
 
-            resultSet = (ResultSet) callableStatement.getObject(":lines");
+            resultSet = (ResultSet) callableStatement.getObject(1);
 
             List<String> outputLines = new ArrayList<>();
             while (resultSet.next()) {
-                outputLines.add(resultSet.getString(0));
+                outputLines.add(resultSet.getString("text"));
             }
             return outputLines;
         } finally {
diff --git a/src/main/java/io/github/utplsql/TestRunner.java b/src/main/java/io/github/utplsql/TestRunner.java
@@ -16,7 +16,7 @@ public static void run() throws SQLException {
         CallableStatement callableStatement = null;
         try {
             callableStatement = UTPLSQL.getConnection()
-                    .prepareCall("BEGIN ut.run(); END;");
+                    .prepareCall("BEGIN ut_runner.run(); END;");
             callableStatement.execute();
         } finally {
             if (callableStatement != null)
@@ -32,7 +32,7 @@ public static void run(String path, BaseReporter reporter) throws SQLException {
         CallableStatement callableStatement = null;
         try {
             callableStatement = UTPLSQL.getConnection()
-                    .prepareCall("BEGIN ut.run(:path, :reporter); END;");
+                    .prepareCall("BEGIN ut_runner.run(:path, :reporter); END;");
             callableStatement.setString(":path", path);
             callableStatement.setObject(":reporter", reporter);
             callableStatement.execute();
diff --git a/src/main/java/io/github/utplsql/types/CustomTypes.java b/src/main/java/io/github/utplsql/types/CustomTypes.java
@@ -7,7 +7,7 @@
 public enum CustomTypes {
     // Object names must be upper case.
     UT_DOCUMENTATION_REPORTER("UT_DOCUMENTATION_REPORTER"),
-    UT_VARCHAF2_LIST("UT_VARCHAF2_LIST");
+    UT_VARCHAF2_LIST("UT_VARCHAR2_LIST");
 
     private String typeName;
 
diff --git a/src/test/java/io/github/utplsql/OutputBufferTest.java b/src/test/java/io/github/utplsql/OutputBufferTest.java
@@ -7,7 +7,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
@@ -22,19 +21,17 @@ public class OutputBufferTest {
     @Test
     public void getLinesFromOutputBuffer() {
         try {
-            Connection conn = UTPLSQL.getConnection();
-            conn.setAutoCommit(false);
-
             BaseReporter reporter = new DocumentationReporter();
             reporter.setReporterId(UTPLSQL.newSysGuid());
             TestRunner.run("", reporter);
 
             List<String> outputLines = OutputBuffer.getAllLines(reporter.getReporterId());
+
+            // Debug
+            System.out.println("Reporter ID: " + reporter.getReporterId());
             for (int i = 0; i < outputLines.size(); i++) {
-                System.out.println(outputLines.get(0));
+                System.out.println(outputLines.get(i));
             }
-
-            conn.commit();
         } catch (SQLException e) {
             Assert.fail(e.getMessage());
         }
diff --git a/src/test/java/io/github/utplsql/rules/DatabaseRule.java b/src/test/java/io/github/utplsql/rules/DatabaseRule.java
@@ -10,7 +10,8 @@ public class DatabaseRule extends ExternalResource {
 
     @Override
     protected void before() throws Throwable {
-        UTPLSQL.init("jdbc:oracle:thin:@docker:1521:xe", "app", "app");
+        // TODO: Options file.
+        UTPLSQL.init("jdbc:oracle:thin:@127.0.0.1:1521:xe", "ut3", "ut3");
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ public class DatabaseRule extends ExternalResource {`
`10`	`10`
`11`	`11`	`@Override`
`12`	`12`	`protected void before() throws Throwable {`
`13`		`- UTPLSQL.init("jdbc:oracle:thin:@docker:1521:xe", "app", "app");`
	`13`	`+ // TODO: Options file.`
	`14`	`+ UTPLSQL.init("jdbc:oracle:thin:@127.0.0.1:1521:xe", "ut3", "ut3");`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`@Override`