Skip to content

Commit 721d2f6

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
add empty line to visualize SQL better
1 parent 590ca8e commit 721d2f6

File tree

5 files changed

+62
-10
lines changed

5 files changed

+62
-10
lines changed

‎sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public static void setup() {
5151
sb.setLength(0);
5252
sb.append("CREATE OR REPLACE PACKAGE test_f IS\n");
5353
sb.append(" --%suite\n\n");
54+
5455
sb.append(" --%test\n");
5556
sb.append(" PROCEDURE f;\n");
5657
sb.append("END test_f;");

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalBugFixTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public void issue54FolderIconForSuitesWithoutTests() {
3939
StringBuilder sb = new StringBuilder();
4040
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
4141
sb.append(" -- %suite\n\n");
42+
4243
sb.append("END junit_utplsql_test_pkg;");
4344
jdbcTemplate.execute(sb.toString());
4445
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
@@ -54,8 +55,10 @@ public void issue54PackageIconForSuitesWithTests() {
5455
StringBuilder sb = new StringBuilder();
5556
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
5657
sb.append(" -- %suite\n\n");
58+
5759
sb.append(" -- %test\n");
5860
sb.append(" PROCEDURE t1;\n\n");
61+
5962
sb.append("END junit_utplsql_test_pkg;");
6063
jdbcTemplate.execute(sb.toString());
6164
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
@@ -71,6 +74,7 @@ public void issue55SuiteWithoutTests() {
7174
StringBuilder sb = new StringBuilder();
7275
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
7376
sb.append(" -- %suite\n\n");
77+
7478
sb.append("END junit_utplsql_test_pkg;");
7579
jdbcTemplate.execute(sb.toString());
7680
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));
@@ -84,6 +88,7 @@ public void issue56SuiteWithoutTests() {
8488
StringBuilder sb = new StringBuilder();
8589
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
8690
sb.append(" -- %suite\n\n");
91+
8792
sb.append("END junit_utplsql_test_pkg;");
8893
jdbcTemplate.execute(sb.toString());
8994
final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,13 @@ private void containsUtplsqlTestWithSuiteAnnotation(final String utPlsqlVersion)
8181
StringBuilder sb = new StringBuilder();
8282
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
8383
sb.append(" -- %suite\n\n");
84+
8485
sb.append(" -- %test\n");
8586
sb.append(" PROCEDURE t1;\n\n");
87+
8688
sb.append(" -- %Test\n");
8789
sb.append(" PROCEDURE t2;\n\n");
90+
8891
sb.append(" PROCEDURE t3;\n");
8992
sb.append("END junit_utplsql_test_pkg;");
9093
jdbcTemplate.execute(sb.toString());
@@ -120,8 +123,10 @@ private void containsUtplsqlTestWithoutSuiteAnnotation(final String utPlsqlVersi
120123
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
121124
sb.append(" -- %test\n");
122125
sb.append(" PROCEDURE t1;\n\n");
126+
123127
sb.append(" -- %Test\n");
124128
sb.append(" PROCEDURE t2;\n\n");
129+
125130
sb.append(" PROCEDURE t3;\n");
126131
sb.append("END junit_utplsql_test_pkg;");
127132
jdbcTemplate.execute(sb.toString());
@@ -156,10 +161,13 @@ private void annotations(final String utPlsqlVersion) {
156161
StringBuilder sb = new StringBuilder();
157162
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
158163
sb.append(" -- %suite\n\n");
164+
159165
sb.append(" -- %test\n");
160166
sb.append(" PROCEDURE t1;\n\n");
167+
161168
sb.append(" -- %Test\n");
162169
sb.append(" PROCEDURE t2;\n\n");
170+
163171
sb.append(" PROCEDURE t3;\n");
164172
sb.append("END junit_utplsql_test_pkg;");
165173
jdbcTemplate.execute(sb.toString());
@@ -210,11 +218,15 @@ private void testablesPackagesWithTests(final String utPlsqlVersion) {
210218
StringBuilder sb = new StringBuilder();
211219
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
212220
sb.append(" -- %suite\n\n");
221+
213222
sb.append(" -- %test\n");
214223
sb.append(" PROCEDURE t1;\n\n");
224+
215225
sb.append(" -- %Test\n");
216226
sb.append(" PROCEDURE t2;\n\n");
227+
217228
sb.append(" PROCEDURE t3;\n\n");
229+
218230
sb.append("END junit_utplsql_test_pkg;");
219231
jdbcTemplate.execute(sb.toString());
220232
final List<Node> actual = dao.testables("PACKAGE");
@@ -245,6 +257,7 @@ private void testablesPackagesWithoutTests(final String utPlsqlVersion) {
245257
StringBuilder sb = new StringBuilder();
246258
sb.append("CREATE OR REPLACE PACKAGE junit_no_test_pkg IS\n");
247259
sb.append(" PROCEDURE p1;\n\n");
260+
248261
sb.append(" PROCEDURE p2;\n");
249262
sb.append("END junit_no_test_pkg;");
250263
jdbcTemplate.execute(sb.toString());
@@ -378,14 +391,20 @@ public void runnables(final String utPlsqlVersion) {
378391
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
379392
sb.append(" -- %suite\n");
380393
sb.append(" -- %suitepath(a.B.c)\n\n");
394+
381395
sb.append(" -- %test\n");
382396
sb.append(" PROCEDURE T0;\n\n");
397+
383398
sb.append(" -- %context(myContext)\n\n");
399+
384400
sb.append(" -- %test(t1: test One)\n");
385401
sb.append(" PROCEDURE t1;\n\n");
402+
386403
sb.append(" -- %test(t2: test Two)\n");
387404
sb.append(" PROCEDURE t2;\n\n");
405+
388406
sb.append(" -- %endcontext\n\n");
407+
389408
sb.append(" -- %test\n");
390409
sb.append(" PROCEDURE t3;\n");
391410
sb.append("END junit_utplsql_test_pkg;");
@@ -443,11 +462,11 @@ public void dbmsOutput() {
443462
dao.enableDbmsOutput();
444463
StringBuilder sb = new StringBuilder();
445464
sb.append("BEGIN\n");
446-
sb.append(" sys.dbms_output.put_line(\'line1\');\n");
447-
sb.append(" sys.dbms_output.put_line(\'line2\');\n");
465+
sb.append(" sys.dbms_output.put_line('line1');\n");
466+
sb.append(" sys.dbms_output.put_line('line2');\n");
448467
sb.append(" sys.dbms_output.put_line(null);\n");
449-
sb.append(" sys.dbms_output.put_line(\'line4\');\n");
450-
sb.append(" sys.dbms_output.put_line(\'line5\');\n");
468+
sb.append(" sys.dbms_output.put_line('line4');\n");
469+
sb.append(" sys.dbms_output.put_line('line5');\n");
451470
sb.append("END;");
452471
jdbcTemplate.execute(sb.toString());
453472
final String actual = dao.getDbmsOutput(2);
@@ -475,6 +494,7 @@ public void includes() {
475494
sb.setLength(0);
476495
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
477496
sb.append(" -- %suite\n\n");
497+
478498
sb.append(" -- %test\n");
479499
sb.append(" PROCEDURE f1;\n");
480500
sb.append("END junit_utplsql_test_pkg;");
@@ -546,6 +566,7 @@ public void getSourceOfPackage() {
546566
StringBuilder sb = new StringBuilder();
547567
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
548568
sb.append(" -- %suite\n\n");
569+
549570
sb.append(" -- %test\n");
550571
sb.append(" PROCEDURE p1;\n");
551572
sb.append("END junit_utplsql_test_pkg;");
@@ -580,6 +601,7 @@ public void getObjectType() {
580601
StringBuilder sb = new StringBuilder();
581602
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n");
582603
sb.append(" -- %suite\n\n");
604+
583605
sb.append(" -- %test\n");
584606
sb.append(" PROCEDURE p1;\n");
585607
sb.append("END junit_utplsql_test_pkg;");

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ public void setup() {
3636
StringBuilder sb = new StringBuilder();
3737
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_fetch_size_pkg is\n");
3838
sb.append(" --%suite(JUnit testing)\n\n");
39+
3940
sb.append(" --%test(test 1 - 0 seconds)\n");
4041
sb.append(" PROCEDURE test_1_0;\n\n");
42+
4143
sb.append(" --%test(test 2 - 1 seconds)\n");
4244
sb.append(" PROCEDURE test_2_1;\n\n");
45+
4346
sb.append(" --%test(test 3 - 2 seconds)\n");
4447
sb.append(" PROCEDURE test_3_2;\n\n");
48+
4549
sb.append(" --%test(test 4 - 0 seconds)\n");
4650
sb.append(" PROCEDURE test_4_0;\n\n");
51+
4752
sb.append(" --%test(test 5 - 0 seconds)\n");
4853
sb.append(" PROCEDURE test_5_0;\n");
4954
sb.append("END;");
@@ -54,18 +59,22 @@ public void setup() {
5459
sb.append(" BEGIN\n");
5560
sb.append(" NULL;\n");
5661
sb.append(" END;\n\n");
62+
5763
sb.append(" PROCEDURE test_2_1 IS\n");
5864
sb.append(" BEGIN\n");
5965
sb.append(" dbms_session.sleep(1);\n");
6066
sb.append(" END;\n\n");
67+
6168
sb.append(" PROCEDURE test_3_2 IS\n");
6269
sb.append(" BEGIN\n");
6370
sb.append(" dbms_session.sleep(2);\n");
6471
sb.append(" END;\n\n");
72+
6573
sb.append(" PROCEDURE test_4_0 IS\n");
6674
sb.append(" BEGIN\n");
6775
sb.append(" NULL;\n");
6876
sb.append(" END;\n\n");
77+
6978
sb.append(" PROCEDURE test_5_0 IS\n");
7079
sb.append(" BEGIN\n");
7180
sb.append(" NULL;\n");

‎sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,15 @@ public void setup() {
4242
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test1_pkg is\n");
4343
sb.append(" --%suite(JUnit testing)\n");
4444
sb.append(" --%suitepath(a)\n\n");
45+
4546
sb.append(" --%context(test context)\n\n");
47+
4648
sb.append(" --%test(test 1 - OK)\n");
4749
sb.append(" PROCEDURE test_1_ok;\n\n");
50+
4851
sb.append(" --%test(test 2 - NOK)\n");
4952
sb.append(" PROCEDURE test_2_nok;\n\n");
53+
5054
sb.append(" --%endcontext\n");
5155
sb.append("END;");
5256
jdbcTemplate.execute(sb.toString());
@@ -56,6 +60,7 @@ public void setup() {
5660
sb.append(" BEGIN\n");
5761
sb.append(" ut.expect(1).to_equal(1);\n");
5862
sb.append(" END;\n\n");
63+
5964
sb.append(" PROCEDURE test_2_nok IS\n");
6065
sb.append(" BEGIN\n");
6166
sb.append(" ut.expect(1).to_equal(2);\n");
@@ -66,10 +71,13 @@ public void setup() {
6671
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test2_pkg IS\n");
6772
sb.append(" --%suite\n");
6873
sb.append(" --%suitepath(b)\n\n");
74+
6975
sb.append(" --%test\n");
7076
sb.append(" PROCEDURE test_3_ok;\n\n");
77+
7178
sb.append(" --%test\n");
7279
sb.append(" PROCEDURE test_4_nok;\n\n");
80+
7381
sb.append(" --%test\n");
7482
sb.append(" --%disabled\n");
7583
sb.append(" PROCEDURE test_5;\n");
@@ -81,11 +89,13 @@ public void setup() {
8189
sb.append(" BEGIN\n");
8290
sb.append(" ut3.ut.expect(2).to_equal(2);\n");
8391
sb.append(" END;\n\n");
92+
8493
sb.append(" PROCEDURE test_4_nok IS\n");
8594
sb.append(" BEGIN\n");
8695
sb.append(" ut3.ut.expect(2).to_equal(3);\n");
8796
sb.append(" ut3.ut.expect(2).to_equal(4);\n");
8897
sb.append(" END;\n\n");
98+
8999
sb.append(" PROCEDURE test_5 IS\n");
90100
sb.append(" BEGIN\n");
91101
sb.append(" NULL;\n");
@@ -96,10 +106,13 @@ public void setup() {
96106
sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test3_pkg IS\n");
97107
sb.append(" --%suite\n");
98108
sb.append(" --%suitepath(b)\n\n");
109+
99110
sb.append(" --%test\n");
100111
sb.append(" PROCEDURE test_6_with_runtime_error;\n\n");
112+
101113
sb.append(" --%test\n");
102114
sb.append(" PROCEDURE test_7_with_serveroutput;\n\n");
115+
103116
sb.append(" --%afterall\n");
104117
sb.append(" PROCEDURE print_and_raise;\n");
105118
sb.append("END;");
@@ -109,20 +122,22 @@ public void setup() {
109122
sb.append(" PROCEDURE test_6_with_runtime_error IS\n");
110123
sb.append(" l_actual INTEGER;\n");
111124
sb.append(" BEGIN\n");
112-
sb.append(" EXECUTE IMMEDIATE \'select 6 from non_existing_table\' INTO l_actual;\n");
125+
sb.append(" EXECUTE IMMEDIATE 'select 6 from non_existing_table' INTO l_actual;\n");
113126
sb.append(" ut3.ut.expect(6).to_equal(l_actual);\n");
114127
sb.append(" END\n\n;");
128+
115129
sb.append(" PROCEDURE test_7_with_serveroutput IS\n");
116130
sb.append(" BEGIN\n");
117-
sb.append(" dbms_output.put_line(\'before test 7\');\n");
131+
sb.append(" dbms_output.put_line('before test 7');\n");
118132
sb.append(" ut3.ut.expect(7).to_equal(7);\n");
119-
sb.append(" dbms_output.put_line(\'after test 7\');\n");
133+
sb.append(" dbms_output.put_line('after test 7');\n");
120134
sb.append(" END;\n\n");
135+
121136
sb.append(" PROCEDURE print_and_raise IS\n");
122137
sb.append(" BEGIN\n");
123-
sb.append(" dbms_output.put_line(\'Now, a no_data_found exception is raised\');\n");
124-
sb.append(" dbms_output.put_line(\'dbms_output and error stack is reported for this suite.\');\n");
125-
sb.append(" dbms_output.put_line(\'A runtime error in afterall is counted as a warning.\');\n");
138+
sb.append(" dbms_output.put_line('Now, a no_data_found exception is raised');\n");
139+
sb.append(" dbms_output.put_line('dbms_output and error stack is reported for this suite.');\n");
140+
sb.append(" dbms_output.put_line('A runtime error in afterall is counted as a warning.');\n");
126141
sb.append(" RAISE no_data_found;\n");
127142
sb.append(" END;\n");
128143
sb.append("END;");

0 commit comments

Comments
 (0)