◐ Shell
reader mode source ↗
Skip to content
Merged

Feature/issue 143 - show disabledReason in realtime runner #151

Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
Binary file modified images/runner_model.png
View file Edit file Delete file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ private void populate(final Test test, final Node node) {
test.setObjectName(xmlTools.getElementValue(node, "objectName"));
test.setProcedureName(xmlTools.getElementValue(node, "procedureName"));
test.setDisabled("true".equals(xmlTools.getElementValue(node, "disabled")));
test.setName(xmlTools.getElementValue(node, "name"));
test.setDescription(xmlTools.getElementValue(node, "description"));
test.setTestNumber(Integer.valueOf(xmlTools.getElementValue(node, "testNumber")));
Expand Down
47 changes: 41 additions & 6 deletions sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public class RunnerPanel {
private RunnerTextField testPackageTextField;
private RunnerTextField testProcedureTextField;
private RunnerTextArea testDescriptionTextArea;
private RunnerTextArea testIdTextArea;
private RunnerTextField testStartTextField;
private FailuresTableModel failuresTableModel;
Expand Down Expand Up @@ -249,6 +250,7 @@ private void resetDerived() {
testPackageTextField.setText(null);
testProcedureTextField.setText(null);
testDescriptionTextArea.setText(null);
testStartTextField.setText(null);
failuresTableModel.setModel(null);
failuresTableModel.fireTableDataChanged();
Expand Down Expand Up @@ -1345,6 +1347,7 @@ private void initializeGUI() {
testPackageTextField.setText(test.getObjectName());
testProcedureTextField.setText(test.getProcedureName());
testDescriptionTextArea.setText(StringTools.trim(test.getDescription()));
testIdTextArea.setText(test.getId());
testStartTextField.setText(StringTools.formatDateTime(test.getStartTime()));
failuresTableModel.setModel(test.getFailedExpectations());
Expand Down Expand Up @@ -1445,11 +1448,12 @@ public Component getTableCellRendererComponent(final JTable table, final Object
if (test.getFailedExpectations() != null && !test.getFailedExpectations().isEmpty()) {
failuresTable.setRowSelectionInterval(0, 0);
}
} else {
failuresTableModel.setModel(null);
failuresTableModel.fireTableDataChanged();
testFailureMessageTextPane.setText(null);

}
testErrorStackTextPane.setText(getHtml(StringTools.trim(item.getErrorStack())));
testWarningsTextPane.setText(getHtml(StringTools.trim(item.getWarnings())));
Expand Down Expand Up @@ -1714,11 +1718,39 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
c.weightx = 1;
c.weighty = 0;
testInfoPanel.add(testDescriptionTextArea, c);
// - Suitepath (id)
final JLabel testIdLabel = new JLabel(UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN"));
testIdLabel.setBorder(BorderFactory.createEmptyBorder(isMacLookAndFeel() ? 5 : 3, 0, 0, 0));
c.gridx = 0;
c.gridy = 4;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(5, 10, 0, 0); // top, left, bottom, right
Expand All @@ -1733,7 +1765,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
testIdTextArea.setLineWrap(true);
testIdTextArea.setWrapStyleWord(false);
c.gridx = 1;
c.gridy = 4;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(5, 5, 0, 10); // top, left, bottom, right
Expand All @@ -1745,7 +1777,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
// - Start
final JLabel testStartLabel = new JLabel(UtplsqlResources.getString("RUNNER_START_LABEL"));
c.gridx = 0;
c.gridy = 5;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(5, 10, 10, 0); // top, left, bottom, right
Expand All @@ -1757,7 +1789,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
testStartTextField = new RunnerTextField();
testStartTextField.setEditable(false);
c.gridx = 1;
c.gridy = 5;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(5, 5, 10, 10); // top, left, bottom, right
Expand All @@ -1766,8 +1798,9 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
c.weightx = 1;
c.weighty = 0;
testInfoPanel.add(testStartTextField, c);
c.gridx = 0;
c.gridy = 6;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(0, 0, 0, 0); // top, left, bottom, right
Expand Down Expand Up @@ -1944,10 +1977,12 @@ public void mouseClicked(final MouseEvent e) {
BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(new Color(219, 219, 219)),
BorderFactory.createEmptyBorder(1, 1, 1, 1)));
testDescriptionTextArea.setBorder(border);
testIdTextArea.setBorder(border);
} else {
final Border referenceBorder = testOwnerTextField.getBorder();
testDescriptionTextArea.setBorder(referenceBorder);
testIdTextArea.setBorder(referenceBorder);
}
}
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -103,6 +103,7 @@ RUNNER_TESTS_LABEL=Tests
RUNNER_FAILURES_LABEL=Failures
RUNNER_ERRORS_LABEL=Errors
RUNNER_DISABLED_LABEL=Disabled
RUNNER_WARNINGS_LABEL=Warnings
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initializing...
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -71,6 +71,7 @@ RUNNER_TESTS_LABEL=Tests
RUNNER_FAILURES_LABEL=Fehlschl\u00e4ge
RUNNER_ERRORS_LABEL=Fehler
RUNNER_DISABLED_LABEL=Deaktiviert
RUNNER_WARNINGS_LABEL=Warnungen
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initialisierung...
Expand Down
Loading
Toggle all file notes Toggle all file annotations