Skip to content

Commit a9e489b

Browse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #29 from PhilippSalvisberg/develop
Run utPLSQL Test
2 parents e41aabc + 38ec4c4 commit a9e489b

File tree

4 files changed

+391
-8
lines changed

4 files changed

+391
-8
lines changed

‎sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,4 +262,216 @@ class UtplsqlDao {
262262
val nodes = jdbcTemplate.query(sql, new BeanPropertyRowMapper<Node>(Node), #[objectType])
263263
return nodes
264264
}
265+
266+
/**
267+
* Gets a list of oddgen's nodes as candidates to run utPLSQL tests.
268+
*
269+
* This functions must be called from an oddgen generator only, since the Node is not
270+
* defined in the utPLSQL extension.
271+
*
272+
* @return list of oddgen nodes (complete hierarchy loaded eagerly)
273+
* @throws DataAccessException if there is a problem
274+
*/
275+
def List<Node> runnables() {
276+
var sql = '''
277+
WITH
278+
base AS (
279+
SELECT rownum AS an_id,
280+
o.object_owner,
281+
o.object_type,
282+
o.object_name,
283+
lower(a.name) AS name,
284+
a.text,
285+
a.subobject_name
286+
FROM table(ut3.ut_annotation_manager.get_annotated_objects(user, 'PACKAGE')) o
287+
CROSS JOIN table(o.annotations) a
288+
WHERE lower(a.name) in ('suite','suitepath', 'endcontext','test')
289+
OR lower(a.name) = 'context' AND regexp_like(text, '(\w+)(\.\w+)*')
290+
),
291+
suite AS (
292+
SELECT object_owner, object_type, object_name, text AS suite_description
293+
FROM base
294+
WHERE name = 'suite'
295+
),
296+
suitepath as (
297+
SELECT object_owner, object_type, object_name, text as suitepath
298+
FROM base
299+
WHERE name = 'suitepath'
300+
),
301+
context_base AS (
302+
SELECT an_id,
303+
lead(an_id) over (partition by object_owner, object_type, object_name order by an_id) an_id_end,
304+
object_owner,
305+
object_type,
306+
object_name,
307+
name,
308+
lead(name) over (partition by object_owner, object_type, object_name order by an_id) name_end,
309+
text as context
310+
FROM base
311+
WHERE name IN ('context', 'endcontext')
312+
),
313+
context as (
314+
SELECT an_id, an_id_end, object_owner, object_type, object_name, context
315+
FROM context_base
316+
WHERE name = 'context'
317+
AND name_end = 'endcontext'
318+
),
319+
test AS (
320+
SELECT b.an_id,
321+
b.object_owner,
322+
b.object_type,
323+
b.object_name,
324+
p.suitepath,
325+
c.context,
326+
b.subobject_name,
327+
b.text AS test_description
328+
FROM base b
329+
LEFT JOIN suitepath p
330+
ON p.object_owner = b.object_owner
331+
AND p.object_type = b.object_type
332+
AND p.object_name = b.object_name
333+
LEFT JOIN context c
334+
ON c.object_owner = b.object_owner
335+
AND c.object_type = b.object_type
336+
AND c.object_name = b.object_name
337+
AND b.an_id BETWEEN c.an_id AND c.an_id_end
338+
WHERE name = 'test'
339+
AND (b.object_owner, b.object_type, b.object_name) IN (
340+
select object_owner, object_type, object_name
341+
from suite
342+
)
343+
),
344+
suite_tree AS (
345+
SELECT null AS parent_id,
346+
'SUITE' AS id,
347+
'All Suites' AS name,
348+
'All utPLSQL test suites' AS description,
349+
'PACKAGE_FOLDER_ICON' AS iconName,
350+
'No' AS leaf,
351+
'Yes' AS generatable,
352+
'Yes' AS multiselectable,
353+
'Yes' AS relevant
354+
FROM dual
355+
UNION ALL
356+
SELECT DISTINCT
357+
'SUITE' AS parent_id,
358+
object_owner || '.' || object_name AS id,
359+
object_name AS name,
360+
null AS description,
361+
'PACKAGE_ICON' AS iconName,
362+
'No' AS leaf,
363+
'Yes' AS generatable,
364+
'Yes' AS multiselectable,
365+
'Yes' AS relevant
366+
FROM test
367+
UNION ALL
368+
SELECT object_owner || '.' || object_name AS parent_id,
369+
object_owner || '.' || object_name || '.' || subobject_name AS id,
370+
subobject_name AS name,
371+
null AS description,
372+
'PROCEDURE_ICON' AS iconName,
373+
'Yes' AS leaf,
374+
'Yes' AS generatable,
375+
'Yes' AS multiselectable,
376+
'Yes' AS relevant
377+
FROM test
378+
),
379+
suitepath_base AS (
380+
SELECT DISTINCT
381+
suitepath
382+
FROM suitepath
383+
),
384+
gen AS (
385+
SELECT rownum AS pos
386+
FROM xmltable('1 to 100')
387+
),
388+
suitepath_part AS (
389+
SELECT DISTINCT
390+
substr(suitepath, 1, instr(suitepath || '.', '.', 1, g.pos) -1) AS suitepath
391+
FROM suitepath_base b
392+
JOIN gen g
393+
On g.pos <= regexp_count(suitepath, '\w+')
394+
),
395+
suitepath_tree AS (
396+
SELECT NULL AS parent_id,
397+
'SUITEPATH' AS id,
398+
'All Suitepaths' AS name,
399+
'All utPLSQL test suitepathes' AS description,
400+
'FOLDER_ICON' AS iconName,
401+
'No' AS leaf,
402+
'Yes' AS generatable,
403+
'Yes' AS multiselectable,
404+
'Yes' AS relevant
405+
FROM dual
406+
UNION ALL
407+
SELECT CASE
408+
WHEN regexp_replace(suitepath,'\.?\w+$','') IS NULL THEN
409+
'SUITEPATH'
410+
ELSE
411+
USER || ':' || regexp_replace(suitepath,'\.?\w+$','')
412+
END AS parent_id,
413+
USER || ':' || suitepath AS id,
414+
regexp_substr(suitepath, '\.?(\w+$)', 1, 1, NULL, 1) AS name,
415+
null AS description,
416+
'FOLDER_ICON' AS iconName,
417+
'No' AS leaf,
418+
'Yes' AS generatable,
419+
'Yes' AS multiselectable,
420+
'Yes' AS relevant
421+
FROM suitepath_part
422+
UNION ALL
423+
SELECT DISTINCT
424+
object_owner || ':' || suitepath AS parent_id,
425+
object_owner || ':' || suitepath || '.' || object_name AS id,
426+
object_name AS name,
427+
null AS description,
428+
'PACKAGE_ICON' AS iconName,
429+
'No' AS leaf,
430+
'Yes' AS generatable,
431+
'Yes' AS multiselectable,
432+
'Yes' AS relevant
433+
FROM test
434+
WHERE suitepath IS NOT NULL
435+
UNION ALL
436+
SELECT DISTINCT
437+
object_owner || ':' || suitepath || '.' || object_name AS parent_id,
438+
object_owner || ':' || suitepath || '.' || object_name || '.' || context AS id,
439+
context AS name,
440+
null AS description,
441+
'FOLDER_ICON' AS iconName,
442+
'No' AS leaf,
443+
'Yes' AS generatable,
444+
'Yes' AS multiselectable,
445+
'Yes' AS relevant
446+
FROM test
447+
WHERE suitepath IS NOT NULL
448+
AND context IS NOT NULL
449+
UNION ALL
450+
SELECT object_owner || ':' || suitepath || '.' || object_name || CASE WHEN context IS NOT NULL THEN '.' || context END AS parent_id,
451+
object_owner || ':' || suitepath || '.' || object_name || CASE WHEN context IS NOT NULL THEN '.' || context END || '.' || subobject_name AS id,
452+
subobject_name AS name,
453+
null AS description,
454+
'PROCEDURE_ICON' AS iconName,
455+
'Yes' AS leaf,
456+
'Yes' AS generatable,
457+
'Yes' AS multiselectable,
458+
'Yes' AS relevant
459+
FROM test
460+
WHERE suitepath IS NOT NULL
461+
),
462+
tree AS (
463+
SELECT parent_id, id, name, description, iconName, leaf, generatable, multiselectable, relevant
464+
FROM suite_tree
465+
UNION ALL
466+
SELECT parent_id, id, name, description, iconName, leaf, generatable, multiselectable, relevant
467+
FROM suitepath_tree
468+
)
469+
SELECT parent_id, id, name, description, iconName, leaf, generatable, multiselectable, relevant
470+
FROM tree
471+
'''
472+
val jdbcTemplate = new JdbcTemplate(new SingleConnectionDataSource(conn, true))
473+
val nodes = jdbcTemplate.query(sql, new BeanPropertyRowMapper<Node>(Node))
474+
return nodes
475+
}
476+
265477
}

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

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
/*
2+
* Copyright 2018 Philipp Salvisberg <philipp.salvisberg@trivadis.com>
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.utplsql.sqldev.oddgen
17+
18+
import java.sql.Connection
19+
import java.util.ArrayList
20+
import java.util.HashMap
21+
import java.util.HashSet
22+
import java.util.LinkedHashMap
23+
import java.util.List
24+
import oracle.ide.config.Preferences
25+
import org.oddgen.sqldev.generators.OddgenGenerator2
26+
import org.oddgen.sqldev.generators.model.Node
27+
import org.utplsql.sqldev.dal.UtplsqlDao
28+
import org.utplsql.sqldev.model.preference.PreferenceModel
29+
import org.utplsql.sqldev.resources.UtplsqlResources
30+
31+
class RunGenerator implements OddgenGenerator2 {
32+
33+
public static val YES = "Yes"
34+
public static val NO = "No"
35+
36+
public static var RESET_PACKAGE = UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")
37+
public static var CLEAR_SCREEN = UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")
38+
public static var INDENT_SPACES = UtplsqlResources.getString("PREF_INDENT_SPACES_LABEL")
39+
40+
override isSupported(Connection conn) {
41+
var ret = false
42+
if (conn !== null) {
43+
if (conn.metaData.databaseProductName.startsWith("Oracle")) {
44+
if (conn.metaData.databaseMajorVersion == 11) {
45+
if (conn.metaData.databaseMinorVersion >= 2) {
46+
ret = true
47+
}
48+
} else if (conn.metaData.databaseMajorVersion > 11) {
49+
ret = true
50+
}
51+
}
52+
}
53+
return ret
54+
}
55+
56+
override getName(Connection conn) {
57+
return "Run test"
58+
}
59+
60+
override getDescription(Connection conn) {
61+
return "Runs utPLSQL test packages in the current user."
62+
}
63+
64+
override getFolders(Connection conn) {
65+
val preferences = PreferenceModel.getInstance(Preferences.preferences)
66+
val folders = new ArrayList<String>
67+
for (f : preferences.rootFolderInOddgenView.split(",").filter[!it.empty]) {
68+
folders.add(f.trim)
69+
}
70+
return folders
71+
}
72+
73+
override getHelp(Connection conn) {
74+
return "<p>not yet available</p>"
75+
}
76+
77+
override getNodes(Connection conn, String parentNodeId) {
78+
val preferences = PreferenceModel.getInstance(Preferences.preferences)
79+
val params = new LinkedHashMap<String, String>()
80+
params.put(RESET_PACKAGE, if (preferences.resetPackage) {YES} else {NO})
81+
params.put(CLEAR_SCREEN, if (preferences.clearScreen) {YES} else {NO})
82+
params.put(INDENT_SPACES, String.valueOf(preferences.indentSpaces))
83+
val UtplsqlDao dao = new UtplsqlDao(conn)
84+
val nodes = dao.runnables
85+
for (node : nodes) {
86+
node.params = params
87+
}
88+
return nodes
89+
}
90+
91+
override getLov(Connection conn, LinkedHashMap<String, String> params, List<Node> nodes) {
92+
val lov = new HashMap<String, List<String>>()
93+
lov.put(RESET_PACKAGE, #[YES, NO])
94+
lov.put(CLEAR_SCREEN, #[YES, NO])
95+
lov.put(INDENT_SPACES, #["1", "2", "3", "4", "5", "6", "7", "8"])
96+
return lov
97+
}
98+
99+
override getParamStates(Connection conn, LinkedHashMap<String, String> params, List<Node> nodes) {
100+
return new HashMap<String, Boolean>
101+
}
102+
103+
def private getPath(Node node, Connection conn) {
104+
if (node.id == "SUITE" || node.id == "SUITEPATH") {
105+
return conn.metaData.userName
106+
} else {
107+
return node.id
108+
}
109+
}
110+
111+
def replaceTabsWithSpaces(CharSequence input, int indentSpaces) {
112+
val spaces = String.format("%1$"+indentSpaces+"s", "")
113+
return input.toString.replace("\t", spaces)
114+
}
115+
116+
def dedup(List<Node> nodes) {
117+
val set = new HashSet<String>
118+
for (node : nodes) {
119+
set.add(node.id)
120+
}
121+
val ret = new ArrayList<Node>
122+
for (node : nodes) {
123+
if (!set.contains(node.parentId)) {
124+
ret.add(node)
125+
}
126+
}
127+
return ret
128+
}
129+
130+
override generateProlog(Connection conn, List<Node> nodes) {
131+
val dedupNodes = nodes.dedup
132+
val params = dedupNodes.get(0).params
133+
val ret = '''
134+
«IF params.get(RESET_PACKAGE) == YES»
135+
EXECUTE dbms_session.reset_package;
136+
«ENDIF»
137+
SET SERVEROUTPUT ON SIZE UNLIMITED
138+
«IF params.get(CLEAR_SCREEN) == YES»
139+
CLEAR SCREEN
140+
«ENDIF»
141+
«IF dedupNodes.size == 1»
142+
EXECUTE ut.run('«dedupNodes.get(0).getPath(conn)»');
143+
«ELSE»
144+
BEGIN
145+
ut.run(
146+
ut_varchar2_list(
147+
«FOR node : dedupNodes SEPARATOR ","»
148+
'«node.getPath(conn)»'
149+
«ENDFOR»
150+
)
151+
);
152+
END;
153+
/
154+
«ENDIF»
155+
'''
156+
return ret.replaceTabsWithSpaces(Integer.valueOf(params.get(INDENT_SPACES)))
157+
}
158+
159+
override generateSeparator(Connection conn) {
160+
return ""
161+
}
162+
163+
override generateEpilog(Connection conn, List<Node> nodes) {
164+
return ""
165+
}
166+
167+
override generate(Connection conn, Node node) {
168+
return ""
169+
}
170+
171+
}

0 commit comments

Comments
 (0)