From 0f12ca8e01e392c1a232023376b4f3a1cd62cf59 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 00:54:40 +0100 Subject: [PATCH 1/7] back to snapshot version 0.7.1-SNAPSHOT --- sqldev/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 41261000..5d161e3c 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -5,7 +5,7 @@ org.utplsql org.utplsql.sqldev - 0.7.0 + 0.7.1-SNAPSHOT bundle UTF-8 From 8ad5e78cb3e74225415dd32c0ee839c2ee39103d Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 00:55:15 +0100 Subject: [PATCH 2/7] Do not hard-code utPLSQL schema (again) --- sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend index e7a12a50..2334f50c 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend @@ -492,7 +492,7 @@ class UtplsqlDao { lower(a.name) AS name, a.text, a.subobject_name - FROM table(ut3.ut_annotation_manager.get_annotated_objects(user, 'PACKAGE')) o + FROM table(«utplsqlSchema».ut_annotation_manager.get_annotated_objects(user, 'PACKAGE')) o CROSS JOIN table(o.annotations) a WHERE lower(a.name) in ('suite', 'suitepath', 'endcontext', 'test') OR lower(a.name) = 'context' AND regexp_like(text, '(\w+)(\.\w+)*') From b0fc546887afe0b406d7b3e5e2334367504f78c4 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 02:40:24 +0100 Subject: [PATCH 3/7] Fixes #56 - "Run utPLSQL test" is disabled for suites without test --- .../java/org/utplsql/sqldev/dal/UtplsqlDao.xtend | 2 +- .../java/org/utplsql/sqldev/tests/DalTest.xtend | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend index 2334f50c..f06d6b7f 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend @@ -179,7 +179,7 @@ class UtplsqlDao { val sql = ''' SELECT count(*) FROM TABLE(ut_runner.get_suites_info(upper(?), upper(?))) - WHERE item_type = 'UT_TEST' + WHERE item_type IN ('UT_TEST', 'UT_SUITE') AND (item_name = upper(?) or ? IS NULL) ''' found = jdbcTemplate.queryForObject(sql, Integer, #[owner, objectName, subobjectName, subobjectName]) diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend index 9dbad90b..6a6f8748 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend @@ -471,5 +471,18 @@ class DalTest extends AbstractJdbcTest { Assert.assertEquals(expected, actual) } + + @Test + def void issue56SuiteWithoutTests() { + jdbcTemplate.execute(''' + CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS + -- %suite + + END junit_utplsql_test_pkg; + ''') + val dao = new UtplsqlDao(dataSource.connection) + Assert.assertTrue(dao.containsUtplsqlTest("scott", "junit_utplsql_test_pkg")) + jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg") + } } \ No newline at end of file From d49a6c52539e1bbcc77c4d55a2ba553ff176cac6 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 03:03:35 +0100 Subject: [PATCH 4/7] Fixes #55 - oddgen "Run test" view under "All Suites": Include suites without tests --- .../java/org/utplsql/sqldev/dal/UtplsqlDao.xtend | 2 +- .../java/org/utplsql/sqldev/tests/DalTest.xtend | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend index f06d6b7f..9153d374 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend @@ -416,7 +416,7 @@ class UtplsqlDao { 'Yes' AS multiselectable, 'Yes' AS relevant FROM test - WHERE item_type = 'UT_TEST' + WHERE item_type IN ('UT_TEST', 'UT_SUITE') UNION ALL SELECT object_owner || '.' || object_name AS parent_id, object_owner || '.' || object_name || '.' || item_name AS id, diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend index 6a6f8748..0c45c62e 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend @@ -471,6 +471,21 @@ class DalTest extends AbstractJdbcTest { Assert.assertEquals(expected, actual) } + + @Test + def void issue55SuiteWithoutTests() { + setupAndTeardown + jdbcTemplate.execute(''' + CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS + -- %suite + + END junit_utplsql_test_pkg; + ''') + val dao = new UtplsqlDao(dataSource.connection) + val actualNodes = dao.runnables() + Assert.assertEquals(4, actualNodes.size) + jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg") + } @Test def void issue56SuiteWithoutTests() { From d7cbfc7d7b238fc9d5a25954aba2e39203ef12e0 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 04:23:33 +0100 Subject: [PATCH 5/7] remove tailing whitespace --- sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend index 0c45c62e..21e08e42 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend @@ -328,7 +328,7 @@ class DalTest extends AbstractJdbcTest { PROCEDURE t3; END junit_utplsql_test_pkg; ''') - val actualNodes = dao.runnables() + val actualNodes = dao.runnables() Assert.assertEquals(16, actualNodes.size) val actual = new HashMap for (node : actualNodes) { From 33b0248bdca6d39e1f923c7aa271b5b01f98eb59 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 04:24:48 +0100 Subject: [PATCH 6/7] Fixes #54 - oddgen "Run test" view under "All Suitepaths": show package icon only for parents of test procedures bug --- .../org/utplsql/sqldev/dal/UtplsqlDao.xtend | 14 +++++-- .../org/utplsql/sqldev/tests/DalTest.xtend | 37 +++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend index 9153d374..941d3f85 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend @@ -388,6 +388,14 @@ class UtplsqlDao { SELECT object_owner, object_name, path AS suitepath, + count( + CASE + WHEN item_type = 'UT_TEST' THEN + 1 + ELSE + NULL + END + ) over (partition by object_owner, object_name) AS test_count, item_type, item_name, item_description @@ -451,10 +459,10 @@ class UtplsqlDao { object_owner || ':' || suitepath AS id, item_name AS name, item_description AS description, - CASE item_type - WHEN 'UT_SUITE' THEN + CASE + WHEN item_type = 'UT_SUITE' AND test_count > 0 THEN 'PACKAGE_ICON' - WHEN 'UT_TEST' THEN + WHEN item_type = 'UT_TEST' THEN 'PROCEDURE_ICON' ELSE 'FOLDER_ICON' diff --git a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend index 21e08e42..19699259 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend +++ b/sqldev/src/test/java/org/utplsql/sqldev/tests/DalTest.xtend @@ -472,6 +472,43 @@ class DalTest extends AbstractJdbcTest { } + @Test + def void issue54FolderIconForSuitesWithoutTests() { + setupAndTeardown + jdbcTemplate.execute(''' + CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS + -- %suite + + END junit_utplsql_test_pkg; + ''') + val dao = new UtplsqlDao(dataSource.connection) + val actualNodes = dao.runnables() + Assert.assertEquals(4, actualNodes.size) + val pkg = actualNodes.findFirst[it.id == "SCOTT:junit_utplsql_test_pkg"] + Assert.assertEquals("FOLDER_ICON", pkg.iconName) + jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg") + } + + @Test + def void issue54PackageIconForSuitesWithTests() { + setupAndTeardown + jdbcTemplate.execute(''' + CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS + -- %suite + + -- %test + PROCEDURE t1; + + END junit_utplsql_test_pkg; + ''') + val dao = new UtplsqlDao(dataSource.connection) + val actualNodes = dao.runnables() + Assert.assertEquals(6, actualNodes.size) + val pkg = actualNodes.findFirst[it.id == "SCOTT:junit_utplsql_test_pkg"] + Assert.assertEquals("PACKAGE_ICON", pkg.iconName) + jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg") + } + @Test def void issue55SuiteWithoutTests() { setupAndTeardown From bde7eacc35d51741082bed88849fa64dba966e68 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 04:26:14 +0100 Subject: [PATCH 7/7] release v0.7.1 --- sqldev/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 5d161e3c..c688b6e7 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -5,7 +5,7 @@ org.utplsql org.utplsql.sqldev - 0.7.1-SNAPSHOT + 0.7.1 bundle UTF-8