Skip to content

#102 Run tests with code coverage #105

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
PhilippSalvisberg merged 19 commits into from
May 30, 2020
Merged

#102 Run tests with code coverage #105

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8be0c92
add methods produceReportWithCoverage and getHtmlCoverage
PhilippSalvisberg May 30, 2020
9605a71
add test for produceReportWithCoverage
PhilippSalvisberg May 30, 2020
c18c484
execute setup and teardown per test
PhilippSalvisberg May 30, 2020
758872c
add null checks for parameters
PhilippSalvisberg May 30, 2020
55b8727
add public openInBrowser method
PhilippSalvisberg May 30, 2020
fd0d3df
reuse code coverage test setup with actual coverage result
PhilippSalvisberg May 30, 2020
5284796
add support to run tests with code coverage in one run
PhilippSalvisberg May 30, 2020
b1985e6
add test with code coverage
PhilippSalvisberg May 30, 2020
e280483
run code coverage via realtime reporter if possible
PhilippSalvisberg May 30, 2020
22610ee
no dedicated connection required anymore
PhilippSalvisberg May 30, 2020
e677de7
configure default fetch size of 100 (except for consumeReport)
PhilippSalvisberg May 30, 2020
667b5fc
add resources for code coverage (icon and tooltip text)
PhilippSalvisberg May 30, 2020
c2e7b12
calculate default schemas and provide getter; handle test env.
PhilippSalvisberg May 30, 2020
acfb60e
populate default value for schemas under test
PhilippSalvisberg May 30, 2020
6f5e7cb
test calcuation of default schemas under test
PhilippSalvisberg May 30, 2020
89565a4
add code coverage to toolbar of realtime reporter (all tests)
PhilippSalvisberg May 30, 2020
d589045
use list of schemas instead of top schema as default
PhilippSalvisberg May 30, 2020
84ffaeb
amend test based on new default logic
PhilippSalvisberg May 30, 2020
64cbad0
add code coverage context menu on overview table
PhilippSalvisberg May 30, 2020
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
Prev Previous commit
add code coverage context menu on overview table
  • Loading branch information
@PhilippSalvisberg
PhilippSalvisberg committed May 30, 2020
commit 64cbad0d75ee1372560785351c9357a65fa18be7
65 changes: 43 additions & 22 deletions sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public class RunnerPanel {
private JTable testOverviewTable;
private JMenuItem testOverviewRunMenuItem;
private JMenuItem testOverviewRunWorksheetMenuItem;
private JMenuItem testOverviewCodeCoverageMenuItem;
private JCheckBoxMenuItem showTestDescriptionCheckBoxMenuItem;
private JCheckBoxMenuItem showWarningIndicatorCheckBoxMenuItem;
private JCheckBoxMenuItem showInfoIndicatorCheckBoxMenuItem;
Expand Down Expand Up @@ -200,6 +201,7 @@ private void resetDerived() {
testOverviewTable.getRowSorter().setSortKeys(null);
testOverviewRunMenuItem.setEnabled(false);
testOverviewRunWorksheetMenuItem.setEnabled(false);
testOverviewCodeCoverageMenuItem.setEnabled(false);
testIdTextArea.setText(null);
testOwnerTextField.setText(null);
testPackageTextField.setText(null);
Expand Down Expand Up @@ -656,6 +658,42 @@ private JPanel makeLabelledCounterComponent(final JLabel label, final JComponent
groupPanel.setPreferredSize(dim);
return groupPanel;
}

private void runCodeCoverage(boolean selectedOnly) {
final Connection conn = DatabaseTools.getConnection(currentRun.getConnectionName());
final UtplsqlDao dao = new UtplsqlDao(conn);
final List<String> pathList = new ArrayList<>();
final HashSet<String> testPackages = new HashSet<>();
if (selectedOnly) {
// pathList and unique testPackages based on selected tests
for (final int rowIndex : testOverviewTable.getSelectedRows()) {
final int row = testOverviewTable.convertRowIndexToModel(rowIndex);
final Test test = testOverviewTableModel.getTest(row);
final String path = test.getOwnerName() + "." + test.getObjectName() + "." + test.getProcedureName();
pathList.add(path);
testPackages.add(test.getOwnerName() + "." + test.getObjectName());
}
} else {
// pathList and unique testPackages based on currentRun
pathList.addAll(currentRun.getPathList());
for (Test t : currentRun.getTests().values()) {
testPackages.add(t.getOwnerName() + "." + t.getObjectName());
}
}
// add dependencies of every test package (one DB call per test package)
final HashSet<String> includeObjects = new HashSet<>();
for (String testPackage : testPackages) {
String[] obj = testPackage.split("\\.");
includeObjects.addAll(dao.includes(obj[0], obj[1]));
}
// remove test packages
for (String testPackage : testPackages) {
includeObjects.remove(testPackage.toUpperCase());
}
final CodeCoverageReporter reporter = new CodeCoverageReporter(pathList,
includeObjects.stream().sorted().collect(Collectors.toList()), currentRun.getConnectionName());
reporter.showParameterWindow();
}

private void initializeGUI() {
// Base panel containing all components
Expand Down Expand Up @@ -696,28 +734,7 @@ private void initializeGUI() {
final ToolbarButton codeCoverageButton = new ToolbarButton(UtplsqlResources.getIcon("CODE_COVERAGE_ICON"));
codeCoverageButton.setToolTipText(UtplsqlResources.getString("RUNNER_CODE_COVERAGE_TOOLTIP"));
codeCoverageButton.setBorder(buttonBorder);
codeCoverageButton.addActionListener(event -> {
final Connection conn = DatabaseTools.getConnection(currentRun.getConnectionName());
final UtplsqlDao dao = new UtplsqlDao(conn);
final HashSet<String> testPackages = new HashSet<>();
// create unique list of all test packages
for (Test t : currentRun.getTests().values()) {
testPackages.add(t.getOwnerName() + "." + t.getObjectName());
}
// add dependencies of every test package
final HashSet<String> includeObjects = new HashSet<>();
for (String testPackage : testPackages) {
String[] obj = testPackage.split("\\.");
includeObjects.addAll(dao.includes(obj[0], obj[1]));
}
// remove test packages
for (String testPackage : testPackages) {
includeObjects.remove(testPackage.toUpperCase());
}
final CodeCoverageReporter reporter = new CodeCoverageReporter(currentRun.getPathList(),
includeObjects.stream().sorted().collect(Collectors.toList()), currentRun.getConnectionName());
reporter.showParameterWindow();
});
codeCoverageButton.addActionListener(event -> runCodeCoverage(false));
toolbar.add(codeCoverageButton);
toolbar.add(Box.createHorizontalGlue());
runComboBoxModel = new DefaultComboBoxModel<>();
Expand Down Expand Up @@ -908,6 +925,7 @@ private void initializeGUI() {
syncDetailTab();
testOverviewRunMenuItem.setEnabled(true);
testOverviewRunWorksheetMenuItem.setEnabled(true);
testOverviewCodeCoverageMenuItem.setEnabled(true);
}
});
testOverviewTable.addMouseListener(new MouseAdapter() {
Expand Down Expand Up @@ -976,6 +994,9 @@ public Component getTableCellRendererComponent(final JTable table, final Object
worksheet.runTestAsync();
});
testOverviewPopupMenu.add(testOverviewRunWorksheetMenuItem);
testOverviewCodeCoverageMenuItem = new JMenuItem(UtplsqlResources.getString("MENU_CODE_COVERAGE_LABEL"), UtplsqlResources.getIcon("CODE_COVERAGE_ICON"));
testOverviewCodeCoverageMenuItem.addActionListener(event -> runCodeCoverage(true));
testOverviewPopupMenu.add(testOverviewCodeCoverageMenuItem);
testOverviewPopupMenu.add(new JSeparator());
showSuccessfulTestsCheckBoxMenuItem = new JCheckBoxMenuItem(UtplsqlResources.getString("PREF_SHOW_SUCCESSFUL_TESTS_LABEL").replace("?", ""), true);
showSuccessfulTestsCheckBoxMenuItem.addActionListener(event -> {
Expand Down