Fixes #54 - oddgen "Run test" view under "All Suitepaths": show package icon only for parents of test procedures bug

Author: PhilippSalvisberg

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'

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