Skip to content

Commit f860599

Browse files
committed
Make it hopefully run on travis
1 parent 9d142e0 commit f860599

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@
3131
</exclusion>
3232
</exclusions>
3333
</dependency>
34-
<dependency>
35-
<groupId>com.oracle.jdbc</groupId>
36-
<artifactId>ojdbc8</artifactId>
37-
<version>12.2.0.1</version>
38-
<scope>compile</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>com.oracle.jdbc</groupId>
42-
<artifactId>orai18n</artifactId>
43-
<version>12.2.0.1</version>
44-
<scope>compile</scope>
45-
</dependency>
4634
<dependency>
4735
<groupId>com.beust</groupId>
4836
<artifactId>jcommander</artifactId>

src/main/java/org/utplsql/cli/RunCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,14 @@ private List<Reporter> initReporters( Connection conn, List<ReporterOptions> rep
226226
for (ReporterOptions ro : reporterOptionsList) {
227227
Reporter reporter = reporterFactory.createReporter(ro.getReporterName());
228228

229+
230+
reporter.init(conn, compatibilityProxy, reporterFactory);
231+
229232
// Quick-hack for CoverageHTML Reporter
230233
if ( reporter instanceof CoverageHTMLReporter && ro.outputToFile() ) {
231234
((CoverageHTMLReporter)reporter).setAssetsPath(ro.getOutputFileName()+"_assets/");
232235
CoverageHTMLReporter.writeReportAssetsTo(Paths.get(ro.getOutputFileName()+"_assets/"));
233236
}
234-
235-
reporter.init(conn, compatibilityProxy, reporterFactory);
236237
ro.setReporterObj(reporter);
237238
reporterList.add(reporter);
238239
}

src/test/java/org/utplsql/cli/RunCommandTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void reporterOptions_Default() {
2020
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
2121

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

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

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

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

7676
ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
77-
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER, reporterOptions1.getReporterName());
77+
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
7878
assertNull(reporterOptions1.getOutputFileName());
7979
assertFalse(reporterOptions1.outputToFile());
8080
assertTrue(reporterOptions1.outputToScreen());
8181

8282
ReporterOptions reporterOptions2 = reporterOptionsList.get(1);
83-
assertEquals(CoreReporters.UT_COVERAGE_HTML_REPORTER, reporterOptions2.getReporterName());
83+
assertEquals(CoreReporters.UT_COVERAGE_HTML_REPORTER.name(), reporterOptions2.getReporterName());
8484
assertEquals(reporterOptions2.getOutputFileName(), "coverage.html");
8585
assertTrue(reporterOptions2.outputToFile());
8686
assertTrue(reporterOptions2.outputToScreen());

0 commit comments

Comments
 (0)