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

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
PhilippSalvisberg merged 10 commits intomainfromfeature/issue-143-disabled-reason
Feb 26, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
10 commits
Select commitHold shift + click to select a range
b033649
add reason to disabled annotation in snippets based on #143
PhilippSalvisbergFeb 26, 2022
bc740dd
terminate sentence in snippet description with period
PhilippSalvisbergFeb 26, 2022
60b47c6
updated snippets according utPLSQL 3.1.12 docs
PhilippSalvisbergFeb 26, 2022
06833c7
update test to include disabledReason based on #143
PhilippSalvisbergFeb 26, 2022
7d74977
add RUNNER_DISABLED_REASON_LABEL to resource bundle
PhilippSalvisbergFeb 26, 2022
405972e
add disabledReason to Test according #143
PhilippSalvisbergFeb 26, 2022
78934b1
populate disabledReason when reading test from DB #143
PhilippSalvisbergFeb 26, 2022
ab87be3
extend model by disabledReason in Test
PhilippSalvisbergFeb 26, 2022
3ac894e
show disabledReason in test runner according #143
PhilippSalvisbergFeb 26, 2022
20e442f
add .vscode in .gitignore
PhilippSalvisbergFeb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,6 @@
# Log file
*.log



# Package Files
*.jar
*.war
Expand All@@ -31,6 +29,7 @@ hs_err_pid*
.project
.classpath
**/.settings
.vscode

# IntelliJ
**/.idea
Expand Down
Binary file modifiedimages/runner_model.png
View 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.
View file
Open in desktop
Original file line numberDiff line numberDiff 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.setDisabledReason(xmlTools.getElementValue(node, "disabledReason"));
test.setName(xmlTools.getElementValue(node, "name"));
test.setDescription(xmlTools.getElementValue(node, "description"));
test.setTestNumber(Integer.valueOf(xmlTools.getElementValue(node, "testNumber")));
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ public class Test extends Item {
private String objectName;
private String procedureName;
private Boolean disabled;
private String disabledReason;
private Integer testNumber;
private List<Expectation> failedExpectations;

Expand DownExpand Up@@ -53,6 +54,7 @@ public String toString() {
.append("objectName", objectName)
.append("procedureName", procedureName)
.append("disabled", disabled)
.append("disabledReason", disabledReason)
.append("testNumber", testNumber)
.append("failedExpectations", failedExpectations)
.toString();
Expand DownExpand Up@@ -98,6 +100,14 @@ public void setDisabled(final Boolean disabled) {
this.disabled = disabled;
}

public String getDisabledReason() {
return disabledReason;
}

public void setDisabledReason(final String disabledReason) {
this.disabledReason = disabledReason;
}

public Integer getTestNumber() {
return testNumber;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,6 +142,7 @@ public class RunnerPanel {
private RunnerTextField testPackageTextField;
private RunnerTextField testProcedureTextField;
private RunnerTextArea testDescriptionTextArea;
private RunnerTextArea testDisabledReasonTextArea;
private RunnerTextArea testIdTextArea;
private RunnerTextField testStartTextField;
private FailuresTableModel failuresTableModel;
Expand DownExpand Up@@ -249,6 +250,7 @@ private void resetDerived() {
testPackageTextField.setText(null);
testProcedureTextField.setText(null);
testDescriptionTextArea.setText(null);
testDisabledReasonTextArea.setText(null);
testStartTextField.setText(null);
failuresTableModel.setModel(null);
failuresTableModel.fireTableDataChanged();
Expand DownExpand Up@@ -1345,6 +1347,7 @@ private void initializeGUI() {
testPackageTextField.setText(test.getObjectName());
testProcedureTextField.setText(test.getProcedureName());
testDescriptionTextArea.setText(StringTools.trim(test.getDescription()));
testDisabledReasonTextArea.setText(StringTools.trim(test.getDisabledReason()));
testIdTextArea.setText(test.getId());
testStartTextField.setText(StringTools.formatDateTime(test.getStartTime()));
failuresTableModel.setModel(test.getFailedExpectations());
Expand DownExpand Up@@ -1445,11 +1448,12 @@ public Component getTableCellRendererComponent(final JTable table, final Object
if (test.getFailedExpectations() != null && !test.getFailedExpectations().isEmpty()) {
failuresTable.setRowSelectionInterval(0, 0);
}
testDisabledReasonTextArea.setText(test.getDisabledReason());
} else {
failuresTableModel.setModel(null);
failuresTableModel.fireTableDataChanged();
testFailureMessageTextPane.setText(null);

testDisabledReasonTextArea.setText(null);
}
testErrorStackTextPane.setText(getHtml(StringTools.trim(item.getErrorStack())));
testWarningsTextPane.setText(getHtml(StringTools.trim(item.getWarnings())));
Expand DownExpand Up@@ -1714,11 +1718,39 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
c.weightx = 1;
c.weighty = 0;
testInfoPanel.add(testDescriptionTextArea, c);
// - Disabled Reason
final JLabel testDisabledReasonLabel = new JLabel(UtplsqlResources.getString("RUNNER_DISABLED_REASON_LABEL"));
testDisabledReasonLabel.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
c.anchor = GridBagConstraints.NORTHWEST;
c.fill = GridBagConstraints.NONE;
c.weightx = 0;
c.weighty = 0;
testInfoPanel.add(testDisabledReasonLabel, c);
testDisabledReasonTextArea = new RunnerTextArea();
testDisabledReasonTextArea.setEditable(false);
testDisabledReasonTextArea.setEnabled(true);
testDisabledReasonTextArea.setLineWrap(true);
testDisabledReasonTextArea.setWrapStyleWord(true);
c.gridx = 1;
c.gridy = 4;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(5, 5, 0, 10); // top, left, bottom, right
c.anchor = GridBagConstraints.WEST;
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1;
c.weighty = 0;
testInfoPanel.add(testDisabledReasonTextArea, 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.gridy =5;
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.gridy =5;
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.gridy =6;
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.gridy =6;
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);
// - Vertical filler
c.gridx = 0;
c.gridy =6;
c.gridy =7;
c.gridwidth = 1;
c.gridheight = 1;
c.insets = new Insets(0, 0, 0, 0); // top, left, bottom, right
Expand DownExpand 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);
testDisabledReasonTextArea.setBorder(border);
testIdTextArea.setBorder(border);
} else {
final Border referenceBorder = testOwnerTextField.getBorder();
testDescriptionTextArea.setBorder(referenceBorder);
testDisabledReasonTextArea.setBorder(referenceBorder);
testIdTextArea.setBorder(referenceBorder);
}
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff 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_DISABLED_REASON_LABEL=Disabled Reason
RUNNER_WARNINGS_LABEL=Warnings
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initializing...
Expand Down
Original file line numberDiff line numberDiff 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_DISABLED_REASON_LABEL=Deaktivierungsgrund
RUNNER_WARNINGS_LABEL=Warnungen
RUNNER_INFO_LABEL=Info
RUNNER_INITIALIZING_TEXT=Initialisierung...
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp