Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdd4dd0e

Browse files
Merge pull request#151 from utPLSQL/feature/issue-143-disabled-reason
Feature/issue 143 - show disabledReason in realtime runner
2 parents4ab843f +20e442f commitdd4dd0e

File tree

9 files changed

+111
-47
lines changed

9 files changed

+111
-47
lines changed

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
# Log file
55
*.log
66

7-
8-
97
# Package Files
108
*.jar
119
*.war
@@ -31,6 +29,7 @@ hs_err_pid*
3129
.project
3230
.classpath
3331
**/.settings
32+
.vscode
3433

3534
# IntelliJ
3635
**/.idea

‎images/runner_model.png

-29.4 KB
Loading

‎sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ private void populate(final Test test, final Node node) {
355355
test.setObjectName(xmlTools.getElementValue(node,"objectName"));
356356
test.setProcedureName(xmlTools.getElementValue(node,"procedureName"));
357357
test.setDisabled("true".equals(xmlTools.getElementValue(node,"disabled")));
358+
test.setDisabledReason(xmlTools.getElementValue(node,"disabledReason"));
358359
test.setName(xmlTools.getElementValue(node,"name"));
359360
test.setDescription(xmlTools.getElementValue(node,"description"));
360361
test.setTestNumber(Integer.valueOf(xmlTools.getElementValue(node,"testNumber")));

‎sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class Test extends Item {
2626
privateStringobjectName;
2727
privateStringprocedureName;
2828
privateBooleandisabled;
29+
privateStringdisabledReason;
2930
privateIntegertestNumber;
3031
privateList<Expectation>failedExpectations;
3132

@@ -53,6 +54,7 @@ public String toString() {
5354
.append("objectName",objectName)
5455
.append("procedureName",procedureName)
5556
.append("disabled",disabled)
57+
.append("disabledReason",disabledReason)
5658
.append("testNumber",testNumber)
5759
.append("failedExpectations",failedExpectations)
5860
.toString();
@@ -98,6 +100,14 @@ public void setDisabled(final Boolean disabled) {
98100
this.disabled =disabled;
99101
}
100102

103+
publicStringgetDisabledReason() {
104+
returndisabledReason;
105+
}
106+
107+
publicvoidsetDisabledReason(finalStringdisabledReason) {
108+
this.disabledReason =disabledReason;
109+
}
110+
101111
publicIntegergetTestNumber() {
102112
returntestNumber;
103113
}

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

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public class RunnerPanel {
142142
privateRunnerTextFieldtestPackageTextField;
143143
privateRunnerTextFieldtestProcedureTextField;
144144
privateRunnerTextAreatestDescriptionTextArea;
145+
privateRunnerTextAreatestDisabledReasonTextArea;
145146
privateRunnerTextAreatestIdTextArea;
146147
privateRunnerTextFieldtestStartTextField;
147148
privateFailuresTableModelfailuresTableModel;
@@ -249,6 +250,7 @@ private void resetDerived() {
249250
testPackageTextField.setText(null);
250251
testProcedureTextField.setText(null);
251252
testDescriptionTextArea.setText(null);
253+
testDisabledReasonTextArea.setText(null);
252254
testStartTextField.setText(null);
253255
failuresTableModel.setModel(null);
254256
failuresTableModel.fireTableDataChanged();
@@ -1345,6 +1347,7 @@ private void initializeGUI() {
13451347
testPackageTextField.setText(test.getObjectName());
13461348
testProcedureTextField.setText(test.getProcedureName());
13471349
testDescriptionTextArea.setText(StringTools.trim(test.getDescription()));
1350+
testDisabledReasonTextArea.setText(StringTools.trim(test.getDisabledReason()));
13481351
testIdTextArea.setText(test.getId());
13491352
testStartTextField.setText(StringTools.formatDateTime(test.getStartTime()));
13501353
failuresTableModel.setModel(test.getFailedExpectations());
@@ -1445,11 +1448,12 @@ public Component getTableCellRendererComponent(final JTable table, final Object
14451448
if (test.getFailedExpectations() !=null && !test.getFailedExpectations().isEmpty()) {
14461449
failuresTable.setRowSelectionInterval(0,0);
14471450
}
1451+
testDisabledReasonTextArea.setText(test.getDisabledReason());
14481452
}else {
14491453
failuresTableModel.setModel(null);
14501454
failuresTableModel.fireTableDataChanged();
14511455
testFailureMessageTextPane.setText(null);
1452-
1456+
testDisabledReasonTextArea.setText(null);
14531457
}
14541458
testErrorStackTextPane.setText(getHtml(StringTools.trim(item.getErrorStack())));
14551459
testWarningsTextPane.setText(getHtml(StringTools.trim(item.getWarnings())));
@@ -1714,11 +1718,39 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
17141718
c.weightx =1;
17151719
c.weighty =0;
17161720
testInfoPanel.add(testDescriptionTextArea,c);
1721+
// - Disabled Reason
1722+
finalJLabeltestDisabledReasonLabel =newJLabel(UtplsqlResources.getString("RUNNER_DISABLED_REASON_LABEL"));
1723+
testDisabledReasonLabel.setBorder(BorderFactory.createEmptyBorder(isMacLookAndFeel() ?5 :3,0,0,0));
1724+
c.gridx =0;
1725+
c.gridy =4;
1726+
c.gridwidth =1;
1727+
c.gridheight =1;
1728+
c.insets =newInsets(5,10,0,0);// top, left, bottom, right
1729+
c.anchor =GridBagConstraints.NORTHWEST;
1730+
c.fill =GridBagConstraints.NONE;
1731+
c.weightx =0;
1732+
c.weighty =0;
1733+
testInfoPanel.add(testDisabledReasonLabel,c);
1734+
testDisabledReasonTextArea =newRunnerTextArea();
1735+
testDisabledReasonTextArea.setEditable(false);
1736+
testDisabledReasonTextArea.setEnabled(true);
1737+
testDisabledReasonTextArea.setLineWrap(true);
1738+
testDisabledReasonTextArea.setWrapStyleWord(true);
1739+
c.gridx =1;
1740+
c.gridy =4;
1741+
c.gridwidth =1;
1742+
c.gridheight =1;
1743+
c.insets =newInsets(5,5,0,10);// top, left, bottom, right
1744+
c.anchor =GridBagConstraints.WEST;
1745+
c.fill =GridBagConstraints.HORIZONTAL;
1746+
c.weightx =1;
1747+
c.weighty =0;
1748+
testInfoPanel.add(testDisabledReasonTextArea,c);
17171749
// - Suitepath (id)
17181750
finalJLabeltestIdLabel =newJLabel(UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN"));
17191751
testIdLabel.setBorder(BorderFactory.createEmptyBorder(isMacLookAndFeel() ?5 :3,0,0,0));
17201752
c.gridx =0;
1721-
c.gridy =4;
1753+
c.gridy =5;
17221754
c.gridwidth =1;
17231755
c.gridheight =1;
17241756
c.insets =newInsets(5,10,0,0);// top, left, bottom, right
@@ -1733,7 +1765,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
17331765
testIdTextArea.setLineWrap(true);
17341766
testIdTextArea.setWrapStyleWord(false);
17351767
c.gridx =1;
1736-
c.gridy =4;
1768+
c.gridy =5;
17371769
c.gridwidth =1;
17381770
c.gridheight =1;
17391771
c.insets =newInsets(5,5,0,10);// top, left, bottom, right
@@ -1745,7 +1777,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
17451777
// - Start
17461778
finalJLabeltestStartLabel =newJLabel(UtplsqlResources.getString("RUNNER_START_LABEL"));
17471779
c.gridx =0;
1748-
c.gridy =5;
1780+
c.gridy =6;
17491781
c.gridwidth =1;
17501782
c.gridheight =1;
17511783
c.insets =newInsets(5,10,10,0);// top, left, bottom, right
@@ -1757,7 +1789,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
17571789
testStartTextField =newRunnerTextField();
17581790
testStartTextField.setEditable(false);
17591791
c.gridx =1;
1760-
c.gridy =5;
1792+
c.gridy =6;
17611793
c.gridwidth =1;
17621794
c.gridheight =1;
17631795
c.insets =newInsets(5,5,10,10);// top, left, bottom, right
@@ -1766,8 +1798,9 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
17661798
c.weightx =1;
17671799
c.weighty =0;
17681800
testInfoPanel.add(testStartTextField,c);
1801+
// - Vertical filler
17691802
c.gridx =0;
1770-
c.gridy =6;
1803+
c.gridy =7;
17711804
c.gridwidth =1;
17721805
c.gridheight =1;
17731806
c.insets =newInsets(0,0,0,0);// top, left, bottom, right
@@ -1944,10 +1977,12 @@ public void mouseClicked(final MouseEvent e) {
19441977
BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(newColor(219,219,219)),
19451978
BorderFactory.createEmptyBorder(1,1,1,1)));
19461979
testDescriptionTextArea.setBorder(border);
1980+
testDisabledReasonTextArea.setBorder(border);
19471981
testIdTextArea.setBorder(border);
19481982
}else {
19491983
finalBorderreferenceBorder =testOwnerTextField.getBorder();
19501984
testDescriptionTextArea.setBorder(referenceBorder);
1985+
testDisabledReasonTextArea.setBorder(referenceBorder);
19511986
testIdTextArea.setBorder(referenceBorder);
19521987
}
19531988
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ RUNNER_TESTS_LABEL=Tests
103103
RUNNER_FAILURES_LABEL=Failures
104104
RUNNER_ERRORS_LABEL=Errors
105105
RUNNER_DISABLED_LABEL=Disabled
106+
RUNNER_DISABLED_REASON_LABEL=Disabled Reason
106107
RUNNER_WARNINGS_LABEL=Warnings
107108
RUNNER_INFO_LABEL=Info
108109
RUNNER_INITIALIZING_TEXT=Initializing...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUNNER_TESTS_LABEL=Tests
7171
RUNNER_FAILURES_LABEL=Fehlschl\u00e4ge
7272
RUNNER_ERRORS_LABEL=Fehler
7373
RUNNER_DISABLED_LABEL=Deaktiviert
74+
RUNNER_DISABLED_REASON_LABEL=Deaktivierungsgrund
7475
RUNNER_WARNINGS_LABEL=Warnungen
7576
RUNNER_INFO_LABEL=Info
7677
RUNNER_INITIALIZING_TEXT=Initialisierung...

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp