fixed unit tests

redis · Jan 11, 2021 · c0ef9f5 · c0ef9f5
1 parent c2f0ffc
commit c0ef9f5
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 17 deletions.
diff --git a/connectors/db/src/test/java/com/redislabs/riot/db/DbTest.java b/connectors/db/src/test/java/com/redislabs/riot/db/DbTest.java
@@ -15,7 +15,8 @@ protected RiotApp app() {
 		return new RiotDb();
 	}
 
-	protected String applicationName() {
+	@Override
+	protected String appName() {
 		return "riot-db";
 	}
 

diff --git a/connectors/file/src/test/java/com/redislabs/riot/file/AbstractFileTest.java b/connectors/file/src/test/java/com/redislabs/riot/file/AbstractFileTest.java
@@ -42,6 +42,11 @@ protected RiotApp app() {
 		return new RiotFile();
 	}
 
+	@Override
+	protected String appName() {
+		return "riot-file";
+	}
+
 	protected <T> List<T> readAll(AbstractItemCountingItemStreamItemReader<T> reader) throws Exception {
 		reader.open(new ExecutionContext());
 		List<T> records = new ArrayList<>();

diff --git a/connectors/gen/src/test/java/com/redislabs/riot/gen/TestGen.java b/connectors/gen/src/test/java/com/redislabs/riot/gen/TestGen.java
@@ -35,6 +35,11 @@ protected RiotApp app() {
 		return new RiotGen();
 	}
 
+	@Override
+	protected String appName() {
+		return "riot-gen";
+	}
+
 	@Test
 	public void genFakerHash() throws Exception {
 		executeFile("/import-hmset.txt");

diff --git a/connectors/redis/src/test/java/com/redis/riot/redis/TestReplicate.java b/connectors/redis/src/test/java/com/redis/riot/redis/TestReplicate.java
@@ -38,6 +38,11 @@ protected RiotApp app() {
         return new RiotRedis();
     }
 
+    @Override
+    protected String appName() {
+        return "riot-redis";
+    }
+
     @BeforeEach
     public void setupTarget() {
         targetRedisURI = RedisURI.create(targetRedis.getHost(), targetRedis.getFirstMappedPort());

diff --git a/connectors/redis/src/test/java/com/redis/riot/redis/TestReplicateCluster.java b/connectors/redis/src/test/java/com/redis/riot/redis/TestReplicateCluster.java
@@ -56,6 +56,11 @@ protected RiotApp app() {
         return new RiotRedis();
     }
 
+    @Override
+    protected String appName() {
+        return "riot-redis";
+    }
+
     @Override
     protected String connectionArgs() {
         return "-u " + String.join(" ", sourceURIs.stream().map(String::valueOf).collect(Collectors.toList()));

diff --git a/connectors/stream/src/test/java/com/redislabs/riot/stream/TestKafka.java b/connectors/stream/src/test/java/com/redislabs/riot/stream/TestKafka.java
@@ -40,6 +40,11 @@ protected RiotApp app() {
         return new RiotStream();
     }
 
+    @Override
+    protected String appName() {
+        return "riot-stream";
+    }
+
     @Override
     protected String process(String command) {
         return super.process(command).replace("localhost:9092", kafka.getBootstrapServers());

diff --git a/core/src/main/java/com/redislabs/riot/RiotApp.java b/core/src/main/java/com/redislabs/riot/RiotApp.java
@@ -17,10 +17,6 @@
 @Command(usageHelpAutoWidth = true, sortOptions = false, versionProvider = ManifestVersionProvider.class, subcommands = HiddenGenerateCompletion.class, abbreviateSynopsis = true)
 public class RiotApp implements Runnable {
 
-    @Getter
-    @Spec
-    private Model.CommandSpec commandSpec;
-
     private static final String ROOT_LOGGER = "";
 
     @Option(names = {"-H", "--help"}, usageHelp = true, description = "Show this help message and exit.")

diff --git a/test/src/main/java/com/redislabs/riot/test/AbstractRiotTest.java b/test/src/main/java/com/redislabs/riot/test/AbstractRiotTest.java
@@ -15,17 +15,15 @@ public abstract class AbstractRiotTest {
     protected static final int REDIS_PORT = 6379;
     private final static String COMMAND_PREAMBLE = "❯";
 
-    protected String commandPrefix(RiotApp app) {
-        return COMMAND_PREAMBLE + " " + applicationName(app);
+    protected String commandPrefix() {
+        return COMMAND_PREAMBLE + " " + appName();
     }
 
-    private String applicationName(RiotApp app) {
-        return app.getCommandSpec().name();
-    }
+    protected abstract String appName();
 
-    private String removePreamble(RiotApp app, String command) {
-        if (command.startsWith(commandPrefix(app))) {
-            return command.substring(commandPrefix(app).length());
+    private String removePreamble(String command) {
+        if (command.startsWith(commandPrefix())) {
+            return command.substring(commandPrefix().length());
         }
         return command;
     }
@@ -38,20 +36,20 @@ protected Object command(String file) throws Exception {
 
     protected Object command(RiotApp app, String file) throws Exception {
         CommandLine commandLine = app.commandLine();
-        CommandLine.ParseResult parseResult = app.parse(commandLine, args(app, file));
+        CommandLine.ParseResult parseResult = app.parse(commandLine, args(file));
         return parseResult.subcommand().commandSpec().commandLine().getCommand();
     }
 
-    private String[] args(RiotApp app, String filename) throws Exception {
+    private String[] args(String filename) throws Exception {
         try (InputStream inputStream = getClass().getResourceAsStream(filename)) {
             String command = IOUtils.toString(inputStream, Charset.defaultCharset());
-            return CommandLineUtils.translateCommandline(process(removePreamble(app, command)));
+            return CommandLineUtils.translateCommandline(process(removePreamble(command)));
         }
     }
 
     protected int executeFile(String filename) throws Exception {
         RiotApp app = app();
-        return app.execute(args(app, filename));
+        return app.execute(args(filename));
     }
 
     protected String process(String command) {