fix: Fix the total number of reported playbooks that are displayed in the report

Author: ludovicianul

.gitignore

@@ -1,3 +1,4 @@
+*.tape
 *.iml
 .idea
 target

src/main/java/dev/dochia/cli/core/args/AuthArguments.java

@@ -83,7 +83,7 @@ public Proxy getProxy() {
         if (proxy != null && !proxy.isEmpty()) {
             try {
                 String proxyUrl = proxy.replaceFirst("^(https?://)?", "");
-                String[] parts = proxyUrl.split(":");
+                String[] parts = proxyUrl.split(":", 2);
                 if (parts.length == 2) {
                     String host = parts[0];
                     int port = Integer.parseInt(parts[1]);

src/main/java/dev/dochia/cli/core/args/FilterArguments.java

@@ -565,9 +565,9 @@ public List<HttpMethod> getHttpMethods() {
      */
     public long getTotalPlaybooks() {
         return playbooks.stream()
-                .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), TrimAndValidate.class) == null)
-                .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), SanitizeAndValidate.class) == null)
-                .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), SpecialPlaybook.class) == null)
+                .filter(playbook -> !AnnotationUtils.isAnnotationDeclaredLocally(TrimAndValidate.class, playbook.getClass()))
+                .filter(playbook -> !AnnotationUtils.isAnnotationDeclaredLocally(SanitizeAndValidate.class, playbook.getClass()))
+                .filter(playbook -> !AnnotationUtils.isAnnotationDeclaredLocally(SpecialPlaybook.class, playbook.getClass()))
                 .count();
     }
 

src/main/java/dev/dochia/cli/core/command/ListCommand.java

@@ -77,6 +77,7 @@ public ListCommand(@Any Instance<TestCasePlaybook> playbooksList, @Any Instance<
         this.playbooksList = playbooksList.stream()
                 .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), ValidateAndTrim.class) == null)
                 .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), ValidateAndSanitize.class) == null)
+                .filter(playbook -> AnnotationUtils.findAnnotation(playbook.getClass(), SpecialPlaybook.class) == null)
                 .toList();
         this.formats = formats.stream().flatMap(format -> format.matchingFormats().stream()).sorted().toList();
         this.mutators = mutators.stream().map(m -> new MutatorEntry(m.getClass().getSimpleName(), m.description())).sorted().toList();

src/main/java/dev/dochia/cli/core/command/ShortErrorMessageHandler.java

@@ -18,6 +18,7 @@ public class ShortErrorMessageHandler implements CommandLine.IParameterException
      * @param args the command line arguments that were parsed when the exception was thrown
      * @return the exit code to return to the operating system
      */
+    @Override
     public int handleParseException(CommandLine.ParameterException ex, String[] args) {
         CommandLine cmd = ex.getCommandLine();
 

src/main/java/dev/dochia/cli/core/util/CommonUtils.java

@@ -26,9 +26,6 @@
 
 /** Some utility methods that don't fit in other classes. */
 public abstract class CommonUtils {
-  private static final String COMMA = ", ";
-  private static final String N_A = "N/A";
-
   /**
    * Custom Faker instance for generating fake data. Uses romanian locale as a tweak to load a
    * dpchia specific file with limited number of fake values.

src/test/java/dev/dochia/cli/core/args/FilterArgumentsTest.java

@@ -361,6 +361,6 @@ void shouldSkipHttpMethods() {
 
     @Test
     void shouldCountTotalPlaybooks() {
-        Assertions.assertThat(filterArguments.getTotalPlaybooks()).isEqualTo(116);
+        Assertions.assertThat(filterArguments.getTotalPlaybooks()).isEqualTo(124);
     }
 }

src/test/java/dev/dochia/cli/core/command/DochiaCommandTest.java

@@ -7,6 +7,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,58 +36,44 @@ void tearDown() {
 
     @Test
     void shouldDisplayHelpWhenNoArguments() {
-        // When
         dochiaCommand.run();
 
-        // Then
-        assertThat(outContent.toString())
+        assertThat(outContent.toString(StandardCharsets.UTF_8))
                 .contains("dochia – Bringing chaos with love!")
                 .contains("dochia automatically generates and executes")
                 .contains("Examples:");
     }
 
     @Test
     void shouldDisplayHelpWhenHelpOption() {
-        // Given
         dochiaCommand.licenses = false;
-
-        // When
         dochiaCommand.run();
 
-        // Then
-        assertThat(outContent.toString())
+        assertThat(outContent.toString(StandardCharsets.UTF_8))
                 .contains("dochia – Bringing chaos with love!")
                 .contains("dochia automatically generates");
     }
 
     @Test
     void shouldDisplayLicenseWhenLicensesOption() {
-        // Given
         dochiaCommand.licenses = true;
-
-        // When
         dochiaCommand.run();
 
-        // Then - Just verify it doesn't throw an exception
-        assertThat(outContent.toString()).isNotEmpty();
+        assertThat(outContent.toString(StandardCharsets.UTF_8)).isNotEmpty();
     }
 
     @Test
     void shouldReturnZeroAsExitCode() {
-        // When
         int exitCode = dochiaCommand.getExitCode();
 
-        // Then
         assertThat(exitCode).isZero();
     }
 
     @Test
     void shouldDisplayLicensesSuccessfully() {
-        // When
         int result = dochiaCommand.displayLicenses();
 
-        // Then
         assertThat(result).isZero();
-        assertThat(outContent.toString()).isNotEmpty();
+        assertThat(outContent.toString(StandardCharsets.UTF_8)).isNotEmpty();
     }
 }

src/test/java/dev/dochia/cli/core/command/ShortErrorMessageHandlerTest.java

@@ -38,23 +38,18 @@ void setup() {
 
     @Test
     void shouldPrintFullUsageAndReturnOkWhenHelpFullArgPresent() {
-        // Given
         when(mockCommandLine.getOut()).thenReturn(new PrintWriter(out));
         String[] args = {"--help-full"};
         CommandLine.ParameterException ex =
                 new CommandLine.ParameterException(mockCommandLine, "test error");
-
-        // When
         int exitCode = handler.handleParseException(ex, args);
 
-        // Then
         assertThat(exitCode).isEqualTo(CommandLine.ExitCode.OK);
         verify(mockCommandLine).usage(any(PrintWriter.class));
     }
 
     @Test
     void shouldPrintErrorAndSuggestionsWhenHelpFullNotPresent() {
-        // Given
         when(mockCommandLine.getErr()).thenReturn(new PrintWriter(err));
         when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
         when(mockCommandSpec.exitCodeOnInvalidInput()).thenReturn(CommandLine.ExitCode.USAGE);
@@ -63,17 +58,14 @@ void shouldPrintErrorAndSuggestionsWhenHelpFullNotPresent() {
         CommandLine.ParameterException ex =
                 new CommandLine.ParameterException(mockCommandLine, "test error");
 
-        // When
         int exitCode = handler.handleParseException(ex, args);
 
-        // Then
         assertThat(exitCode).isEqualTo(CommandLine.ExitCode.USAGE);
         assertThat(err.toString()).contains("test error");
     }
 
     @Test
     void shouldUseMappedExitCodeWhenExitCodeMapperPresent() {
-        // Given
         when(mockCommandLine.getExitCodeExceptionMapper()).thenReturn(mockExitCodeMapper);
         when(mockCommandLine.getErr()).thenReturn(new PrintWriter(err));
         when(mockExitCodeMapper.getExitCode(any())).thenReturn(42);
@@ -82,17 +74,14 @@ void shouldUseMappedExitCodeWhenExitCodeMapperPresent() {
         CommandLine.ParameterException ex =
                 new CommandLine.ParameterException(mockCommandLine, "test error");
 
-        // When
         int exitCode = handler.handleParseException(ex, args);
 
-        // Then
         assertThat(exitCode).isEqualTo(42);
         verify(mockExitCodeMapper).getExitCode(ex);
     }
 
     @Test
     void shouldUseDefaultExitCodeWhenNoExitCodeMapper() {
-        // Given
         when(mockCommandLine.getExitCodeExceptionMapper()).thenReturn(null);
         when(mockCommandLine.getErr()).thenReturn(new PrintWriter(err));
         when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
@@ -102,10 +91,8 @@ void shouldUseDefaultExitCodeWhenNoExitCodeMapper() {
         CommandLine.ParameterException ex =
                 new CommandLine.ParameterException(mockCommandLine, "test error");
 
-        // When
         int exitCode = handler.handleParseException(ex, args);
 
-        // Then
         assertThat(exitCode).isEqualTo(123);
     }
 }