fix some tests

Author: toptobes

src/main/java/com/dtsx/astra/cli/commands/db/cqlsh/CqlshExecCmd.java

@@ -38,6 +38,8 @@ public static class RawExecSource {
         @Option(
             names = { "-e", "--execute" },
             description = "Execute the statement then exit",
+            fallbackValue = "-",
+            arity = "0..1",
             paramLabel = "STATEMENT"
         )
         public Optional<String> $statement = Optional.empty();

src/test/java/com/dtsx/astra/cli/integration/core/CliPropertiesImplTest.java

@@ -55,7 +55,7 @@ public void dsbulk(SystemProperties systemProps) {
             val dsbulk = cliProps.dsbulk();
 
             assertThat(dsbulk.url()).isEqualTo("<dsbulk_url>");
-            assertThat(dsbulk.version()).isEqualTo("6.5.4");
+            assertThat(dsbulk.version()).isEqualTo("v6.5.4");
         }
 
         @Test

src/test/java/com/dtsx/astra/cli/snapshot/commands/db/cqlsh/CqlshExecCmdSnapshotTest.java

@@ -21,34 +21,34 @@ public class CqlshExecCmdSnapshotTest extends BaseCqlshExecCmd {
 
     @TestForDifferentOutputs
     public void error_db_not_found(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "CONSISTENCY"), outputType, dbNotFoundOpts);
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e", "CONSISTENCY"), outputType, dbNotFoundOpts);
     }
 
     @TestForAllOutputs
     public void exec_string_success(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "CONSISTENCY"), outputType, dbFoundOpts.andThen(disclaimerComments));
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e", "CONSISTENCY"), outputType, dbFoundOpts.andThen(disclaimerComments));
     }
 
     @TestForAllOutputs
     public void exec_string_fail(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "DESC CARS"), outputType, dbFoundOpts.andThen(disclaimerComments));
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e", "DESC CARS"), outputType, dbFoundOpts.andThen(disclaimerComments));
     }
 
     @TestForAllOutputs
     public void exec_string_stdin_implied(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
             .stdin("CONSISTENCY;"));
     }
 
     @TestForAllOutputs
     public void exec_string_stdin_explicit(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e", "-"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
             .stdin("CONSISTENCY;"));
     }
 
     @TestForDifferentOutputs
     public void exec_string_stdin_multiline(OutputType outputType) {
-        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
+        verifyRun(escape("db", "cqlsh", "exec", "${DatabaseName}", "-e"), outputType, o -> o.use(dbFoundOpts).use(disclaimerComments)
             .stdin("CONSISTENCY;\\\nSHOW VERSION;\\\nHELP"));
     }
 }

src/test/java/com/dtsx/astra/cli/unit/operations/UpgradeOperationTest.java

@@ -23,6 +23,7 @@
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -147,6 +148,7 @@ public void throws_when_managed_by_package_manager() throws Exception {
             .isEqualTo(ExitCode.UNSUPPORTED_EXECUTION);
     }
 
+    @SuppressWarnings("SameParameterValue")
     private CliContext mkCtx(String version, SupportedPackageManager pm) throws Exception {
         val binaryPath = testCtx.get().path("/usr/local/bin/astra");
         Files.createDirectories(binaryPath.getParent());
@@ -156,7 +158,7 @@ private CliContext mkCtx(String version, SupportedPackageManager pm) throws Exce
         val mockProperties = mock(CliProperties.class);
 
         when(mockProperties.version()).thenReturn(Version.mkUnsafe(version));
-        when(mockProperties.cliPath(originalCtx)).thenReturn(new AstraBinary(binaryPath));
+        when(mockProperties.cliPath(any())).thenReturn(new AstraBinary(binaryPath));
         when(mockProperties.owningPackageManager()).thenReturn(Optional.ofNullable(pm));
 
         return originalCtx.withProperties(mockProperties);

src/test/resources/snapshots/_db/_cqlsh/CqlshExecCmd/error_db_not_found.human.approved.txt

@@ -1,9 +1,7 @@
 ---- meta ----
-command: astra db cqlsh exec two_regions_db CONSISTENCY
+command: astra db cqlsh exec two_regions_db -e CONSISTENCY
 exit_code: 2
 ---- output ----
-stderr: [WARNING] Providing the CQL statement as a positional parameter is deprecated and will be removed in future versions.
-stderr: [WARNING] Please use the 'astra db cqlsh exec -e "CQL STATEMENT"' syntax instead.
 stderr: Error: A database named 'two_regions_db' could not be found.
 stderr: 
 stderr: Please ensure that:

src/test/resources/snapshots/_db/_cqlsh/CqlshExecCmd/error_db_not_found.json.approved.txt

@@ -1,9 +1,7 @@
 ---- meta ----
-command: astra db cqlsh exec two_regions_db CONSISTENCY -o json
+command: astra db cqlsh exec two_regions_db -e CONSISTENCY -o json
 exit_code: 2
 ---- output ----
-stderr: [WARNING] Providing the CQL statement as a positional parameter is deprecated and will be removed in future versions.
-stderr: [WARNING] Please use the 'astra db cqlsh exec -e "CQL STATEMENT"' syntax instead.
 stdout: {
 stdout:   "code" : "DATABASE_NOT_FOUND",
 stdout:   "message" : "Error: A database named 'two_regions_db' could not be found.\n\nPlease ensure that:\n  - You are using the correct token/organization.\n  - You are using the correct database name.",

src/test/resources/snapshots/_db/_cqlsh/CqlshExecCmd/exec_string_fail.csv.approved.txt

@@ -1,13 +1,11 @@
 ---- meta ----
-command: astra db cqlsh exec two_regions_db 'DESC CARS' -o csv
+command: astra db cqlsh exec two_regions_db -e 'DESC CARS' -o csv
 exit_code: 0
 comments: 
  | Can't really test human output since we don't capture cqlsh output for human outputs
  | But at least we can verify the command runs and the exit code is correct
  | (human output returns cqlsh exit code; non-human output returns the cqlsh exit code via a field)
 ---- output ----
-stderr: [WARNING] Providing the CQL statement as a positional parameter is deprecated and will be removed in future versions.
-stderr: [WARNING] Please use the 'astra db cqlsh exec -e "CQL STATEMENT"' syntax instead.
 stdout: code,message,exit_code,stdout,stderr
 stdout: OK,"Cqlsh executed with exit code 2, with 1 lines in stdout and 1 lines in stderr.",2,,<stdin>:1:'cars' not found in keyspaces
 ---- end ----

src/test/resources/snapshots/_db/_cqlsh/CqlshExecCmd/exec_string_fail.csv.received.txt

@@ -1,11 +1,9 @@
 ---- meta ----
-command: astra db cqlsh exec two_regions_db 'DESC CARS'
+command: astra db cqlsh exec two_regions_db -e 'DESC CARS'
 exit_code: 2
 comments: 
  | Can't really test human output since we don't capture cqlsh output for human outputs
  | But at least we can verify the command runs and the exit code is correct
  | (human output returns cqlsh exit code; non-human output returns the cqlsh exit code via a field)
 ---- output ----
-stderr: [WARNING] Providing the CQL statement as a positional parameter is deprecated and will be removed in future versions.
-stderr: [WARNING] Please use the 'astra db cqlsh exec -e "CQL STATEMENT"' syntax instead.
 ---- end ----