◐ Shell
reader mode source ↗
Skip to content
Merged

#66 - Show overall elapsed time during test run #79

Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
6 changes: 6 additions & 0 deletions sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class Run extends AbstractModel {
String serverOutput
LinkedHashMap<String, Test> tests
String status

new(String reporterId, String connectionName, List<String> pathList) {
this.reporterId = reporterId
@@ -46,6 +47,11 @@ class Run extends AbstractModel {
this.tests = new LinkedHashMap<String, Test>
}

def getName() {
val time = startTime.substring(11,19)
val conn = connectionName?.substring(15)
Expand Down
6 changes: 4 additions & 2 deletions sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.xtend
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
run.executionTime = event.executionTime
run.errorStack = event.errorStack
run.serverOutput = event.serverOutput
run.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), event.executionTime)
panel.update(reporterId)
}

Expand Down Expand Up @@ -182,7 +182,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
} else {
test.startTime = sysdate
}
run.status = event.id
run.currentTestNumber = event.testNumber
run.currentTest = test
panel.update(reporterId)
Expand Down Expand Up @@ -241,6 +241,8 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
}
if (run.totalNumberOfTests < 0) {
run.status = UtplsqlResources.getString("RUNNER_NO_TESTS_FOUND_TEXT")
run.totalNumberOfTests = 0
panel.update(reporterId)
}
Expand Down
44 changes: 39 additions & 5 deletions sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ import javax.swing.JTabbedPane
import javax.swing.JTable
import javax.swing.RepaintManager
import javax.swing.SwingConstants
import javax.swing.UIManager
import javax.swing.border.EmptyBorder
import javax.swing.event.HyperlinkEvent
Expand Down Expand Up @@ -85,6 +86,8 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
ToolbarButton clearButton
JComboBox<ComboBoxItem<String, String>> runComboBox
JLabel statusLabel
JLabel testCounterValueLabel
JLabel errorCounterValueLabel
JLabel failureCounterValueLabel
Expand Down Expand Up @@ -360,6 +363,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
resetDerived
val item = new ComboBoxItem<String, String>(currentRun.reporterId, currentRun.name)
runComboBox.selectedItem = item
}
}

Expand Down Expand Up @@ -765,7 +769,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
toolbar.add(clearButton)
c.gridx = 0
c.gridy = 0
c.gridwidth = 1
c.gridheight = 1
c.insets = new Insets(0, 0, 0, 0) // top, left, bottom, right
c.anchor = GridBagConstraints::NORTH
Expand All @@ -780,12 +784,42 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
c.gridy = 1
c.gridwidth = 1
c.gridheight = 1
c.insets = new Insets(10, 10, 10, 10) // top, left, bottom, right
c.anchor = GridBagConstraints::WEST
c.fill = GridBagConstraints::HORIZONTAL
c.weightx = 1
c.weighty = 0
basePanel.add(statusLabel, c)

// Counters
// - Test counter
Expand Down Expand Up @@ -822,7 +856,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
// - add everything to basePanel
c.gridx = 0
c.gridy = 2
c.gridwidth = 1
c.gridheight = 1
c.insets = new Insets(5, 0, 5, 0) // top, left, bottom, right
c.anchor = GridBagConstraints::WEST
Expand Down @@ -854,7 +888,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
progressBar.UI = new BasicProgressBarUI
c.gridx = 0
c.gridy = 3
c.gridwidth = 1
c.gridheight = 1
c.insets = new Insets(10, 10, 10, 10) // top, left, bottom, right
c.anchor = GridBagConstraints::WEST
Expand Down Expand Up @@ -1206,7 +1240,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
horizontalSplitPane.resizeWeight = 0.5
c.gridx = 0
c.gridy = 4
c.gridwidth = 1
c.gridheight = 1
c.insets = new Insets(10, 10, 10, 10) // top, left, bottom, right
c.anchor = GridBagConstraints::WEST
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/ui/runner/SmartTime.xtend
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SmartTime {
this.smart = smart
}

def setMillis(Double seconds) {
this.seconds = seconds
}

Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources.properties
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RUNNER_WARNINGS_LABEL=Warnings
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initializing...
RUNNER_RUNNING_TEXT=Running tests...
RUNNER_FINNISHED_TEXT=Finished after %.3f seconds.
RUNNER_NO_TESTS_FOUND_TEXT=No tests found.
RUNNER_RUN_MENUITEM=Run test
RUNNER_RUN_WORKSHEET_MENUITEM=Run test in new worksheet
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources_de.properties
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUNNER_WARNINGS_LABEL=Warnungen
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initialisierung...
RUNNER_RUNNING_TEXT=Starte Tests...
RUNNER_FINNISHED_TEXT=Beendet nach %.3f Sekunden.
RUNNER_NO_TESTS_FOUND_TEXT=Keine Tests gefunden.
RUNNER_RUN_MENUITEM=Run testTest ausf�hren
RUNNER_RUN_WORKSHEET_MENUITEM=Test in neuem Arbeitsblatt ausf�hruen
Expand Down
3 changes: 2 additions & 1 deletion sqldev/src/test/java/org/utplsql/sqldev/test/runner/UtplsqlRunnerPanelTest.xtend
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ class UtplsqlRunnerPanelTest {
run.counter.success = run.counter.success + 1
run.status="utplsql.test.e"
val end = System.currentTimeMillis
run.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), new Double(end-start)/1000)
panel.update(run.reporterId)
Thread.sleep(2000);
frame.dispose
Expand Down
Toggle all file notes Toggle all file annotations