Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commita44cd77

Browse files
Merge pull request#152 from utPLSQL/feature/issue-145-update-code-templates-AAA
Feature/issue 145 update code templates aaa
2 parentsdd4dd0e +362af12 commita44cd77

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,25 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
138138
finalLinkedHashMap<String,String>params =dedupNodes.get(0).getParams();
139139
finalStringBuildersb =newStringBuilder();
140140
if (YES.equals(params.get(RESET_PACKAGE))) {
141-
sb.append("EXECUTE dbms_session.reset_package;\n");
141+
sb.append("execute dbms_session.reset_package;\n");
142142
}
143-
sb.append("SET SERVEROUTPUT ON SIZE UNLIMITED\n");
143+
sb.append("set serveroutput on size unlimited\n");
144144
if (YES.equals(params.get(CLEAR_SCREEN))) {
145-
sb.append("CLEAR SCREEN\n");
145+
sb.append("clear screen\n");
146146
}
147147
if (dedupNodes.size() ==1) {
148-
sb.append("EXECUTE ut.run('");
148+
sb.append("execute ut.run('");
149149
sb.append(getPath(dedupNodes.get(0),conn));
150150
sb.append("');\n");
151151
}else {
152152
finalList<String>paths =dedupNodes.stream().map(node ->getPath(node,conn)).collect(Collectors.toList());
153-
sb.append("BEGIN\n");
153+
sb.append("begin\n");
154154
sb.append("\tut.run(\n");
155155
sb.append("\t\tut_varchar2_list(\n");
156156
sb.append(StringTools.getCSV(paths,"\t\t\t"));
157157
sb.append("\t\t)\n");
158158
sb.append("\t);\n");
159-
sb.append("END;\n");
159+
sb.append("end;\n");
160160
sb.append("/\n");
161161
}
162162
finalStringret =sb.toString();

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
239239
if (generateFiles) {
240240
resetConsoleOutput();
241241
saveConsoleOutput(templateTools.mkdirs(outputDirectory));
242-
if (deleteExistingfiles) {
243-
saveConsoleOutput(deleteFiles(outputDirectory).toString());
244-
}
242+
if (deleteExistingfiles) {
243+
saveConsoleOutput(deleteFiles(outputDirectory).toString());
244+
}
245245
sb.append("--\n");
246246
sb.append("-- install generated utPLSQL test packages\n");
247247
sb.append("--\n");
@@ -251,8 +251,9 @@ public String generateProlog(final Connection conn, final List<Node> nodes) {
251251
context.setConn(conn);
252252
finalTestTemplatetestTemplate =newTestTemplate(context);
253253
if (generateFiles) {
254-
finalStringpackageName =context.getTestPackagePrefix() +nodeTools.toObjectName(node)
255-
+context.getTestPackageSuffix();
254+
finalStringpackageName =context.getTestPackagePrefix().toLowerCase()
255+
+nodeTools.toObjectName(node).toLowerCase()
256+
+context.getTestPackageSuffix().toLowerCase();
256257
finalStringpackagePath =outputDirectory +File.separator +packageName;
257258
saveConsoleOutput(templateTools.writeToFile(packagePath +".pks",testTemplate.generateSpec()));
258259
saveConsoleOutput(templateTools.writeToFile(packagePath +".pkb",testTemplate.generateBody()));

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public String generateSpec() {
3939
finalStringBuildersb =newStringBuilder();
4040
finalStringobjectName =context.getObjectName().toLowerCase();
4141
finalStringpackageName =context.getTestPackagePrefix() +objectName +context.getTestPackageSuffix();
42-
sb.append("CREATE OR REPLACE PACKAGE ");
42+
sb.append("create or replace package ");
4343
sb.append(packageName);
44-
sb.append("IS\n\n");
44+
sb.append("is\n\n");
4545
if (context.isGenerateComments()) {
46-
sb.append("\t/* generated by utPLSQL for SQL Developer on ");
46+
sb.append("\t-- generated by utPLSQL for SQL Developer on ");
4747
sb.append(today);
48-
sb.append(" */\n\n");
48+
sb.append("\n\n");
4949
}
5050
sb.append("\t--%suite(");
5151
sb.append(packageName);
@@ -68,7 +68,7 @@ public String generateSpec() {
6868
if (context.isDisableTests()) {
6969
sb.append("\t--%disabled\n");
7070
}
71-
sb.append("\tPROCEDURE ");
71+
sb.append("\tprocedure ");
7272
sb.append(context.getTestUnitPrefix());
7373
sb.append(unit);
7474
sb.append(context.getTestUnitSuffix());
@@ -82,7 +82,7 @@ public String generateSpec() {
8282
sb.append("\t--%endcontext\n\n");
8383
}
8484
}
85-
sb.append("END ");
85+
sb.append("end ");
8686
sb.append(packageName);
8787
sb.append(";\n");
8888
sb.append("/");
@@ -93,15 +93,15 @@ public String generateSpec() {
9393
publicStringgenerateBody() {
9494
StringBuildersb =newStringBuilder();
9595
finalStringobjectName =context.getObjectName().toLowerCase();
96-
sb.append("CREATE OR REPLACE PACKAGE BODY ");
96+
sb.append("create or replace package body ");
9797
sb.append(context.getTestPackagePrefix());
9898
sb.append(objectName);
9999
sb.append(context.getTestPackageSuffix());
100-
sb.append("IS\n\n");
100+
sb.append("is\n\n");
101101
if (context.isGenerateComments()) {
102-
sb.append("\t/* generated by utPLSQL for SQL Developer on ");
102+
sb.append("\t-- generated by utPLSQL for SQL Developer on ");
103103
sb.append(today);
104-
sb.append(" */\n\n");
104+
sb.append("\n\n");
105105
}
106106
for (finalStringu :units) {
107107
finalStringunit =u.toLowerCase();
@@ -116,33 +116,34 @@ public String generateBody() {
116116
sb.append(" case ");
117117
sb.append(i);
118118
sb.append(": ...\n");
119+
}else {
120+
sb.append("\n");
119121
}
120122
sb.append("\t--\n");
121123
}
122-
sb.append("\tPROCEDURE ");
124+
sb.append("\tprocedure ");
123125
sb.append(procedureName);
124-
sb.append("IS\n");
125-
sb.append("\t\tl_actualINTEGER := 0;\n");
126-
sb.append("\t\tl_expectedINTEGER := 1;\n");
127-
sb.append("\tBEGIN\n");
126+
sb.append("is\n");
127+
sb.append("\t\tl_actualinteger := 0;\n");
128+
sb.append("\t\tl_expectedinteger := 1;\n");
129+
sb.append("\tbegin\n");
128130
if (context.isGenerateComments()) {
129-
sb.append("\t\t-- populate actual\n");
131+
sb.append("\t\t-- arrange\n\n");
132+
sb.append("\t\t-- act\n");
130133
sb.append("\t\t-- ");
131134
sb.append(objectName);
132135
sb.append(".");
133136
sb.append(unit);
134137
sb.append(";\n\n");
135-
sb.append("\t\t-- populate expected\n");
136-
sb.append("\t\t-- ...\n\n");
137138
sb.append("\t\t-- assert\n");
138139
}
139140
sb.append("\t\tut.expect(l_actual).to_equal(l_expected);\n");
140-
sb.append("\tEND ");
141+
sb.append("\tend ");
141142
sb.append(procedureName);
142143
sb.append(";\n\n");
143144
}
144145
}
145-
sb.append("END ");
146+
sb.append("end ");
146147
sb.append(context.getTestPackagePrefix());
147148
sb.append(objectName);
148149
sb.append(context.getTestPackageSuffix());

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ private String trimPlusNewLine(final String input) {
244244

245245
privateCharSequenceutSpecTemplate() {
246246
StringBuildersb =newStringBuilder();
247-
sb.append("CREATE OR REPLACE PACKAGE ");
247+
sb.append("create or replace package ");
248248
sb.append(testPackagePrefixTextField.getText());
249249
sb.append("[package_name]");
250250
sb.append(testPackageSuffixTextField.getText());
251-
sb.append("IS\n\n");
251+
sb.append("is\n\n");
252252
sb.append("\t--%suite\n");
253253
if (!suitePathTextField.getText().isEmpty()) {
254254
sb.append("\t--%suitepath(");
@@ -258,7 +258,7 @@ private CharSequence utSpecTemplate() {
258258
sb.append("\n\t");
259259
sb.append(utSpecProcTemplate().toString().trim().replace("\n","\n\t"));
260260
sb.append("\n\n");
261-
sb.append("END ");
261+
sb.append("end ");
262262
sb.append(testPackagePrefixTextField.getText());
263263
sb.append("[package_name]");
264264
sb.append(testPackageSuffixTextField.getText());
@@ -279,7 +279,7 @@ private CharSequence utSpecProcTemplate() {
279279
if (disableTestsCheckBox.isSelected()) {
280280
sb.append("--%disabled\n");
281281
}
282-
sb.append("PROCEDURE ");
282+
sb.append("procedure ");
283283
sb.append(testUnitPrefixTextField.getText());
284284
sb.append("[procedure_name]");
285285
sb.append(testUnitSuffixTextField.getText());
@@ -296,14 +296,14 @@ private CharSequence utSpecProcTemplate() {
296296

297297
privateCharSequenceutBodyTemplate() {
298298
StringBuildersb =newStringBuilder();
299-
sb.append("CREATE OR REPLACE PACKAGE BODY ");
299+
sb.append("create or replace package body ");
300300
sb.append(testPackagePrefixTextField.getText());
301301
sb.append("[package_name]");
302302
sb.append(testPackageSuffixTextField.getText());
303-
sb.append("IS\n\n\t");
303+
sb.append("is\n\n\t");
304304
sb.append(utBodyProcTemplate().toString().trim().replace("\n","\n\t"));
305305
sb.append("\n\n");
306-
sb.append("END ");
306+
sb.append("end ");
307307
sb.append(testPackagePrefixTextField.getText());
308308
sb.append("[package_name]");
309309
sb.append(testPackageSuffixTextField.getText());
@@ -328,26 +328,24 @@ private CharSequence utBodyProcTemplate() {
328328
sb.append('\n');
329329
sb.append("--\n");
330330
}
331-
sb.append("PROCEDURE ");
331+
sb.append("procedure ");
332332
sb.append(testUnitPrefixTextField.getText());
333333
sb.append("[procedure_name]");
334334
sb.append(testUnitSuffixTextField.getText());
335335
if (withContext) {
336336
sb.append(i);
337337
}
338-
sb.append("IS\n");
339-
sb.append("\tl_actualINTEGER := 0;\n");
340-
sb.append("\tl_expectedINTEGER := 1;\n");
341-
sb.append("BEGIN\n");
338+
sb.append("is\n");
339+
sb.append("\tl_actualinteger := 0;\n");
340+
sb.append("\tl_expectedinteger := 1;\n");
341+
sb.append("begin\n");
342342
if (generateCommentsCheckBox.isSelected()) {
343-
sb.append("\t-- populate actual\n");
344-
sb.append("\t-- ...\n\n");
345-
sb.append("\t-- populate expected\n");
346-
sb.append("\t-- ...\n\n");
343+
sb.append("\t-- arrange\n\n");
344+
sb.append("\t-- act\n\n");
347345
sb.append("\t-- assert\n");
348346
}
349347
sb.append("\tut.expect(l_actual).to_equal(l_expected);\n");
350-
sb.append("END ");
348+
sb.append("end ");
351349
sb.append(testUnitPrefixTextField.getText());
352350
sb.append("[procedure_name]");
353351
sb.append(testUnitSuffixTextField.getText());

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp