Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9296fa9

Browse filesBrowse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #62 from utPLSQL/issue_6
Run utPLSQL tests in a dedicated utPLSQL view
2 parents f410bd0 + 629f610 commit 9296fa9
Copy full SHA for 9296fa9

File tree

98 files changed

+5435
-315
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

98 files changed

+5435
-315
lines changed

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
**/.project
1212
**/.classpath
1313
**/.settings
14+
**/.idea
1415

1516
# Mobile Tools for Java (J2ME)
1617
.mtj.tmp/

‎README.md

Copy file name to clipboardExpand all lines: README.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Please file your bug reports, enhancement requests, questions and other support
112112

113113
## How to Build
114114

115-
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 18.3.0
115+
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.1.0
116116
2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.5.4
117117
3. [Download](https://git-scm.com/downloads) and install a git command line client
118118
4. Clone the utPLSQL-SQLDeveloper repository
@@ -122,7 +122,7 @@ Please file your bug reports, enhancement requests, questions and other support
122122

123123
6. Run maven build by the following command
124124

125-
mvn -Dsqldev.basedir=/Applications/SQLDeveloper18.3.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
125+
mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.1.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
126126

127127
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
128128
7. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory can be installed within SQL Developer

‎images/code_coverage_dialog.png

Copy file name to clipboard
41.8 KB
Loading

‎images/generate_utplsql_test.png

Copy file name to clipboard
94.1 KB
Loading

‎images/generate_utplsql_test_from_template.png

Copy file name to clipboard
-21 KB
Loading

‎images/preferences.png

Copy file name to clipboard
58.7 KB
Loading

‎images/run_utplsql_test.png

Copy file name to clipboard
-6.75 KB
Loading

‎sqldev/extension.xml

Copy file name to clipboardExpand all lines: sqldev/extension.xml
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
</composite-rule>
8989
</rules>
9090
<triggers>
91+
<dockable-factory-hook xmlns="http://xmlns.oracle.com/ide/extension">
92+
<factory id="UTPLSQL_RUNNER_FACTORY" class="org.utplsql.sqldev.ui.runner.RunnerFactory" />
93+
</dockable-factory-hook>
9194
<actions xmlns="http://xmlns.oracle.com/jdeveloper/1013/extension">
9295
<action id="utplsql.test">
9396
<properties>
@@ -158,10 +161,17 @@
158161
<settings-ui-hook>
159162
<page id="UTPLSQL_PREFERENCES_PAGE" parent-idref="/preferences">
160163
<label>${PREF_LABEL}</label>
161-
<traversable-class>org.utplsql.sqldev.PreferencePanel
164+
<traversable-class>org.utplsql.sqldev.ui.preference.PreferencePanel
162165
</traversable-class>
163166
</page>
164167
</settings-ui-hook>
165168
</triggers>
166169
</trigger-hooks>
170+
171+
<hooks>
172+
<dockable-hook xmlns="http://xmlns.oracle.com/ide/extension">
173+
<dockable id="UTPLSQL_RUNNER_VIEW" />
174+
</dockable-hook>
175+
</hooks>
176+
167177
</extension>

‎sqldev/pom.xml

Copy file name to clipboardExpand all lines: sqldev/pom.xml
+23-10Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<!-- The Basics -->
66
<groupId>org.utplsql</groupId>
77
<artifactId>org.utplsql.sqldev</artifactId>
8-
<version>0.7.2-SNAPSHOT</version>
8+
<version>1.0.0-SNAPSHOT</version>
99
<packaging>bundle</packaging>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<jdk.version>1.8</jdk.version>
1313
<jdk.version.test>1.8</jdk.version.test>
1414
<xtend.version>2.15.0</xtend.version>
1515
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
16-
<sqldev.basedir>/Applications/SQLDeveloper18.3.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
16+
<sqldev.basedir>/Applications/SQLDeveloper19.1.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1717
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
1818
</properties>
1919
<dependencies>
@@ -60,13 +60,6 @@
6060
<scope>system</scope>
6161
<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
6262
</dependency>
63-
<dependency>
64-
<groupId>oracle</groupId>
65-
<artifactId>oracle.sqldeveloper.utils</artifactId>
66-
<version>12.2.0</version>
67-
<scope>system</scope>
68-
<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
69-
</dependency>
7063
<dependency>
7164
<groupId>oracle</groupId>
7265
<artifactId>oracle.ide.navigator</artifactId>
@@ -144,7 +137,22 @@
144137
<scope>system</scope>
145138
<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
146139
</dependency>
147-
<!-- SQL Developer specific dependencies part 2 (available in public maven repositories) -->
140+
<!-- SQL Developer specific dependencies part 2 (used for tests only) -->
141+
<dependency>
142+
<groupId>oracle</groupId>
143+
<artifactId>jewt4.jar</artifactId>
144+
<version>12.2.1</version>
145+
<scope>system</scope>
146+
<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
147+
</dependency>
148+
<dependency>
149+
<groupId>oracle</groupId>
150+
<artifactId>share.jar</artifactId>
151+
<version>12.2.1</version>
152+
<scope>system</scope>
153+
<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
154+
</dependency>
155+
<!-- SQL Developer specific dependencies part 3 (available in public maven repositories) -->
148156
<dependency>
149157
<!-- SQL Developer is using this older version -->
150158
<groupId>org.osgi</groupId>
@@ -164,6 +172,11 @@
164172
<artifactId>spring-jdbc</artifactId>
165173
<version>5.1.0.RELEASE</version>
166174
</dependency>
175+
<dependency>
176+
<groupId>org.springframework</groupId>
177+
<artifactId>spring-web</artifactId>
178+
<version>5.1.0.RELEASE</version>
179+
</dependency>
167180
<dependency>
168181
<groupId>org.oddgen</groupId>
169182
<artifactId>org.oddgen.sqldev</artifactId>

‎sqldev/src/main/java/org/utplsql/sqldev/CodeCoverageReporter.xtend renamed to ‎sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.xtend

Copy file name to clipboardExpand all lines: sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.xtend
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.utplsql.sqldev
16+
package org.utplsql.sqldev.coverage
1717

1818
import java.awt.Desktop
1919
import java.io.File
@@ -27,14 +27,15 @@ import java.util.List
2727
import java.util.logging.Logger
2828
import oracle.dbtools.raptor.utils.Connections
2929
import org.utplsql.sqldev.dal.UtplsqlDao
30+
import org.utplsql.sqldev.ui.coverage.CodeCoverageReporterDialog
3031

3132
class CodeCoverageReporter {
3233
static val Logger logger = Logger.getLogger(CodeCoverageReporter.name);
3334

3435
var Connection conn
3536
var List<String> pathList
3637
var List<String> includeObjectList
37-
var CodeCoverageReporterWindow frame
38+
var CodeCoverageReporterDialog frame
3839
var String schemas
3940
var String includeObjects
4041
var String excludeObjects
@@ -100,7 +101,7 @@ class CodeCoverageReporter {
100101
}
101102
}
102103

103-
def setFrame(CodeCoverageReporterWindow frame) {
104+
def setFrame(CodeCoverageReporterDialog frame) {
104105
this.frame = frame;
105106
}
106107

@@ -136,15 +137,16 @@ class CodeCoverageReporter {
136137
this.excludeObjects = excludeObjects
137138
}
138139

139-
def runAsync() {
140+
def Thread runAsync() {
140141
val Runnable runnable = [|run]
141142
val thread = new Thread(runnable)
142143
thread.name = "code coverage reporter"
143144
thread.start
145+
return thread
144146
}
145147

146148
def showParameterWindow() {
147-
CodeCoverageReporterWindow.createAndShow(this)
149+
CodeCoverageReporterDialog.createAndShow(this)
148150
}
149151

150152
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.