Skip to content

Improved test failure display on the ScalaTest View #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlegendi wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Improved test failure display on the ScalaTest View #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b1c0c0
Merged fix for output directories from rlegendi.
cheeseng Jun 15, 2012
b45c54a
Fixed 'Workspace is closed.' issue
rlegendi Jun 17, 2012
7ccdb2c
Removed all references to PowerMock
rlegendi Jun 17, 2012
4cbd063
Merge remote-tracking branch 'upstream/master'
rlegendi Aug 2, 2012
b7a1642
Fixed absolute classpath entry
rlegendi Aug 2, 2012
40041b6
Added the test failure message to the stack trace table
rlegendi Aug 3, 2012
dd2b332
Solved some merging issues
rlegendi Aug 3, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.scala-ide.sdt.scalatest/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/home/cheeseng/git/scalatest-eclipse-plugin/org.scala-ide.sdt.scalatest/target/lib/scalatest-finders_2.9.0-0.9.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="target/lib/scalatest-finders_2.9.0-0.9.2-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 1 addition & 1 deletion ...e.sdt.scalatest/src/scala/tools/eclipse/scalatest/launching/ScalaTestLaunchDelegate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,4 @@ class ScalaTestLaunchDelegate extends AbstractJavaLaunchConfigurationDelegate {
}
}.filter(_ != "").mkString(" ")
}
}
}
30 changes: 26 additions & 4 deletions org.scala-ide.sdt.scalatest/src/scala/tools/eclipse/scalatest/ui/ScalaTestStackTrace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,23 @@ class ScalaTestStackTrace(parent: Composite, fTestRunner: ScalaTestRunnerViewPar
}

def handleOpen(e: SelectionEvent) {
val selectedIdx = fTable.getSelectionIndex
if (selectedIdx >= 0) {
// Note that everything is shifted by one (since the proper error message, if any)
// AND it should be pointing to the same location as the 0th element on the list
val offset = node match {
case tm: TestModel => tm.errorMessage match {
case Some(_) => -1
case None => 0
}
case _ => 0
}

// Selection index might return -1 in some exceptional cases (e.g., widget disposed)
if (fTable.getSelectionIndex >= 0) {
// If we get the first (annotation) line selected, its index would be -1 without the max call
// But this way it will be correctly pointing to the same location where the test failed
val selectedIdx = math.max(fTable.getSelectionIndex + offset, 0)
fStackTraces match {
case Some(stackTraces) =>
case Some(stackTraces) =>
val foldedStackTraces = getFoldedStackTraces(stackTraces)
val stackTraceElement = foldedStackTraces(selectedIdx)
val model = JavaCore.create(ResourcesPlugin.getWorkspace.getRoot)
Expand Down Expand Up @@ -141,7 +154,16 @@ class ScalaTestStackTrace(parent: Composite, fTestRunner: ScalaTestRunnerViewPar
stackTraces match {
case Some(stackTraces) =>
val foldedStackTraces = getFoldedStackTraces(stackTraces)
val trace = foldedStackTraces.mkString("\n").trim
val testFailureMessage = node match {
case tm: TestModel => tm.errorMessage
case _ => None
}

val trace = (testFailureMessage match {
case Some(m) => m + "\n"
case None => ""
}) + foldedStackTraces.mkString("\n").trim

fTable.setRedraw(false)
fTable.removeAll()
new TextualTrace(trace, getFilterPatterns)
Expand Down