Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Make cli compatible with java-api 3.1.0 (new reporter API) #65

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
pesse merged 4 commits into from
Mar 13, 2018
Merged

Make cli compatible with java-api 3.1.0 (new reporter API) #65

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d142e0
Quick and simple try to make cli compatible with 3.1.0
pesse Mar 11, 2018
f860599
Make it hopefully run on travis
pesse Mar 13, 2018
fef81ef
Refactor logic to copy CoverageHTMLReporter-assets
pesse Mar 13, 2018
c392e42
Outsource Reporter-related things into ReporterManager
pesse Mar 13, 2018
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
Make it hopefully run on travis
  • Loading branch information
@pesse
pesse committed Mar 13, 2018
commit f860599c464f736716ba38803d030bb8a1b7859f
12 changes: 0 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.oracle.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>12.2.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.oracle.jdbc</groupId>
<artifactId>orai18n</artifactId>
<version>12.2.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/utplsql/cli/RunCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,14 @@ private List<Reporter> initReporters( Connection conn, List<ReporterOptions> rep
for (ReporterOptions ro : reporterOptionsList) {
Reporter reporter = reporterFactory.createReporter(ro.getReporterName());


reporter.init(conn, compatibilityProxy, reporterFactory);

// Quick-hack for CoverageHTML Reporter
if ( reporter instanceof CoverageHTMLReporter && ro.outputToFile() ) {
((CoverageHTMLReporter)reporter).setAssetsPath(ro.getOutputFileName()+"_assets/");
CoverageHTMLReporter.writeReportAssetsTo(Paths.get(ro.getOutputFileName()+"_assets/"));
}

reporter.init(conn, compatibilityProxy, reporterFactory);
ro.setReporterObj(reporter);
reporterList.add(reporter);
}
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/utplsql/cli/RunCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void reporterOptions_Default() {
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();

ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
assertNull(reporterOptions1.getOutputFileName());
assertFalse(reporterOptions1.outputToFile());
assertTrue(reporterOptions1.outputToScreen());
Expand All @@ -33,7 +33,7 @@ public void reporterOptions_OneReporter() {
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();

ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
assertEquals(reporterOptions1.getOutputFileName(), "output.txt");
assertTrue(reporterOptions1.outputToFile());
assertFalse(reporterOptions1.outputToScreen());
Expand All @@ -46,7 +46,7 @@ public void reporterOptions_OneReporterForceScreen() {
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();

ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
assertEquals(reporterOptions1.getOutputFileName(), "output.txt");
assertTrue(reporterOptions1.outputToFile());
assertTrue(reporterOptions1.outputToScreen());
Expand All @@ -59,7 +59,7 @@ public void reporterOptions_OneReporterForceScreenInverse() {
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();

ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
assertEquals(reporterOptions1.getOutputFileName(), "output.txt");
assertTrue(reporterOptions1.outputToFile());
assertTrue(reporterOptions1.outputToScreen());
Expand All @@ -74,13 +74,13 @@ public void reporterOptions_TwoReporters() {
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();

ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
assertNull(reporterOptions1.getOutputFileName());
assertFalse(reporterOptions1.outputToFile());
assertTrue(reporterOptions1.outputToScreen());

ReporterOptions reporterOptions2 = reporterOptionsList.get(1);
assertEquals(CoreReporters.UT_COVERAGE_HTML_REPORTER, reporterOptions2.getReporterName());
assertEquals(CoreReporters.UT_COVERAGE_HTML_REPORTER.name(), reporterOptions2.getReporterName());
assertEquals(reporterOptions2.getOutputFileName(), "coverage.html");
assertTrue(reporterOptions2.outputToFile());
assertTrue(reporterOptions2.outputToScreen());
Expand Down