Skip to content

Navigation Menu

Sign in
Appearance settings

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 fa54c8b

Browse filesBrowse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #114 from PhilippSalvisberg/bugfix/issue-113-code-templates
Bugfix/issue 113 code templates
2 parents 93087fa + 2bcdc01 commit fa54c8b
Copy full SHA for fa54c8b

File tree

3 files changed

+12
-13
lines changed
Filter options

3 files changed

+12
-13
lines changed

‎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
@@ -144,7 +144,7 @@ Please file your bug reports, enhancement requests, questions and other support
144144

145145
## How to Build
146146

147-
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.4.0
147+
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 20.2.0
148148
2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.6.3
149149
3. [Download](https://git-scm.com/downloads) and install a git command line client
150150
4. Clone the utPLSQL-SQLDeveloper repository
@@ -154,7 +154,7 @@ Please file your bug reports, enhancement requests, questions and other support
154154

155155
6. Run maven build by the following command
156156

157-
mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
157+
mvn -Dsqldev.basedir=/Applications/SQLDeveloper20.2.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
158158

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

‎sqldev/pom.xml

Copy file name to clipboardExpand all lines: sqldev/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<jdk.version>1.8</jdk.version>
1414
<jdk.version.test>1.8</jdk.version.test>
1515
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
16-
<sqldev.basedir>/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
16+
<sqldev.basedir>/Applications/SQLDeveloper20.2.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1717
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
1818
<!-- arguments to by added by jacoco plugin for test runs with coverage -->
1919
<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->

‎sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java

Copy file name to clipboardExpand all lines: sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java
+9-10Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ private CharSequence utSpecTemplate() {
252252
sb.append(suitePathTextField.getText());
253253
sb.append(")\n");
254254
}
255-
sb.append('\n');
256-
sb.append('\t');
257-
sb.append(utSpecProcTemplate());
255+
sb.append("\n\t");
256+
sb.append(utSpecProcTemplate().toString().trim().replace("\n", "\n\t"));
257+
sb.append("\n\n");
258258
sb.append("END ");
259259
sb.append(testPackagePrefixTextField.getText());
260260
sb.append("[package_name]");
@@ -271,7 +271,7 @@ private CharSequence utSpecProcTemplate() {
271271
if (withContext) {
272272
sb.append("--%context([procedure_name])\n\n");
273273
}
274-
for (int i = 0; i < numberOfTestsPerUnit; i ++) {
274+
for (int i = 1; i <= numberOfTestsPerUnit; i ++) {
275275
sb.append("--%test\n");
276276
if (disableTestsCheckBox.isSelected()) {
277277
sb.append("--%disabled\n");
@@ -297,10 +297,9 @@ private CharSequence utBodyTemplate() {
297297
sb.append(testPackagePrefixTextField.getText());
298298
sb.append("[package_name]");
299299
sb.append(testPackageSuffixTextField.getText());
300-
sb.append(" IS\n\n");
301-
sb.append('\t');
302-
sb.append(utBodyProcTemplate());
303-
sb.append('\n');
300+
sb.append(" IS\n\n\t");
301+
sb.append(utBodyProcTemplate().toString().trim().replace("\n", "\n\t"));
302+
sb.append("\n\n");
304303
sb.append("END ");
305304
sb.append(testPackagePrefixTextField.getText());
306305
sb.append("[package_name]");
@@ -314,7 +313,7 @@ private CharSequence utBodyProcTemplate() {
314313
StringBuilder sb = new StringBuilder();
315314
final Integer numberOfTestsPerUnit = (Integer) numberOfTestsPerUnitModel.getValue();
316315
final boolean withContext = numberOfTestsPerUnit > 1;
317-
for (int i = 0; i < numberOfTestsPerUnit; i++) {
316+
for (int i = 1; i <= numberOfTestsPerUnit; i++) {
318317
if (generateCommentsCheckBox.isSelected()) {
319318
sb.append("--\n");
320319
sb.append("-- test");
@@ -344,7 +343,7 @@ private CharSequence utBodyProcTemplate() {
344343
sb.append("\t-- ...\n\n");
345344
sb.append("\t-- assert\n");
346345
}
347-
sb.append("\tut.expect(l_actual).to_equal(l_expected);");
346+
sb.append("\tut.expect(l_actual).to_equal(l_expected);\n");
348347
sb.append("END ");
349348
sb.append(testUnitPrefixTextField.getText());
350349
sb.append("[procedure_name]");

0 commit comments

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