Merge pull request #62 from utPLSQL/issue_6

Run utPLSQL tests in a dedicated utPLSQL view

Author: PhilippSalvisberg

.gitignore

@@ -11,6 +11,7 @@
 **/.project
 **/.classpath
 **/.settings
+**/.idea
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/

README.md

@@ -112,7 +112,7 @@ Please file your bug reports, enhancement requests, questions and other support
 
 ## How to Build
 
-1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 18.3.0
+1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.1.0
 2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.5.4
 3. [Download](https://git-scm.com/downloads) and install a git command line client
 4. Clone the utPLSQL-SQLDeveloper repository
@@ -122,7 +122,7 @@ Please file your bug reports, enhancement requests, questions and other support
 
 6. Run maven build by the following command
 
-		mvn -Dsqldev.basedir=/Applications/SQLDeveloper18.3.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
+		mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.1.0.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

images/code_coverage_dialog.png

@@ -88,6 +88,9 @@
 			</composite-rule>
 		</rules>
 		<triggers>
+			<dockable-factory-hook xmlns="http://xmlns.oracle.com/ide/extension">
+				<factory id="UTPLSQL_RUNNER_FACTORY" class="org.utplsql.sqldev.ui.runner.RunnerFactory" />
+			</dockable-factory-hook>
 			<actions xmlns="http://xmlns.oracle.com/jdeveloper/1013/extension">
 				<action id="utplsql.test">
 					<properties>
@@ -158,10 +161,17 @@
 			<settings-ui-hook>
 				<page id="UTPLSQL_PREFERENCES_PAGE" parent-idref="/preferences">
 					<label>${PREF_LABEL}</label>
-					<traversable-class>org.utplsql.sqldev.PreferencePanel
+					<traversable-class>org.utplsql.sqldev.ui.preference.PreferencePanel
 					</traversable-class>
 				</page>
 			</settings-ui-hook>
 		</triggers>
 	</trigger-hooks>
+
+	<hooks>
+		<dockable-hook xmlns="http://xmlns.oracle.com/ide/extension">
+			<dockable id="UTPLSQL_RUNNER_VIEW" />
+		</dockable-hook>
+	</hooks>	
+
 </extension>

images/generate_utplsql_test.png

@@ -5,15 +5,15 @@
 	<!-- The Basics -->
 	<groupId>org.utplsql</groupId>
 	<artifactId>org.utplsql.sqldev</artifactId>
-	<version>0.7.2-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jdk.version>1.8</jdk.version>
 		<jdk.version.test>1.8</jdk.version.test>
 		<xtend.version>2.15.0</xtend.version>
 		<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
-		<sqldev.basedir>/Applications/SQLDeveloper18.3.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
+		<sqldev.basedir>/Applications/SQLDeveloper19.1.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
 		<final.name>utplsql_for_SQLDev_${project.version}</final.name>
 	</properties>
 	<dependencies>
@@ -60,13 +60,6 @@
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/ide/lib/uic.jar</systemPath>
 		</dependency>
-		<dependency>
-			<groupId>oracle</groupId>
-			<artifactId>oracle.sqldeveloper.utils</artifactId>
-			<version>12.2.0</version>
-			<scope>system</scope>
-			<systemPath>${sqldev.basedir}/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar</systemPath>
-		</dependency>
 		<dependency>
 			<groupId>oracle</groupId>
 			<artifactId>oracle.ide.navigator</artifactId>
@@ -144,7 +137,22 @@
 			<scope>system</scope>
 			<systemPath>${sqldev.basedir}/jdev/extensions/oracle.jdeveloper.java.core.jar</systemPath>
 		</dependency>
-		<!-- SQL Developer specific dependencies part 2 (available in public maven repositories) -->
+		<!-- SQL Developer specific dependencies part 2 (used for tests only) -->
+		<dependency>
+			<groupId>oracle</groupId>
+			<artifactId>jewt4.jar</artifactId>
+			<version>12.2.1</version>
+			<scope>system</scope>
+			<systemPath>${sqldev.basedir}/modules/oracle.bali.jewt/jewt4.jar</systemPath>
+		</dependency>		
+		<dependency>
+			<groupId>oracle</groupId>
+			<artifactId>share.jar</artifactId>
+			<version>12.2.1</version>
+			<scope>system</scope>
+			<systemPath>${sqldev.basedir}/modules/oracle.bali.share/share.jar</systemPath>
+		</dependency>		
+		<!-- SQL Developer specific dependencies part 3 (available in public maven repositories) -->
 		<dependency>
 			<!-- SQL Developer is using this older version -->
 			<groupId>org.osgi</groupId>
@@ -164,6 +172,11 @@
 			<artifactId>spring-jdbc</artifactId>
 			<version>5.1.0.RELEASE</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>5.1.0.RELEASE</version>
+		</dependency>
 		<dependency>
 			<groupId>org.oddgen</groupId>
 			<artifactId>org.oddgen.sqldev</artifactId>

images/generate_utplsql_test_from_template.png

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.utplsql.sqldev
+package org.utplsql.sqldev.coverage
 
 import java.awt.Desktop
 import java.io.File
@@ -27,14 +27,15 @@ import java.util.List
 import java.util.logging.Logger
 import oracle.dbtools.raptor.utils.Connections
 import org.utplsql.sqldev.dal.UtplsqlDao
+import org.utplsql.sqldev.ui.coverage.CodeCoverageReporterDialog
 
 class CodeCoverageReporter {
 	static val Logger logger = Logger.getLogger(CodeCoverageReporter.name);
 
 	var Connection conn
 	var List<String> pathList
 	var List<String> includeObjectList
-	var CodeCoverageReporterWindow frame
+	var CodeCoverageReporterDialog frame
 	var String schemas
 	var String includeObjects
 	var String excludeObjects
@@ -100,7 +101,7 @@ class CodeCoverageReporter {
 		}
 	}
 
-	def setFrame(CodeCoverageReporterWindow frame) {
+	def setFrame(CodeCoverageReporterDialog frame) {
 		this.frame = frame;
 	}
 
@@ -136,15 +137,16 @@ class CodeCoverageReporter {
 		this.excludeObjects = excludeObjects
 	}	
 
-	def runAsync() {
+	def Thread runAsync() {
 		val Runnable runnable = [|run]
 		val thread = new Thread(runnable)
 		thread.name = "code coverage reporter"
 		thread.start
+		return thread
 	}
 
 	def showParameterWindow() {
-		CodeCoverageReporterWindow.createAndShow(this)
+		CodeCoverageReporterDialog.createAndShow(this)
 	}
 
 }