handle common prefix for when running single test

PhilippSalvisberg · PhilippSalvisberg · commit 7a6009471663 · 2019-06-11T12:05:53.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/PrefixTools.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/PrefixTools.xtend
@@ -15,6 +15,8 @@
  */
 package org.utplsql.sqldev.model
 
+import java.util.List
+
 // converted to Xtend based on Java code on https://www.geeksforgeeks.org/longest-common-prefix-using-binary-search/
 class PrefixTools {
 	def static int findMinLength(String[] arr, int n) {
@@ -61,4 +63,22 @@ class PrefixTools {
 		}
 		return prefix
 	}
+	
+	def static String commonPrefix(List<String> list) {
+		if (list.size === 0) {
+			return ""
+		} else if (list.size === 1) {
+			val pos = list.get(0).lastIndexOf(".");
+			if (pos > 0) {
+				return list.get(0).substring(0, pos + 1)
+			} else {
+				return ""
+			}
+		} else {
+			var String[] testArray = newArrayOfSize(list.size)
+			var prefix = commonPrefix(list.toArray(testArray), list.size)
+			return prefix
+		}
+	}
+	
 }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend
@@ -18,9 +18,9 @@
 import java.util.LinkedHashMap
 import javax.swing.Icon
 import javax.swing.table.DefaultTableModel
+import org.utplsql.sqldev.model.PrefixTools
 import org.utplsql.sqldev.model.runner.Test
 import org.utplsql.sqldev.resources.UtplsqlResources
-import org.utplsql.sqldev.model.PrefixTools
 
 class TestOverviewTableModel extends DefaultTableModel {
 	LinkedHashMap<String, Test> tests
@@ -61,8 +61,7 @@ class TestOverviewTableModel extends DefaultTableModel {
 			return null
 		}
 		if (commonPrefix === null) {
-			var String[] testArray = newArrayOfSize(tests.keySet.size)
-			commonPrefix = PrefixTools.commonPrefix(tests.keySet.toArray(testArray), tests.keySet.size)
+			commonPrefix = PrefixTools.commonPrefix(tests.keySet.toList)
 		}
 		switch (col) {
 			case 0: {
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.xtend
@@ -0,0 +1,28 @@
+package org.utplsql.sqldev.test
+
+import org.junit.Assert
+import org.junit.Test
+import org.utplsql.sqldev.model.PrefixTools
+
+class PrefixToolsTest {
+	@Test
+	def void two() {
+		val actual = PrefixTools.commonPrefix(#["junit.test.a", "junit.test.b"])
+		val expected = "junit.test."
+		Assert.assertEquals(expected, actual)
+	}
+
+	@Test
+	def void oneWithDot() {
+		val actual = PrefixTools.commonPrefix(#["junit.test.a"])
+		val expected = "junit.test."
+		Assert.assertEquals(expected, actual)
+	}
+
+	@Test
+	def void oneWithoutDot() {
+		val actual = PrefixTools.commonPrefix(#["junit-test-a"])
+		val expected = ""
+		Assert.assertEquals(expected, actual)
+	}
+}
