add shortFailureText to be use

PhilippSalvisberg · PhilippSalvisberg · commit f4fe2515f8f3 · 2019-06-19T09:00:25.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.xtend
@@ -15,6 +15,7 @@
  */
 package org.utplsql.sqldev.model.runner
 
+import java.util.regex.Pattern
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.utplsql.sqldev.model.AbstractModel
 
@@ -30,4 +31,18 @@ class Expectation extends AbstractModel {
 			«caller.trim»
 		'''.toString.trim
 	}
+	
+	def getShortFailureText() {
+		return '''«IF description !== null»«description» (line «callerLine»)«ELSE»Line «callerLine»«ENDIF»'''.toString
+	}
+	
+	def getCallerLine() {
+		var Integer line = null
+		val p = Pattern.compile("(?i)\"[^\\\"]+\",\\s+line\\s*([0-9]+)")
+		val m = p.matcher(caller)
+		if (m.find) {
+			line = Integer.valueOf(m.group(1))
+		}
+		return line
+	}
 }
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.xtend
@@ -0,0 +1,46 @@
+package org.utplsql.sqldev.test.runner
+
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.utplsql.sqldev.model.runner.Expectation
+
+class ExpectationTest {
+	var Expectation exceptionWithDescription
+	var Expectation exceptionWithoutDescription
+	
+	@Before
+	def void setup() {
+		exceptionWithDescription = new Expectation
+		exceptionWithDescription.description = '''This assert must fail'''
+		exceptionWithDescription.message = '''at: 1 (number) was expected to equal: 2 (number)'''
+		exceptionWithDescription.caller  = '''"SCOTT.JUNIT_UTPLSQL_TEST1_PKG.TEST_2_NOK", line 14 ut.expect(1, 'This assert must fail').to_equal(2);'''
+		exceptionWithoutDescription = new Expectation
+		exceptionWithoutDescription.message = exceptionWithDescription.message
+		exceptionWithoutDescription.caller = exceptionWithDescription.caller
+		exceptionWithoutDescription.message = '''at: 1 (number) was expected to equal: 2 (number)'''
+		exceptionWithoutDescription.caller  = '''"SCOTT.JUNIT_UTPLSQL_TEST1_PKG.TEST_3_NOK", line 42 ut.expect(1).to_equal(2);'''
+	}
+	
+	@Test
+	def void failedExpectationCallerLine() {
+		val actual = exceptionWithDescription.callerLine
+		val expected = new Integer(14)
+		Assert.assertEquals(expected, actual)
+	}
+
+	@Test
+	def void shortFailureTextWithDescription() {
+		val actual = exceptionWithDescription.shortFailureText
+		val expected = 'This assert must fail (line 14)'
+		Assert.assertEquals(expected, actual)
+	}
+
+	@Test
+	def void shortFailureTextWithoutDescription() {
+		val actual = exceptionWithoutDescription.shortFailureText
+		val expected = 'Line 42'
+		Assert.assertEquals(expected, actual)
+	}
+
+}
