Skip to content

Commit 8341f40

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
add preferences "number of Runs in History", "show test "description?"
1 parent ceca779 commit 8341f40

File tree

5 files changed

+38
-0
lines changed

5 files changed

+38
-0
lines changed

‎sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ class PreferenceModel extends HashStructureAdapter {
3939
static final String KEY_CLEAR_SCREEN = "clearScreen"
4040
static final String KEY_AUTO_EXECUTE = "autoExecute"
4141
static final String KEY_CHECK_RUN_UTPLSQL_TEST = "checkRunUtplsqlTest"
42+
static final String KEY_NUMBER_OF_RUNS_IN_HISTORY = "numberOfRunsInHistory"
4243
static final String KEY_SHOW_DISABLED_COUNTER = "showDisabledCounter"
4344
static final String KEY_SHOW_WARNINGS_COUNTER = "showWarningsCounter"
4445
static final String KEY_SHOW_INFO_COUNTER = "showInfoCounter"
4546
static final String KEY_SHOW_WARNING_INDICATOR = "showWarningIndicator"
4647
static final String KEY_SHOW_INFO_INDICATOR = "showInfoIndicator"
48+
static final String KEY_SHOW_TEST_DESCRIPTION = "showTestDescription"
4749
static final String KEY_SYNC_DETAIL_TAB = "syncDetailTab"
4850
static final String KEY_TEST_PACKAGE_PREFIX = "testPackagePrefix"
4951
static final String KEY_TEST_PACKAGE_SUFFIX = "testPackageSuffix"
@@ -108,6 +110,14 @@ class PreferenceModel extends HashStructureAdapter {
108110
getHashStructure.putBoolean(PreferenceModel.KEY_CHECK_RUN_UTPLSQL_TEST, checkRunUtplsqlTest)
109111
}
110112

113+
def getNumberOfRunsInHistory() {
114+
return getHashStructure.getInt(PreferenceModel.KEY_NUMBER_OF_RUNS_IN_HISTORY, 10)
115+
}
116+
117+
def setNumberOfRunsInHistory(int runs) {
118+
getHashStructure.putInt(PreferenceModel.KEY_NUMBER_OF_RUNS_IN_HISTORY, runs)
119+
}
120+
111121
def isShowDisabledCounter() {
112122
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_DISABLED_COUNTER, false)
113123
}
@@ -148,6 +158,14 @@ class PreferenceModel extends HashStructureAdapter {
148158
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_INFO_INDICATOR, showInfoIndicator)
149159
}
150160

161+
def isShowTestDescription() {
162+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_TEST_DESCRIPTION, false)
163+
}
164+
165+
def setShowTestDescription(boolean showTestDescription) {
166+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_TEST_DESCRIPTION, showTestDescription)
167+
}
168+
151169
def isSyncDetailTab() {
152170
return getHashStructure.getBoolean(PreferenceModel.KEY_SYNC_DETAIL_TAB, true)
153171
}

‎sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.xtend‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ class PreferencePanel extends DefaultTraversablePanel {
4444
val JCheckBox autoExecuteCheckBox = new JCheckBox
4545
val JCheckBox checkRunUtplsqlTestCheckBox = new JCheckBox
4646
val JPanel realtimeReporterPanel = new JPanel
47+
val SpinnerNumberModel numberOfRunsInHistoryModel = new SpinnerNumberModel(10, 1, 100, 1);
48+
val JSpinner numberOfRunsInHistorySpinner = new JSpinner(numberOfRunsInHistoryModel);
4749
val JCheckBox showDisabledCounterCheckBox = new JCheckBox
4850
val JCheckBox showWarningsCounterCheckBox = new JCheckBox
4951
val JCheckBox showInfoCounterCheckBox = new JCheckBox
5052
val JCheckBox showWarningIndicatorCheckBox = new JCheckBox
5153
val JCheckBox showInfoIndicatorCheckBox = new JCheckBox
54+
val JCheckBox showTestDescriptionCheckBox = new JCheckBox
5255
val JCheckBox syncDetailTabCheckBox = new JCheckBox
5356
val JPanel generateTestPanel = new JPanel();
5457
val JTextField testPackagePrefixTextField = new JTextField
@@ -103,6 +106,10 @@ class PreferencePanel extends DefaultTraversablePanel {
103106
// realtime reporter group
104107
val FieldLayoutBuilder rrTab = new FieldLayoutBuilder(realtimeReporterPanel)
105108
rrTab.alignLabelsLeft = true
109+
110+
rrTab.add(
111+
runTab.field.label.withText(UtplsqlResources.getString("PREF_NUMBER_OF_RUNS_IN_HISTORY_LABEL")).component(
112+
numberOfRunsInHistorySpinner))
106113
rrTab.add(
107114
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_DISABLED_COUNTER_LABEL")).component(
108115
showDisabledCounterCheckBox))
@@ -118,6 +125,9 @@ class PreferencePanel extends DefaultTraversablePanel {
118125
rrTab.add(
119126
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_INFO_INDICATOR_LABEL")).component(
120127
showInfoIndicatorCheckBox))
128+
rrTab.add(
129+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_TEST_DESCRIPTION_LABEL")).component(
130+
showTestDescriptionCheckBox))
121131
rrTab.add(
122132
runTab.field.label.withText(UtplsqlResources.getString("PREF_SYNC_DETAIL_TAB_LABEL")).component(
123133
syncDetailTabCheckBox))
@@ -306,11 +316,13 @@ class PreferencePanel extends DefaultTraversablePanel {
306316
clearScreenCheckBox.selected = info.clearScreen
307317
autoExecuteCheckBox.selected = info.autoExecute
308318
checkRunUtplsqlTestCheckBox.selected = info.checkRunUtplsqlTest
319+
numberOfTestsPerUnitSpinner.value = info.numberOfRunsInHistory
309320
showDisabledCounterCheckBox.selected = info.showDisabledCounter
310321
showWarningsCounterCheckBox.selected = info.showWarningsCounter
311322
showInfoCounterCheckBox.selected = info.showInfoCounter
312323
showWarningIndicatorCheckBox.selected = info.showWarningIndicator
313324
showInfoIndicatorCheckBox.selected = info.showInfoIndicator
325+
showTestDescriptionCheckBox.selected = info.showTestDescription
314326
syncDetailTabCheckBox.selected = info.syncDetailTab
315327
testPackagePrefixTextField.text = info.testPackagePrefix
316328
testPackageSuffixTextField.text = info.testPackageSuffix
@@ -337,12 +349,14 @@ class PreferencePanel extends DefaultTraversablePanel {
337349
info.resetPackage = resetPackageCheckBox.selected
338350
info.clearScreen = clearScreenCheckBox.selected
339351
info.autoExecute = autoExecuteCheckBox.selected
352+
info.numberOfRunsInHistory = numberOfTestsPerUnitSpinner.value as Integer
340353
info.checkRunUtplsqlTest = checkRunUtplsqlTestCheckBox.selected
341354
info.showDisabledCounter = showDisabledCounterCheckBox.selected
342355
info.showWarningsCounter = showWarningsCounterCheckBox.selected
343356
info.showInfoCounter = showInfoCounterCheckBox.selected
344357
info.showWarningIndicator = showWarningIndicatorCheckBox.selected
345358
info.showInfoIndicator = showInfoIndicatorCheckBox.selected
359+
info.showTestDescription = showTestDescriptionCheckBox.selected
346360
info.syncDetailTab = syncDetailTabCheckBox.selected
347361
info.testPackagePrefix = testPackagePrefixTextField.text
348362
info.testPackageSuffix = testPackageSuffixTextField.text

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ PREF_CLEAR_SCREEN_LABEL=Clear script output panel before running utPLSQL?
3232
PREF_AUTO_EXECUTE_LABEL=Execute unit test automatically?
3333
PREF_CHECK_RUN_UTPLSQL_TEST_LABEL=Check availability of menu option?
3434
MENU_REALTIME_REPORTER_LABEL=Realtime Reporter
35+
PREF_NUMBER_OF_RUNS_IN_HISTORY_LABEL=Number of runs in history
3536
PREF_SHOW_DISABLED_COUNTER_LABEL=Show disabled counter?
3637
PREF_SHOW_WARNINGS_COUNTER_LABEL=Show warnings counter?
3738
PREF_SHOW_INFO_COUNTER_LABEL=Show info counter?
3839
PREF_SHOW_WARNING_INDICATOR_LABEL=Show warning indicator?
3940
PREF_SHOW_INFO_INDICATOR_LABEL=Show info indicator?
41+
PREF_SHOW_TEST_DESCRIPTION_LABEL=Show test description (if possible)?
4042
PREF_SYNC_DETAIL_TAB_LABEL=Synchronize detail tab based on test status?
4143
PREF_TEST_PACKAGE_PREFIX_LABEL=Test package prefix
4244
PREF_TEST_PACKAGE_SUFFIX_LABEL=Test package suffix

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ PREF_CLEAR_SCREEN_LABEL=Skriptausgabe-Fenster vor der Ausf
99
PREF_AUTO_EXECUTE_LABEL=Unit Test automatisch ausführen?
1010
PREF_CHECK_RUN_UTPLSQL_TEST_LABEL=Verfügbarkeit der Menüoption prüfen?
1111
MENU_REALTIME_REPORTER_LABEL=Realtime Reporter
12+
PREF_NUMBER_OF_RUNS_IN_HISTORY_LABEL=Anzahl Ausführungen in der Historie
1213
PREF_SHOW_DISABLED_COUNTER_LABEL=Deaktiviert-Zähler anzeigen?
1314
PREF_SHOW_WARNINGS_COUNTER_LABEL=Warnungen-Zähler anzeigen?
1415
PREF_SHOW_INFO_COUNTER_LABEL=Info-Zähler anzeigen?
1516
PREF_SHOW_WARNING_INDICATOR_LABEL=Warnung-Indikator anzeigen?
1617
PREF_SHOW_INFO_INDICATOR_LABEL=Info-Indikator anzeigen?
18+
PREF_SHOW_TEST_DESCRIPTION_LABEL=Test Beschreibung anzeigen (falls möglich)?
1719
PREF_SYNC_DETAIL_TAB_LABEL=Detailansicht basierend auf dem Teststatus synchronisieren?
1820
PREF_TEST_PACKAGE_PREFIX_LABEL=Test Package Präfix
1921
PREF_TEST_PACKAGE_SUFFIX_LABEL=Test Package Suffix

‎sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.xtend‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ class PreferenceModelTest {
3030
Assert.assertFalse(model.clearScreen)
3131
Assert.assertTrue(model.autoExecute)
3232
Assert.assertFalse(model.checkRunUtplsqlTest)
33+
Assert.assertEquals(model.numberOfRunsInHistory, 10)
3334
Assert.assertFalse(model.showDisabledCounter)
3435
Assert.assertFalse(model.showWarningsCounter)
3536
Assert.assertFalse(model.showInfoCounter)
3637
Assert.assertFalse(model.showWarningIndicator)
3738
Assert.assertFalse(model.showInfoIndicator)
39+
Assert.assertFalse(model.isShowTestDescription)
3840
Assert.assertTrue(model.syncDetailTab)
3941
Assert.assertEquals("test_", model.testPackagePrefix)
4042
Assert.assertEquals("", model.testPackageSuffix)

0 commit comments

Comments
 (0)