Skip to content
Merged
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
Next Next commit
run code coverage via realtime reporter if possible
  • Loading branch information
PhilippSalvisberg committed May 30, 2020
commit e2804830ca71981d583ef2d79fb96b0bdaffb731
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,22 @@
import java.util.List;
import java.util.logging.Logger;

import org.utplsql.sqldev.dal.RealtimeReporterDao;
import org.utplsql.sqldev.dal.UtplsqlDao;
import org.utplsql.sqldev.exception.GenericDatabaseAccessException;
import org.utplsql.sqldev.exception.GenericRuntimeException;
import org.utplsql.sqldev.model.DatabaseTools;
import org.utplsql.sqldev.model.FileTools;
import org.utplsql.sqldev.model.preference.PreferenceModel;
import org.utplsql.sqldev.runner.UtplsqlRunner;
import org.utplsql.sqldev.ui.coverage.CodeCoverageReporterDialog;

import oracle.ide.config.Preferences;

public class CodeCoverageReporter {
private static final Logger logger = Logger.getLogger(CodeCoverageReporter.class.getName());

private String connectionName;
private Connection conn;
private List<String> pathList;
private List<String> includeObjectList;
Expand All @@ -50,6 +56,7 @@ public CodeCoverageReporter(final List<String> pathList, final List<String> incl
setConnection(connectionName);
}

// constructor for testing purposes only
public CodeCoverageReporter(final List<String> pathList, final List<String> includeObjectList,
final Connection conn) {
this.pathList = pathList;
Expand All @@ -64,7 +71,8 @@ private void setConnection(final String connectionName) {
throw new NullPointerException();
} else {
// must be closed manually
conn = DatabaseTools.cloneConnection(connectionName);
this.connectionName = connectionName;
this.conn = DatabaseTools.getConnection(connectionName);
}
}

Expand All @@ -83,19 +91,43 @@ private ArrayList<String> toStringList(final String s) {
private void run() {
logger.fine(() -> "Running code coverage reporter for " + pathList + "...");
try {
final UtplsqlDao dal = new UtplsqlDao(conn);
final String html = dal.htmlCodeCoverage(pathList, toStringList(schemas),
final RealtimeReporterDao dao = new RealtimeReporterDao(conn);
final PreferenceModel preferences = PreferenceModel.getInstance(Preferences.getPreferences());
if (preferences.isUseRealtimeReporter() && dao.isSupported()) {
runCodeCoverageWithRealtimeReporter();
} else {
runCodeCoverageStandalone();
}
} finally {
if (frame != null) {
frame.exit();
}
}
}

private void runCodeCoverageWithRealtimeReporter() {
final UtplsqlRunner runner = new UtplsqlRunner(pathList, toStringList(schemas), toStringList(includeObjects),
toStringList(excludeObjects), connectionName);
runner.runTestAsync();
}

private void runCodeCoverageStandalone() {
Connection coverageConn = null;
try {
coverageConn = conn != null ? conn : DatabaseTools.cloneConnection(connectionName);
final UtplsqlDao dao = new UtplsqlDao(coverageConn);
final String html = dao.htmlCodeCoverage(pathList, toStringList(schemas),
toStringList(includeObjects), toStringList(excludeObjects));
openInBrowser(html);
} finally {
try {
DatabaseTools.closeConnection(conn);
if (coverageConn != null && conn == null) {
// close only if connection has been cloned
DatabaseTools.closeConnection(coverageConn);
}
} catch (GenericDatabaseAccessException e) {
// ignore
}
if (frame != null) {
frame.exit();
}
}
}

Expand Down