Adjusted default run-Test and refactoring

Author: pesse

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

@@ -33,9 +33,13 @@ private RunCommand createRunCommand(String... args) {
         return runCmd;
     }
 
+    private String getConnectionString() {
+        return sUser + "/" + sPass + "@" + sUrl;
+    }
+
     @Test
     public void reporterOptions_Default() {
-        RunCommand runCmd = createRunCommand("app/app@xe");
+        RunCommand runCmd = createRunCommand(getConnectionString());
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -48,7 +52,7 @@ public void reporterOptions_Default() {
 
     @Test
     public void reporterOptions_OneReporter() {
-        RunCommand runCmd = createRunCommand("app/app@xe", "-f=ut_documentation_reporter", "-o=output.txt");
+        RunCommand runCmd = createRunCommand(getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -61,7 +65,7 @@ public void reporterOptions_OneReporter() {
 
     @Test
     public void reporterOptions_OneReporterForceScreen() {
-        RunCommand runCmd = createRunCommand("app/app@xe", "-f=ut_documentation_reporter", "-o=output.txt", "-s");
+        RunCommand runCmd = createRunCommand(getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt", "-s");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -74,7 +78,7 @@ public void reporterOptions_OneReporterForceScreen() {
 
     @Test
     public void reporterOptions_OneReporterForceScreenInverse() {
-        RunCommand runCmd = createRunCommand("app/app@xe", "-f=ut_documentation_reporter", "-s", "-o=output.txt");
+        RunCommand runCmd = createRunCommand(getConnectionString(), "-f=ut_documentation_reporter", "-s", "-o=output.txt");
 
         List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
 
@@ -87,7 +91,7 @@ public void reporterOptions_OneReporterForceScreenInverse() {
 
     @Test
     public void reporterOptions_TwoReporters() {
-        RunCommand runCmd = createRunCommand("app/app@xe",
+        RunCommand runCmd = createRunCommand(getConnectionString(),
                 "-f=ut_documentation_reporter",
                 "-f=ut_coverage_html_reporter", "-o=coverage.html", "-s");
 
@@ -108,11 +112,14 @@ public void reporterOptions_TwoReporters() {
 
     @Test
     public void run_Default() {
-        RunCommand runCmd = createRunCommand(sUser + "/" + sPass + "@" + sUrl);
+        RunCommand runCmd = createRunCommand(getConnectionString(),
+                "-f=ut_documentation_reporter",
+                "-c",
+                "--failure-exit-code=2");
 
         try {
             int result = runCmd.run();
-            Assert.assertEquals(0, result);
+            Assert.assertEquals(2, result);
         }
         catch ( Exception e ) {
             Assert.fail(e.getMessage());