Skip to content

Commit 9273e60

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
renamed testsuite to testId to match realtime reporter model
1 parent 9fcda69 commit 9273e60

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class RunnerPanel implements FocusListener, ActionListener {
9696
JTextField testPackageTextField
9797
JTextField testProcedureTextField
9898
JTextArea testDescriptionTextArea
99-
JTextArea suitePathTextArea
99+
JTextArea testIdTextArea
100100
JTextField testStartTextField
101101
FailuresTableModel failuresTableModel
102102
JTable failuresTable
@@ -120,7 +120,7 @@ class RunnerPanel implements FocusListener, ActionListener {
120120
testOverviewTable.rowSorter.sortKeys = null
121121
testOverviewRunMenuItem.enabled = false
122122
testOverviewRunWorksheetMenuItem.enabled = false
123-
suitePathTextArea.text = null
123+
testIdTextArea.text = null
124124
testOwnerTextField.text = null
125125
testPackageTextField.text = null
126126
testProcedureTextField.text = null
@@ -263,7 +263,7 @@ class RunnerPanel implements FocusListener, ActionListener {
263263
def synchronized update(String reporterId) {
264264
setCurrentRun(runs.get(reporterId))
265265
val row = currentRun.totalNumberOfCompletedTests - 1
266-
val header = testOverviewTableModel.suitepathColumnName
266+
val header = testOverviewTableModel.testIdColumnName
267267
val idColumn = testOverviewTable.columnModel.getColumn(3)
268268
if (idColumn.headerValue != header) {
269269
idColumn.headerValue = header
@@ -298,8 +298,8 @@ class RunnerPanel implements FocusListener, ActionListener {
298298
}
299299

300300
override void focusGained(FocusEvent e) {
301-
if (e.source == suitePathTextArea) {
302-
suitePathTextArea.caret.visible = true
301+
if (e.source == testIdTextArea) {
302+
testIdTextArea.caret.visible = true
303303
} else if (e.source == testDescriptionTextArea) {
304304
testDescriptionTextArea.caret.visible = true
305305
} else if (e.source == testFailureMessageTextArea) {
@@ -314,8 +314,8 @@ class RunnerPanel implements FocusListener, ActionListener {
314314
}
315315

316316
override focusLost(FocusEvent e) {
317-
if (e.source == suitePathTextArea) {
318-
suitePathTextArea.caret.visible = false
317+
if (e.source == testIdTextArea) {
318+
testIdTextArea.caret.visible = false
319319
} else if (e.source == testDescriptionTextArea) {
320320
testDescriptionTextArea.caret.visible = false
321321
} else if (e.source == testFailureMessageTextArea) {
@@ -435,11 +435,11 @@ class RunnerPanel implements FocusListener, ActionListener {
435435
if (rowIndex != -1) {
436436
val row = p.testOverviewTable.convertRowIndexToModel(rowIndex)
437437
val test = p.testOverviewTableModel.getTest(row)
438-
p.suitePathTextArea.text = test.id
439438
p.testOwnerTextField.text = test.ownerName
440439
p.testPackageTextField.text = test.objectName
441440
p.testProcedureTextField.text = test.procedureName
442441
p.testDescriptionTextArea.text = test.description?.trim
442+
p.testIdTextArea.text = test.id
443443
p.testStartTextField.text = formatDateTime(test.startTime)
444444
p.failuresTableModel.model = test.failedExpectations
445445
p.testFailureMessageTextArea.text = null
@@ -846,8 +846,8 @@ class RunnerPanel implements FocusListener, ActionListener {
846846
c.weightx = 1
847847
c.weighty = 0
848848
testInfoPanel.add(testDescriptionTextArea, c)
849-
// - Suitepath
850-
val suitePathLabel = new JLabel("Suitepath")
849+
// - Suitepath (id)
850+
val testIdLabel = new JLabel("Suitepath")
851851
c.gridx = 0
852852
c.gridy = 4
853853
c.gridwidth = 1
@@ -857,13 +857,13 @@ class RunnerPanel implements FocusListener, ActionListener {
857857
c.fill = GridBagConstraints::NONE
858858
c.weightx = 0
859859
c.weighty = 0
860-
testInfoPanel.add(suitePathLabel, c)
861-
suitePathTextArea = new JTextArea
862-
suitePathTextArea.editable = false
863-
suitePathTextArea.enabled = true
864-
suitePathTextArea.lineWrap = true
865-
suitePathTextArea.wrapStyleWord = false
866-
suitePathTextArea.addFocusListener(this)
860+
testInfoPanel.add(testIdLabel, c)
861+
testIdTextArea = new JTextArea
862+
testIdTextArea.editable = false
863+
testIdTextArea.enabled = true
864+
testIdTextArea.lineWrap = true
865+
testIdTextArea.wrapStyleWord = false
866+
testIdTextArea.addFocusListener(this)
867867
c.gridx = 1
868868
c.gridy = 4
869869
c.gridwidth = 1
@@ -873,7 +873,7 @@ class RunnerPanel implements FocusListener, ActionListener {
873873
c.fill = GridBagConstraints::HORIZONTAL
874874
c.weightx = 1
875875
c.weighty = 0
876-
testInfoPanel.add(suitePathTextArea, c)
876+
testInfoPanel.add(testIdTextArea, c)
877877
// - Start
878878
val testStartLabel = new JLabel("Start")
879879
c.gridx = 0

‎sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class TestOverviewTableModel extends DefaultTableModel {
4646
fireTableDataChanged()
4747
}
4848

49-
def getSuitepathColumnName() {
49+
def getTestIdColumnName() {
5050
calcCommonPrefix
5151
if (commonPrefix === null || commonPrefix == "") {
52-
return UtplsqlResources.getString("RUNNER_SUITEPATH")
52+
return UtplsqlResources.getString("RUNNER_TEST_ID")
5353
} else {
5454
commonPrefix
5555
}

‎sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ RUNNER_INITIALIZING_TEXT=Initializing...
7373
RUNNER_RUNNING_TEXT=Running tests...
7474
RUNNER_FINNISHED_TEXT=Finished after %.3f seconds.
7575
RUNNER_NO_TESTS_FOUND_TEXT=No tests found.
76-
RUNNER_SUITEPATH=Suitepath
76+
RUNNER_TEST_ID=Suitepath
7777
RUNNER_TEST_EXECUTION_TIME=Time [s]
7878
RUNNER_DESCRIPTION=Description

‎sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources_de.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ RUNNER_INITIALIZING_TEXT=Initialisierung...
5353
RUNNER_RUNNING_TEXT=Starte Tests...
5454
RUNNER_FINNISHED_TEXT=Beendet nach %.3f Sekunden.
5555
RUNNER_NO_TESTS_FOUND_TEXT=Keine Tests gefunden.
56-
RUNNER_SUITEPATH=Suitepath
56+
RUNNER_TEST_ID=Suitepath
5757
RUNNER_TEST_EXECUTION_TIME=Zeit [s]
5858
RUNNER_DESCRIPTION=Beschreibung

0 commit comments

Comments
 (0)