diff --git a/.gitignore b/.gitignore
index 410561c1..b81a66d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,46 @@
+# Compiled class file
*.class
-*._trace
-*.xtendbin
-*.DS_Store
-*.log
-**/target
-**/bin
-**/test-output
-**/xtend-gen
-**/.sonar
-**/.project
-**/.classpath
-**/.settings
-**/.idea
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# Log file
+*.log
-# Package Files #
+# Package Files
*.jar
*.war
+*.nar
*.ear
+*.zip
+*.tar.gz
+*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
+# Xtend
+*._trace
+*.xtendbin
+**/xtend-gen
+
+# SonarQube
+**/.sonar
+**/.scannerwork
+
+# Eclipse / Visual Studio Code
+.project
+.classpath
+**/.settings
+.vscode
+
+# IntelliJ
+**/.idea
+*.iml
+
+# macOS
+*.DS_Store
+
+# Windows
Thumbs.db
+
+# Targets
+**/target
+**/bin
diff --git a/README.md b/README.md
index 07f9d626..fa77ed47 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,12 @@
## Introduction
-utPLSQL for SQL Developer extends Oracle's SQL Developer to
+utPLSQL for SQL Developer extends Oracle's SQL Developer to
-* run existing utPLSQL unit tests
-* run utPLSQL code coverage reports
-* generate new utPLSQL unit tests (skeletons)
+* run utPLSQL unit tests
+* debug utPLSQL unit tests
+* run utPLSQL code coverage reports
+* generate utPLSQL unit tests (skeletons)
* provide utPLSQL annotations and expectations as snippets
### Run utPLSQL test
@@ -15,15 +16,27 @@ In the Connections window, select a connection or one or more packages or packag
+### Debug utPLSQL test
+
+Select the tests to debug, the same way you would if you were just running them, but select `Debug utPLSQL test...` in the context menu.
+
+And then the PL/SQL Debugger is called for the generated, anonymous PL/SQL block.
+
+
+
+The initialization timeout for the realtime reporter is increased to 1 hour. The overall timeout is left to the default value of 4 hours. So you have enough time to step through the PL/SQL code and analyse it. Press the `Stop` button at any time to cancel the test run.
+
+
+
### Code coverage...
In the Connections window, select a connection or one or more packages for a code coverage report.
-In the dialog you can set some parameters. If you run code coverage for a few chosen packages or from the PL/SQL editor the objects to be included are determined according the object dependencies in the Oracle data dictionary.
+In the dialog you can set some parameters. If you run code coverage for a few chosen packages or from the PL/SQL editor the objects to be included are determined according the object dependencies in the Oracle data dictionary.
-Press `Run` to produce the code coverage process in the background. You may minimize or close the dialog. To abort the process, press `Cancel`.
+Press `Run` to produce the code coverage process in the background. You may minimize or close the dialog. To abort the process, press `Cancel`.
The HTML report is shown in your default browser.
@@ -76,7 +89,7 @@ utPLSQL for SQL Developer implements the [OddgenGenerator2 interface](https://ww
* run existing utPLSQL test suitepaths and test suites
* bulk generate new utPLSQL unit tests into dedicated files
-The use of [oddgen for SQL Developer](https://www.oddgen.org/) is optional.
+The use of [oddgen for SQL Developer](https://www.oddgen.org/) is optional.
#### Run utPLSQL test
@@ -115,6 +128,7 @@ Binary releases are published [here](https://github.com/utPLSQL/utPLSQL-SQLDevel
4. Use the ```Search Update Center``` option and select the ```salvis.com``` update center to install the lastest version of ```utPLSQL for SQL Developer```.
## Issues
+
Please file your bug reports, enhancement requests, questions and other support requests within [Github's issue tracker](https://help.github.com/articles/about-issues/).
* [Questions](https://github.com/utPLSQL/utPLSQL-SQLDeveloper/issues?q=is%3Aissue+label%3Aquestion)
@@ -125,26 +139,27 @@ Please file your bug reports, enhancement requests, questions and other support
## How to Contribute
1. Describe your idea by [submitting an issue](https://github.com/utPLSQL/utPLSQL-SQLDeveloper/issues/new)
-2. [Fork the utPLSQL-SQLDeveloper respository](https://github.com/utPLSQL/utPLSQL-SQLDeveloper/fork)
+2. [Fork the utPLSQL-SQLDeveloper repository](https://github.com/utPLSQL/utPLSQL-SQLDeveloper/fork)
3. [Create a branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/), commit and publish your changes and enhancements
4. [Create a pull request](https://help.github.com/articles/creating-a-pull-request/)
## How to Build
-1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.4.0
-2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.6.3
-3. [Download](https://git-scm.com/downloads) and install a git command line client
-4. Clone the utPLSQL-SQLDeveloper repository
-5. Open a terminal window in the utPLSQL-SQLDeveloper root folder and type
+1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 24.3.1
+2. Download and install a JDK 17 or newer
+3. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.9.16
+4. [Download](https://git-scm.com/downloads) and install a git command line client
+5. Clone the utPLSQL-SQLDeveloper repository
+6. Open a terminal window in the utPLSQL-SQLDeveloper root folder and type
- cd sqldev
+ cd sqldev
-6. Run maven build by the following command
+7. Run maven build by the following command
- mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
+ mvn -Dsqldev.basedir=/Applications/SQLDeveloper24.3.1.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
- Amend the parameter sqldev.basedir to match the path of your SQL Developer installation. This folder is used to reference Oracle jar files which are not available in public Maven repositories
-7. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory can be installed within SQL Developer
+ Amend the parameter sqldev.basedir to match the path of your SQL Developer installation. This folder is used to reference Oracle jar files which are not available in public Maven repositories
+8. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory can be installed within SQL Developer
## License
diff --git a/images/debug_utplsql_test_anonymous_block.png b/images/debug_utplsql_test_anonymous_block.png
new file mode 100644
index 00000000..46391e85
Binary files /dev/null and b/images/debug_utplsql_test_anonymous_block.png differ
diff --git a/images/debug_utplsql_test_stop.png b/images/debug_utplsql_test_stop.png
new file mode 100644
index 00000000..fa390ef4
Binary files /dev/null and b/images/debug_utplsql_test_stop.png differ
diff --git a/images/generate_utplsql_test.png b/images/generate_utplsql_test.png
index 2ba8f9c4..49f45b58 100644
Binary files a/images/generate_utplsql_test.png and b/images/generate_utplsql_test.png differ
diff --git a/images/generate_utplsql_test_from_template.png b/images/generate_utplsql_test_from_template.png
index 40e7fc40..af3ae0a5 100644
Binary files a/images/generate_utplsql_test_from_template.png and b/images/generate_utplsql_test_from_template.png differ
diff --git a/images/oddgen_generate_utplsql_test.png b/images/oddgen_generate_utplsql_test.png
index 2ffeb7c9..f9438d03 100644
Binary files a/images/oddgen_generate_utplsql_test.png and b/images/oddgen_generate_utplsql_test.png differ
diff --git a/images/oddgen_run_utplsql_test.png b/images/oddgen_run_utplsql_test.png
index 9643d83a..72f5a2a1 100644
Binary files a/images/oddgen_run_utplsql_test.png and b/images/oddgen_run_utplsql_test.png differ
diff --git a/images/run_utplsql_test.png b/images/run_utplsql_test.png
index a894d175..44c76099 100644
Binary files a/images/run_utplsql_test.png and b/images/run_utplsql_test.png differ
diff --git a/images/runner_model.png b/images/runner_model.png
new file mode 100644
index 00000000..40491d80
Binary files /dev/null and b/images/runner_model.png differ
diff --git a/images/snippets_annotations.png b/images/snippets_annotations.png
index 9cf8a7bf..6c7400f8 100644
Binary files a/images/snippets_annotations.png and b/images/snippets_annotations.png differ
diff --git a/images/snippets_expectations.png b/images/snippets_expectations.png
index af23dc17..ccbd7836 100644
Binary files a/images/snippets_expectations.png and b/images/snippets_expectations.png differ
diff --git a/sqldev/extension.xml b/sqldev/extension.xml
index 835e262c..88d49292 100644
--- a/sqldev/extension.xml
+++ b/sqldev/extension.xml
@@ -106,6 +106,13 @@
Code-Editor
+
+
+ ${MENU_DEBUG_TEST_LABEL}
+ res:/org/utplsql/sqldev/resources/images/debug.png
+ Code-Editor
+
+
${MENU_GENERATE_TEST_LABEL}
@@ -120,6 +127,7 @@
+
@@ -132,7 +140,8 @@
id="UTPLSQL_MENU" weight="2.0">
- items;
+ private Integer totalNumberOfTests;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("items", items)
+ .append("totalNumberOfTests", totalNumberOfTests)
+ .toString();
+ }
+
+ public PreRunEvent() {
+ items = new ArrayList<>();
+ }
+
+ public List
- getItems() {
+ return items;
+ }
+
+ public void setItems(final List
- items) {
+ this.items = items;
+ }
+
+ public Integer getTotalNumberOfTests() {
+ return totalNumberOfTests;
+ }
+
+ public void setTotalNumberOfTests(final Integer totalNumberOfTests) {
+ this.totalNumberOfTests = totalNumberOfTests;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.xtend
deleted file mode 100644
index 5750cd8e..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.xtend
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import java.util.ArrayList
-import java.util.List
-import org.eclipse.xtend.lib.annotations.Accessors
-
-@Accessors
-class PreRunEvent extends RealtimeReporterEvent {
- List
- items
- Integer totalNumberOfTests
-
- new() {
- items = new ArrayList
-
- }
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java
similarity index 54%
rename from sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend
rename to sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java
index bb4afc77..7026952a 100644
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.xtend
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java
@@ -13,24 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.utplsql.sqldev.model.oddgen
+package org.utplsql.sqldev.model.runner;
-import java.sql.Connection
-import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
-@Accessors
-class GenContext extends AbstractModel {
- Connection conn
- String objectType
- String objectName
- String testPackagePrefix
- String testPackageSuffix
- String testUnitPrefix
- String testUnitSuffix
- int numberOfTestsPerUnit
- boolean generateComments
- boolean disableTests
- String suitePath
- int indentSpaces
+public class PreSuiteEvent extends RealtimeReporterEvent {
+ private String id;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("id", id)
+ .toString();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(final String id) {
+ this.id = id;
+ }
}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.xtend
deleted file mode 100644
index 0304f071..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.xtend
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import org.eclipse.xtend.lib.annotations.Accessors
-
-@Accessors
-class PreSuiteEvent extends RealtimeReporterEvent {
- String id
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java
new file mode 100644
index 00000000..30019335
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.runner;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+
+public class PreTestEvent extends RealtimeReporterEvent {
+ private String id;
+ private Integer testNumber;
+ private Integer totalNumberOfTests;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("id", id)
+ .append("testNumber", testNumber)
+ .append("totalNumberOfTests", totalNumberOfTests)
+ .toString();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(final String id) {
+ this.id = id;
+ }
+
+ public Integer getTestNumber() {
+ return testNumber;
+ }
+
+ public void setTestNumber(final Integer testNumber) {
+ this.testNumber = testNumber;
+ }
+
+ public Integer getTotalNumberOfTests() {
+ return totalNumberOfTests;
+ }
+
+ public void setTotalNumberOfTests(final Integer totalNumberOfTests) {
+ this.totalNumberOfTests = totalNumberOfTests;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.xtend
deleted file mode 100644
index a54e3c5e..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.xtend
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import org.eclipse.xtend.lib.annotations.Accessors
-
-@Accessors
-class PreTestEvent extends RealtimeReporterEvent {
- String id
- Integer testNumber
- Integer totalNumberOfTests
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RealtimeReporterEvent.java
similarity index 81%
rename from sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.xtend
rename to sqldev/src/main/java/org/utplsql/sqldev/model/runner/RealtimeReporterEvent.java
index ee5edc30..3f7d7d1d 100644
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.xtend
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RealtimeReporterEvent.java
@@ -13,10 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.utplsql.sqldev.model.runner
+package org.utplsql.sqldev.model.runner;
-import org.eclipse.xtend.lib.annotations.Accessors
-
-@Accessors
-class PostRunEvent extends PostEvent {
+public abstract class RealtimeReporterEvent {
}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java
new file mode 100644
index 00000000..09d38e2f
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2019 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.runner;
+
+import java.sql.Connection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+import org.utplsql.sqldev.model.URLTools;
+
+public class Run {
+ private String reporterId;
+ private String connectionName;
+ private List pathList;
+ private Integer currentTestNumber;
+ private Test currentTest;
+ private Integer totalNumberOfTests;
+ private String startTime;
+ private String endTime;
+ private Double executionTime;
+ private Counter counter;
+ private Integer infoCount;
+ private String errorStack;
+ private String serverOutput;
+ private final Set
- items;
+ private Map tests;
+ private Map itemNodes;
+ private String status;
+ private Long start;
+ // to abort connections, producerConn is handled by UtplsqlRunner
+ private Connection consumerConn;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("reporterId", reporterId)
+ .append("connectionName", connectionName)
+ .append("pathList", pathList)
+ .append("currentTestNumber", currentTestNumber)
+ .append("currentTest", currentTest)
+ .append("totalNumberOfTests", totalNumberOfTests)
+ .append("startTime", startTime)
+ .append("endTime", endTime)
+ .append("executionTime", executionTime)
+ .append("counter", counter)
+ .append("infoCount", infoCount)
+ .append("errorStack", errorStack)
+ .append("serverOutput", serverOutput)
+ .append("tests", tests)
+ .append("rootNode", itemNodes.get(reporterId))
+ .append("status", status)
+ .append("start", start)
+ .append("endTime", endTime)
+ .append("totalNumberOfCompletedTests", getTotalNumberOfCompletedTests())
+ .toString();
+ }
+
+ public Run(final String reporterId, final String connectionName, final List pathList) {
+ this.reporterId = reporterId;
+ this.connectionName = connectionName;
+ this.pathList = pathList;
+ counter = new Counter();
+ items = new LinkedHashSet<>();
+ tests = new LinkedHashMap<>();
+ itemNodes = new LinkedHashMap<>();
+ createRootNode();
+ }
+
+ public void setStartTime(final String startTime) {
+ this.startTime = startTime;
+ start = System.currentTimeMillis();
+ }
+
+ public String getName() {
+ final String time = startTime.substring(11, 19);
+ final String conn = connectionName != null ? URLTools.replaceHexChars(connectionName.substring(15)) : "n/a";
+ return time + " (" + conn + ")";
+ }
+
+ /**
+ * Is called after consuming the pre-run event to populate all items of a run.
+ * It's expected to be called only once.
+ *
+ * @param items items of a run, to be shown in the runner right after starting a run.
+ */
+ public void put(final List
- items) {
+ populateItems(items);
+ populateItemNodes();
+ populateItemNodeChildren();
+ }
+
+ private void createRootNode() {
+ // Create pseudo root node as suite.
+ // The TreeTableModel requires a single root node, but it will not be displayed.
+ final Suite rootSuite = new Suite();
+ rootSuite.setId(getReporterId());
+ rootSuite.setName(getReporterId());
+ ItemNode rootNode = new ItemNode(rootSuite);
+ itemNodes.put(rootSuite.getId(), rootNode);
+ }
+
+ private void populateItems(List
- items) {
+ for (final Item item : items) {
+ this.items.add(item);
+ if (item instanceof Suite) {
+ populateItems(((Suite) item).getItems());
+ } else if (item instanceof Test) {
+ this.tests.put(item.getId(), (Test) item);
+ }
+ }
+ }
+
+ private void populateItemNodes() {
+ for (final Item item : items) {
+ itemNodes.put(item.getId(), new ItemNode(item));
+ }
+ }
+
+ private void populateItemNodeChildren() {
+ for (Item item : items) {
+ String parentId = item.getParentId();
+ ItemNode node = itemNodes.get(item.getId());
+ ItemNode parent = itemNodes.get(parentId == null ? reporterId : parentId);
+ parent.add(node);
+ }
+ }
+
+ public Test getTest(final String id) {
+ return tests.get(id);
+ }
+
+ public int getTotalNumberOfCompletedTests() {
+ if (counter.getDisabled() == null || counter.getSuccess() == null || counter.getFailure() == null
+ || counter.getError() == null) {
+ return -1;
+ }
+ int total = counter.getDisabled() + counter.getSuccess() + counter.getFailure() + counter.getError();
+ if (totalNumberOfTests != null && total > totalNumberOfTests) {
+ // can happen when run is cancelled and two processes are updating the run in parallel
+ // not worth to ensure consistency for this case, using synchronized will not be enough
+ total = totalNumberOfTests;
+ }
+ return total;
+ }
+
+ public String getReporterId() {
+ return reporterId;
+ }
+
+ public void setReporterId(final String reporterId) {
+ this.reporterId = reporterId;
+ }
+
+ public String getConnectionName() {
+ return connectionName;
+ }
+
+ public void setConnectionName(final String connectionName) {
+ this.connectionName = connectionName;
+ }
+
+ public List getPathList() {
+ return pathList;
+ }
+
+ public void setPathList(final List pathList) {
+ this.pathList = pathList;
+ }
+
+ public Integer getCurrentTestNumber() {
+ return currentTestNumber;
+ }
+
+ public void setCurrentTestNumber(final Integer currentTestNumber) {
+ this.currentTestNumber = currentTestNumber;
+ }
+
+ public Test getCurrentTest() {
+ return currentTest;
+ }
+
+ public void setCurrentTest(final Test currentTest) {
+ this.currentTest = currentTest;
+ }
+
+ public Integer getTotalNumberOfTests() {
+ return totalNumberOfTests;
+ }
+
+ public void setTotalNumberOfTests(final Integer totalNumberOfTests) {
+ this.totalNumberOfTests = totalNumberOfTests;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(final String endTime) {
+ this.endTime = endTime;
+ }
+
+ public Double getExecutionTime() {
+ return executionTime;
+ }
+
+ public void setExecutionTime(final Double executionTime) {
+ this.executionTime = executionTime;
+ }
+
+ public Counter getCounter() {
+ return counter;
+ }
+
+ public void setCounter(final Counter counter) {
+ this.counter = counter;
+ }
+
+ public Integer getInfoCount() {
+ return infoCount;
+ }
+
+ public void setInfoCount(final Integer infoCount) {
+ this.infoCount = infoCount;
+ }
+
+ public String getErrorStack() {
+ return errorStack;
+ }
+
+ public void setErrorStack(final String errorStack) {
+ this.errorStack = errorStack;
+ }
+
+ public String getServerOutput() {
+ return serverOutput;
+ }
+
+ public void setServerOutput(final String serverOutput) {
+ this.serverOutput = serverOutput;
+ }
+
+ public LinkedHashMap getTests() {
+ return (LinkedHashMap) tests;
+ }
+
+ public void setTests(final LinkedHashMap tests) {
+ this.tests = tests;
+ }
+
+ public LinkedHashMap getItemNodes() {
+ return (LinkedHashMap) itemNodes;
+ }
+
+ public void setItemNodes(LinkedHashMap itemNodes) {
+ this.itemNodes = itemNodes;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(final String status) {
+ this.status = status;
+ }
+
+ public Long getStart() {
+ return start;
+ }
+
+ public void setStart(final Long start) {
+ this.start = start;
+ }
+
+ public Connection getConsumerConn() {
+ return consumerConn;
+ }
+
+ public void setConsumerConn(Connection consumerConn) {
+ this.consumerConn = consumerConn;
+ }
+
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend
deleted file mode 100644
index 37b11926..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2019 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import java.util.LinkedHashMap
-import java.util.List
-import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
-
-@Accessors
-class Run extends AbstractModel {
- String reporterId
- String connectionName
- List pathList
- Integer currentTestNumber
- Test currentTest
- Integer totalNumberOfTests
- String startTime
- String endTime
- Double executionTime
- Counter counter
- Integer infoCount
- String errorStack
- String serverOutput
- LinkedHashMap tests
- String status
- Long start
-
- new(String reporterId, String connectionName, List pathList) {
- this.reporterId = reporterId
- this.connectionName = connectionName
- this.pathList = pathList
- this.counter = new Counter
- this.tests = new LinkedHashMap
- }
-
- def void setStartTime(String startTime) {
- this.startTime = startTime
- start = System.currentTimeMillis
- }
-
- def getName() {
- val time = startTime.substring(11,19)
- val conn = connectionName?.substring(15)
- return '''«time» («conn»)'''
- }
-
- def void put(List
- items) {
- for (item : items) {
- if (item instanceof Test) {
- this.tests.put(item.id, item)
- }
- if (item instanceof Suite) {
- item.items.put
- }
- }
- }
-
- def getTest(String id) {
- return tests.get(id)
- }
-
- def getTotalNumberOfCompletedTests() {
- return counter.disabled + counter.success + counter.failure + counter.error
- }
-
-}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RunnerModel.mgc b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RunnerModel.mgc
new file mode 100644
index 00000000..e4ec1ec8
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RunnerModel.mgc
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java
new file mode 100644
index 00000000..f9f036db
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.runner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+
+public class Suite extends Item {
+ private List
- items;
+
+ public Suite() {
+ items = new ArrayList<>();
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ // ancestor
+ .append("id", getId())
+ .append("name", getName())
+ .append("description", getDescription())
+ .append("startTime", getStartTime())
+ .append("endTime", getEndTime())
+ .append("executionTime", getExecutionTime())
+ .append("counter", getCounter())
+ .append("errorStack", getErrorStack())
+ .append("serverOutput", getServerOutput())
+ .append("warnings", getWarnings())
+ .append("parentId", getParentId())
+ .append("statusIcon", getStatusIcon())
+ .append("warningIcon", getWarningIcon())
+ .append("infoIcon", getInfoIcon())
+ // local
+ .append("items", items)
+ .toString();
+ }
+
+ public List
- getItems() {
+ return items;
+ }
+
+ public void setItems(final List
- items) {
+ this.items = items;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.xtend
deleted file mode 100644
index d75efadc..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.xtend
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import java.util.ArrayList
-import java.util.List
-import org.eclipse.xtend.lib.annotations.Accessors
-
-@Accessors
-class Suite extends Item {
- String name
- String description
- List
- items
-
- new() {
- items = new ArrayList
-
- }
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java
new file mode 100644
index 00000000..a0e893f8
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.runner;
+
+import java.util.List;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+
+public class Test extends Item {
+ private String executableType;
+ private String ownerName;
+ private String objectName;
+ private String procedureName;
+ private Boolean disabled;
+ private String disabledReason;
+ private Integer testNumber;
+ private List failedExpectations;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ // ancestor
+ .append("id", getId())
+ .append("name", getName())
+ .append("description", getDescription())
+ .append("startTime", getStartTime())
+ .append("endTime", getEndTime())
+ .append("executionTime", getExecutionTime())
+ .append("counter", getCounter())
+ .append("errorStack", getErrorStack())
+ .append("serverOutput", getServerOutput())
+ .append("warnings", getWarnings())
+ .append("parentId", getParentId())
+ .append("statusIcon", getStatusIcon())
+ .append("warningIcon", getWarningIcon())
+ .append("infoIcon", getInfoIcon())
+ // local
+ .append("executableType", executableType)
+ .append("ownerName", ownerName)
+ .append("objectName", objectName)
+ .append("procedureName", procedureName)
+ .append("disabled", disabled)
+ .append("disabledReason", disabledReason)
+ .append("testNumber", testNumber)
+ .append("failedExpectations", failedExpectations)
+ .toString();
+ }
+
+ public String getExecutableType() {
+ return executableType;
+ }
+
+ public void setExecutableType(final String executableType) {
+ this.executableType = executableType;
+ }
+
+ public String getOwnerName() {
+ return ownerName;
+ }
+
+ public void setOwnerName(final String ownerName) {
+ this.ownerName = ownerName;
+ }
+
+ public String getObjectName() {
+ return objectName;
+ }
+
+ public void setObjectName(final String objectName) {
+ this.objectName = objectName;
+ }
+
+ public String getProcedureName() {
+ return procedureName;
+ }
+
+ public void setProcedureName(final String procedureName) {
+ this.procedureName = procedureName;
+ }
+
+ public Boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(final Boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public String getDisabledReason() {
+ return disabledReason;
+ }
+
+ public void setDisabledReason(final String disabledReason) {
+ this.disabledReason = disabledReason;
+ }
+
+ public Integer getTestNumber() {
+ return testNumber;
+ }
+
+ public void setTestNumber(final Integer testNumber) {
+ this.testNumber = testNumber;
+ }
+
+ public List getFailedExpectations() {
+ return failedExpectations;
+ }
+
+ public void setFailedExpectations(final List failedExpectations) {
+ this.failedExpectations = failedExpectations;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.xtend
deleted file mode 100644
index 30070e85..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.xtend
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.runner
-
-import java.util.List
-import javax.swing.Icon
-import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.resources.UtplsqlResources
-
-@Accessors
-class Test extends Item {
- String executableType
- String ownerName
- String objectName
- String procedureName
- Boolean disabled
- String name
- String description
- Integer testNumber
- List failedExpectations
-
- def getStatusIcon() {
- var Icon icon = null
- if (startTime !== null && endTime === null ) {
- icon = UtplsqlResources.getIcon("PROGRESS_ICON")
- } else {
- if (counter !== null) {
- if (counter.success > 0) {
- icon = UtplsqlResources.getIcon("SUCCESS_ICON")
- } else if (counter.error > 0) {
- icon = UtplsqlResources.getIcon("ERROR_ICON")
- } else if (counter.failure > 0) {
- icon = UtplsqlResources.getIcon("FAILURE_ICON")
- } else if (counter.disabled > 0) {
- icon = UtplsqlResources.getIcon("DISABLED_ICON")
- }
- }
- }
- return icon
- }
-
- def getWarningIcon() {
- var Icon icon = null
- if (counter !== null) {
- if (counter.warning > 0) {
- icon = UtplsqlResources.getIcon("WARNING_ICON")
- }
- }
- return icon
- }
-
- def getInfoIcon() {
- var Icon icon = null
- if (serverOutput !== null && serverOutput.length > 0) {
- icon = UtplsqlResources.getIcon("INFO_ICON")
- }
- return icon
- }
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java
new file mode 100644
index 00000000..47e792c7
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.ut;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+
+public class Annotation {
+ private String objectOwner;
+ private String objectName;
+ private String name;
+ private String text;
+ private String subobjectName;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("objectOwner", objectOwner)
+ .append("objectName", objectName)
+ .append("name", name)
+ .append("text", text)
+ .append("subobjectName", subobjectName)
+ .toString();
+ }
+
+ public String getObjectOwner() {
+ return objectOwner;
+ }
+
+ public void setObjectOwner(final String objectOwner) {
+ this.objectOwner = objectOwner;
+ }
+
+ public String getObjectName() {
+ return objectName;
+ }
+
+ public void setObjectName(final String objectName) {
+ this.objectName = objectName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(final String text) {
+ this.text = text;
+ }
+
+ public String getSubobjectName() {
+ return subobjectName;
+ }
+
+ public void setSubobjectName(final String subobjectName) {
+ this.subobjectName = subobjectName;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.xtend
deleted file mode 100644
index ee658e91..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.xtend
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.ut
-
-import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
-
-@Accessors
-class Annotation extends AbstractModel {
- String objectOwner
- String objectName
- String name
- String text
- String subobjectName
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java
new file mode 100644
index 00000000..75343d6b
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.model.ut;
+
+import org.springframework.core.style.ToStringCreator;
+import org.utplsql.sqldev.model.JsonToStringStyler;
+
+public class OutputLines {
+ private String[] lines;
+ private Integer numlines;
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this, JsonToStringStyler.getInstance())
+ .append("lines", lines)
+ .append("numlines", numlines)
+ .toString();
+ }
+
+ public String[] getLines() {
+ return lines;
+ }
+
+ public void setLines(final String[] lines) {
+ this.lines = lines;
+ }
+
+ public Integer getNumlines() {
+ return numlines;
+ }
+
+ public void setNumlines(final Integer numlines) {
+ this.numlines = numlines;
+ }
+}
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.xtend
deleted file mode 100644
index 7b1c946c..00000000
--- a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.xtend
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2018 Philipp Salvisberg
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.utplsql.sqldev.model.ut
-
-import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
-
-@Accessors
-class OutputLines extends AbstractModel {
- String[] lines;
- Integer numlines;
-}
\ No newline at end of file
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java
new file mode 100644
index 00000000..f88331ba
--- /dev/null
+++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2018 Philipp Salvisberg
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.utplsql.sqldev.oddgen;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.oddgen.sqldev.generators.OddgenGenerator2;
+import org.oddgen.sqldev.generators.model.Node;
+import org.utplsql.sqldev.dal.UtplsqlDao;
+import org.utplsql.sqldev.model.DatabaseTools;
+import org.utplsql.sqldev.model.StringTools;
+import org.utplsql.sqldev.model.preference.PreferenceModel;
+import org.utplsql.sqldev.resources.UtplsqlResources;
+
+import oracle.ide.config.Preferences;
+
+public class RunGenerator implements OddgenGenerator2 {
+ public static final String YES = "Yes";
+ public static final String NO = "No";
+ public static final String RESET_PACKAGE = UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL");
+ public static final String CLEAR_SCREEN = UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL");
+ public static final String INDENT_SPACES = UtplsqlResources.getString("PREF_INDENT_SPACES_LABEL");
+
+ // oddgen node cache
+ private List runnables = null;
+
+ @Override
+ public boolean isSupported(final Connection conn) {
+ return DatabaseTools.isSupported(conn);
+ }
+
+ @Override
+ public String getName(final Connection conn) {
+ return "Run test";
+ }
+
+ @Override
+ public String getDescription(final Connection conn) {
+ return "Runs utPLSQL test packages in the current user.";
+ }
+
+ @Override
+ public List getFolders(final Connection conn) {
+ final PreferenceModel preferences = PreferenceModel.getInstance(Preferences.getPreferences());
+ final ArrayList folders = new ArrayList<>();
+ for (String f : preferences.getRootFolderInOddgenView().split(",")) {
+ if (f != null) {
+ folders.add(f.trim());
+ }
+ }
+ return folders;
+ }
+
+ @Override
+ public String getHelp(final Connection conn) {
+ return "
not yet available
";
+ }
+
+ @Override
+ public List getNodes(final Connection conn, final String parentNodeId) {
+ // oddgen asks for children for each parent node, regardless of load strategy (eager/lazy)
+ // oddgen does not know about the load strategy, hence caching is the responsibility of the generator
+ if (runnables == null) {
+ final PreferenceModel preferences = PreferenceModel.getInstance(Preferences.getPreferences());
+ final LinkedHashMap params = new LinkedHashMap<>();
+ params.put(RESET_PACKAGE, preferences.isResetPackage() ? YES : NO);
+ params.put(CLEAR_SCREEN, preferences.isClearScreen() ? YES : NO);
+ params.put(INDENT_SPACES, String.valueOf(preferences.getIndentSpaces()));
+ final UtplsqlDao dao = new UtplsqlDao(conn);
+ // load node tree eagerly (all nodes in one go)
+ runnables = dao.runnables();
+ for (final Node node : runnables) {
+ node.setParams(params);
+ }
+ }
+ return runnables;
+ }
+
+ @Override
+ public HashMap> getLov(final Connection conn, final LinkedHashMap params, final List nodes) {
+ final HashMap> lov = new HashMap<>();
+ lov.put(RESET_PACKAGE, Arrays.asList(YES, NO));
+ lov.put(CLEAR_SCREEN, Arrays.asList(YES, NO));
+ lov.put(INDENT_SPACES, Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8"));
+ return lov;
+ }
+
+ @Override
+ public HashMap getParamStates(final Connection conn, final LinkedHashMap params, final List nodes) {
+ return new HashMap<>();
+ }
+
+ private String getPath(final Node node, final Connection conn) {
+ if ("SUITE".equals(node.getId()) || "SUITEPATH".equals(node.getId())) {
+ return DatabaseTools.getUser(conn);
+ } else {
+ return node.getId();
+ }
+ }
+
+ public ArrayList dedup(final List nodes) {
+ final HashSet set = new HashSet<>();
+ for (final Node node : nodes) {
+ set.add(node.getId());
+ }
+ final ArrayList ret = new ArrayList<>();
+ for (final Node node : nodes) {
+ if (!set.contains(node.getParentId())) {
+ ret.add(node);
+ }
+ }
+ return ret;
+ }
+
+ @Override
+ public String generateProlog(final Connection conn, final List nodes) {
+ final ArrayList dedupNodes = dedup(nodes);
+ final LinkedHashMap params = dedupNodes.get(0).getParams();
+ final StringBuilder sb = new StringBuilder();
+ if (YES.equals(params.get(RESET_PACKAGE))) {
+ sb.append("execute dbms_session.reset_package;\n");
+ }
+ sb.append("set serveroutput on size unlimited\n");
+ if (YES.equals(params.get(CLEAR_SCREEN))) {
+ sb.append("clear screen\n");
+ }
+ if (dedupNodes.size() == 1) {
+ sb.append("execute ut.run('");
+ sb.append(getPath(dedupNodes.get(0), conn));
+ sb.append("');\n");
+ } else {
+ final List paths = dedupNodes.stream().map(node -> getPath(node, conn)).collect(Collectors.toList());
+ sb.append("begin\n");
+ sb.append("\tut.run(\n");
+ sb.append("\t\tut_varchar2_list(\n");
+ sb.append(StringTools.getCSV(paths, "\t\t\t"));
+ sb.append("\t\t)\n");
+ sb.append("\t);\n");
+ sb.append("end;\n");
+ sb.append("/\n");
+ }
+ final String ret = sb.toString();
+ return StringTools.replaceTabsWithSpaces(ret, Integer.parseInt(params.get(INDENT_SPACES)));
+ }
+
+ @Override
+ public String generateSeparator(final Connection conn) {
+ return "";
+ }
+
+ @Override
+ public String generateEpilog(final Connection conn, final List