From a077ae5ed98d34da01700818d7103bde63ed030f Mon Sep 17 00:00:00 2001 From: Sergii Zhevzhyk Date: Wed, 4 Mar 2020 21:54:20 +0100 Subject: [PATCH 1/2] Refactor tests in the pulsar-client-tools-test module --- .../pulsar/admin/cli/CmdFunctionsTest.java | 390 +++++++----------- .../pulsar/admin/cli/utils/IOUtilsTest.java | 3 +- .../client/cli/PulsarClientToolTest.java | 3 +- 3 files changed, 157 insertions(+), 239 deletions(-) diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java index 04d833b3ffc74..ddd8ce877dd9d 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java @@ -81,6 +81,12 @@ public IObjectFactory getObjectFactory() { private static final String TEST_NAME = "test_name"; private static final String JAR_NAME = CmdFunctionsTest.class.getClassLoader().getResource("dummyexamples.jar").getFile(); + private static final String URL ="file:" + JAR_NAME; + private static final String FN_NAME = TEST_NAME + "-function"; + private static final String INPUT_TOPIC_NAME = TEST_NAME + "-input-topic"; + private static final String OUTPUT_TOPIC_NAME = TEST_NAME + "-output-topic"; + private static final String TENANT = TEST_NAME + "-tenant"; + private static final String NAMESPACE = TEST_NAME + "-namespace"; private PulsarAdmin admin; private Functions functions; @@ -172,14 +178,11 @@ public void testLocalRunnerCmdYaml() throws Exception { @Test public void testCreateFunction() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; cmd.run(new String[] { "create", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, "--jar", JAR_NAME, "--auto-ack", "false", "--tenant", "sample", @@ -190,10 +193,10 @@ public void testCreateFunction() throws Exception { }); CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); - assertEquals(new Boolean(false), creater.getAutoAck()); + assertEquals(FN_NAME, creater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); + assertEquals(Boolean.FALSE, creater.getAutoAck()); assertEquals("test-dead-letter-topic", creater.getDeadLetterTopic()); assertEquals("custom-runtime-options", creater.getCustomRuntimeOptions()); @@ -203,117 +206,105 @@ public void testCreateFunction() throws Exception { @Test public void restartFunction() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; int instanceId = 0; - cmd.run(new String[] { "restart", "--tenant", tenant, "--namespace", namespace, "--name", fnName, + cmd.run(new String[] { "restart", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME, "--instance-id", Integer.toString(instanceId)}); RestartFunction restarter = cmd.getRestarter(); - assertEquals(fnName, restarter.getFunctionName()); + assertEquals(FN_NAME, restarter.getFunctionName()); - verify(functions, times(1)).restartFunction(tenant, namespace, fnName, instanceId); + verify(functions, times(1)).restartFunction(tenant, namespace, FN_NAME, instanceId); } @Test public void restartFunctionInstances() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; - cmd.run(new String[] { "restart", "--tenant", tenant, "--namespace", namespace, "--name", fnName }); + cmd.run(new String[] { "restart", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME}); RestartFunction restarter = cmd.getRestarter(); - assertEquals(fnName, restarter.getFunctionName()); + assertEquals(FN_NAME, restarter.getFunctionName()); - verify(functions, times(1)).restartFunction(tenant, namespace, fnName); + verify(functions, times(1)).restartFunction(tenant, namespace, FN_NAME); } @Test public void stopFunction() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; int instanceId = 0; - cmd.run(new String[] { "stop", "--tenant", tenant, "--namespace", namespace, "--name", fnName, + cmd.run(new String[] { "stop", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME, "--instance-id", Integer.toString(instanceId)}); StopFunction stop = cmd.getStopper(); - assertEquals(fnName, stop.getFunctionName()); + assertEquals(FN_NAME, stop.getFunctionName()); - verify(functions, times(1)).stopFunction(tenant, namespace, fnName, instanceId); + verify(functions, times(1)).stopFunction(tenant, namespace, FN_NAME, instanceId); } @Test public void stopFunctionInstances() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; - cmd.run(new String[] { "stop", "--tenant", tenant, "--namespace", namespace, "--name", fnName }); + cmd.run(new String[] { "stop", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME}); StopFunction stop = cmd.getStopper(); - assertEquals(fnName, stop.getFunctionName()); + assertEquals(FN_NAME, stop.getFunctionName()); - verify(functions, times(1)).stopFunction(tenant, namespace, fnName); + verify(functions, times(1)).stopFunction(tenant, namespace, FN_NAME); } @Test public void startFunction() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; int instanceId = 0; - cmd.run(new String[] { "start", "--tenant", tenant, "--namespace", namespace, "--name", fnName, + cmd.run(new String[] { "start", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME, "--instance-id", Integer.toString(instanceId)}); CmdFunctions.StartFunction stop = cmd.getStarter(); - assertEquals(fnName, stop.getFunctionName()); + assertEquals(FN_NAME, stop.getFunctionName()); - verify(functions, times(1)).startFunction(tenant, namespace, fnName, instanceId); + verify(functions, times(1)).startFunction(tenant, namespace, FN_NAME, instanceId); } @Test public void startFunctionInstances() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; - cmd.run(new String[] { "start", "--tenant", tenant, "--namespace", namespace, "--name", fnName }); + cmd.run(new String[] { "start", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME}); CmdFunctions.StartFunction stop = cmd.getStarter(); - assertEquals(fnName, stop.getFunctionName()); + assertEquals(FN_NAME, stop.getFunctionName()); - verify(functions, times(1)).startFunction(tenant, namespace, fnName); + verify(functions, times(1)).startFunction(tenant, namespace, FN_NAME); } @Test public void testGetFunctionStatus() throws Exception { - String fnName = TEST_NAME + "-function"; String tenant = "sample"; String namespace = "ns1"; int instanceId = 0; - cmd.run(new String[] { "getstatus", "--tenant", tenant, "--namespace", namespace, "--name", fnName, + cmd.run(new String[] { "getstatus", "--tenant", tenant, "--namespace", namespace, "--name", FN_NAME, "--instance-id", Integer.toString(instanceId)}); GetFunctionStatus status = cmd.getStatuser(); - assertEquals(fnName, status.getFunctionName()); + assertEquals(FN_NAME, status.getFunctionName()); - verify(functions, times(1)).getFunctionStatus(tenant, namespace, fnName, instanceId); + verify(functions, times(1)).getFunctionStatus(tenant, namespace, FN_NAME, instanceId); } @Test public void testCreateFunctionWithFileUrl() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "create", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -321,24 +312,19 @@ public void testCreateFunctionWithFileUrl() throws Exception { CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); + assertEquals(FN_NAME, creater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString()); } @Test public void testCreateFunctionWithoutBasicArguments() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "create", - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--className", IdentityFunction.class.getName(), }); @@ -348,21 +334,19 @@ public void testCreateFunctionWithoutBasicArguments() throws Exception { assertEquals("public", creater.getFunctionConfig().getTenant()); assertEquals("default", creater.getFunctionConfig().getNamespace()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString()); } @Test public void testCreateFunctionWithTopicPatterns() throws Exception { - String fnName = TEST_NAME + "-function"; String topicPatterns = "persistent://tenant/ns/topicPattern*"; - String outputTopicName = TEST_NAME + "-output-topic"; cmd.run(new String[] { "create", - "--name", fnName, + "--name", FN_NAME, "--topicsPattern", topicPatterns, - "--output", outputTopicName, + "--output", OUTPUT_TOPIC_NAME, "--jar", JAR_NAME, "--tenant", "sample", "--namespace", "ns1", @@ -370,9 +354,9 @@ public void testCreateFunctionWithTopicPatterns() throws Exception { }); CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); + assertEquals(FN_NAME, creater.getFunctionName()); assertEquals(topicPatterns, creater.getTopicsPattern()); - assertEquals(outputTopicName, creater.getOutput()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); verify(functions, times(1)).createFunction(any(FunctionConfig.class), anyString()); @@ -380,8 +364,6 @@ public void testCreateFunctionWithTopicPatterns() throws Exception { @Test public void testCreateUsingFullyQualifiedFunctionName() throws Exception { - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; String tenant = "sample"; String namespace = "ns1"; String functionName = "func"; @@ -389,8 +371,8 @@ public void testCreateUsingFullyQualifiedFunctionName() throws Exception { cmd.run(new String[] { "create", - "--inputs", inputTopicName, - "--output", outputTopicName, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, "--fqfn", fqfn, "--jar", JAR_NAME, "--className", DummyFunction.class.getName(), @@ -405,10 +387,9 @@ public void testCreateUsingFullyQualifiedFunctionName() throws Exception { @Test public void testCreateWithoutOutputTopicWithSkipFlag() throws Exception { - String inputTopicName = TEST_NAME + "-input-topic"; cmd.run(new String[] { "create", - "--inputs", inputTopicName, + "--inputs", INPUT_TOPIC_NAME, "--jar", JAR_NAME, "--tenant", "sample", "--namespace", "ns1", @@ -428,10 +409,9 @@ public void testCreateWithoutOutputTopic() { ConsoleOutputCapturer consoleOutputCapturer = new ConsoleOutputCapturer(); consoleOutputCapturer.start(); - String inputTopicName = TEST_NAME + "-input-topic"; cmd.run(new String[] { "create", - "--inputs", inputTopicName, + "--inputs", INPUT_TOPIC_NAME, "--jar", JAR_NAME, "--tenant", "sample", "--namespace", "ns1", @@ -446,57 +426,45 @@ public void testCreateWithoutOutputTopic() { @Test public void testGetFunction() throws Exception { - String tenant = TEST_NAME + "-tenant"; - String namespace = TEST_NAME + "-namespace"; - String fnName = TEST_NAME + "-function"; - cmd.run(new String[] { "get", - "--name", fnName, - "--tenant", tenant, - "--namespace", namespace + "--name", FN_NAME, + "--tenant", TENANT, + "--namespace", NAMESPACE }); GetFunction getter = cmd.getGetter(); - assertEquals(fnName, getter.getFunctionName()); - assertEquals(tenant, getter.getTenant()); - assertEquals(namespace, getter.getNamespace()); + assertEquals(FN_NAME, getter.getFunctionName()); + assertEquals(TENANT, getter.getTenant()); + assertEquals(NAMESPACE, getter.getNamespace()); - verify(functions, times(1)).getFunction(eq(tenant), eq(namespace), eq(fnName)); + verify(functions, times(1)).getFunction(eq(TENANT), eq(NAMESPACE), eq(FN_NAME)); } @Test public void testDeleteFunction() throws Exception { - String tenant = TEST_NAME + "-tenant"; - String namespace = TEST_NAME + "-namespace"; - String fnName = TEST_NAME + "-function"; - cmd.run(new String[] { "delete", - "--name", fnName, - "--tenant", tenant, - "--namespace", namespace + "--name", FN_NAME, + "--tenant", TENANT, + "--namespace", NAMESPACE }); DeleteFunction deleter = cmd.getDeleter(); - assertEquals(fnName, deleter.getFunctionName()); - assertEquals(tenant, deleter.getTenant()); - assertEquals(namespace, deleter.getNamespace()); + assertEquals(FN_NAME, deleter.getFunctionName()); + assertEquals(TENANT, deleter.getTenant()); + assertEquals(NAMESPACE, deleter.getNamespace()); - verify(functions, times(1)).deleteFunction(eq(tenant), eq(namespace), eq(fnName)); + verify(functions, times(1)).deleteFunction(eq(TENANT), eq(NAMESPACE), eq(FN_NAME)); } @Test public void testUpdateFunction() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - cmd.run(new String[] { "update", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, "--jar", JAR_NAME, "--tenant", "sample", "--namespace", "ns1", @@ -504,95 +472,77 @@ public void testUpdateFunction() throws Exception { }); UpdateFunction updater = cmd.getUpdater(); - assertEquals(fnName, updater.getFunctionName()); - assertEquals(inputTopicName, updater.getInputs()); - assertEquals(outputTopicName, updater.getOutput()); + assertEquals(FN_NAME, updater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, updater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, updater.getOutput()); verify(functions, times(1)).updateFunction(any(FunctionConfig.class), anyString(), eq(new UpdateOptions())); } @Test public void testListFunctions() throws Exception { - String tenant = TEST_NAME + "-tenant"; - String namespace = TEST_NAME + "-namespace"; - cmd.run(new String[] { "list", - "--tenant", tenant, - "--namespace", namespace + "--tenant", TENANT, + "--namespace", NAMESPACE }); ListFunctions lister = cmd.getLister(); - assertEquals(tenant, lister.getTenant()); - assertEquals(namespace, lister.getNamespace()); + assertEquals(TENANT, lister.getTenant()); + assertEquals(NAMESPACE, lister.getNamespace()); - verify(functions, times(1)).getFunctions(eq(tenant), eq(namespace)); + verify(functions, times(1)).getFunctions(eq(TENANT), eq(NAMESPACE)); } @Test public void testStateGetter() throws Exception { - String tenant = TEST_NAME + "-tenant"; - String namespace = TEST_NAME + "-namespace"; - String fnName = TEST_NAME + "-function"; String key = TEST_NAME + "-key"; cmd.run(new String[] { "querystate", - "--tenant", tenant, - "--namespace", namespace, - "--name", fnName, + "--tenant", TENANT, + "--namespace", NAMESPACE, + "--name", FN_NAME, "--key", key }); StateGetter stateGetter = cmd.getStateGetter(); - assertEquals(tenant, stateGetter.getTenant()); - assertEquals(namespace, stateGetter.getNamespace()); - assertEquals(fnName, stateGetter.getFunctionName()); + assertEquals(TENANT, stateGetter.getTenant()); + assertEquals(NAMESPACE, stateGetter.getNamespace()); + assertEquals(FN_NAME, stateGetter.getFunctionName()); - verify(functions, times(1)).getFunctionState(eq(tenant), eq(namespace), eq(fnName), eq(key)); + verify(functions, times(1)).getFunctionState(eq(TENANT), eq(NAMESPACE), eq(FN_NAME), eq(key)); } @Test public void testStateGetterWithoutKey() throws Exception { - String tenant = TEST_NAME + "-tenant"; - String namespace = TEST_NAME + "-namespace"; - String fnName = TEST_NAME + "-function"; ConsoleOutputCapturer consoleOutputCapturer = new ConsoleOutputCapturer(); consoleOutputCapturer.start(); cmd.run(new String[] { "querystate", - "--tenant", tenant, - "--namespace", namespace, - "--name", fnName, + "--tenant", TENANT, + "--namespace", NAMESPACE, + "--name", FN_NAME, }); consoleOutputCapturer.stop(); String output = consoleOutputCapturer.getStderr(); assertTrue(output.replace("\n", "").contains("State key needs to be specified")); StateGetter stateGetter = cmd.getStateGetter(); - assertEquals(tenant, stateGetter.getTenant()); - assertEquals(namespace, stateGetter.getNamespace()); - assertEquals(fnName, stateGetter.getFunctionName()); + assertEquals(TENANT, stateGetter.getTenant()); + assertEquals(NAMESPACE, stateGetter.getNamespace()); + assertEquals(FN_NAME, stateGetter.getFunctionName()); verify(functions, times(0)).getFunctionState(any(), any(), any(), any()); } - private static final String fnName = TEST_NAME + "-function"; - private static final String inputTopicName = TEST_NAME + "-input-topic"; - private static final String outputTopicName = TEST_NAME + "-output-topic"; - @Test public void testCreateFunctionWithCpu() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "create", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -601,29 +551,24 @@ public void testCreateFunctionWithCpu() throws Exception { CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); + assertEquals(FN_NAME, creater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(INPUT_TOPIC_NAME, creater.getOutput()); assertEquals(creater.getFunctionConfig().getResources().getCpu(), 5.0); // Disk/Ram should be default - assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(1073741824l)); - assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l)); + assertEquals(creater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L)); + assertEquals(creater.getFunctionConfig().getResources().getDisk(), Long.valueOf(10737418240L)); verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString()); } @Test public void testCreateFunctionWithRam() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "create", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -632,29 +577,24 @@ public void testCreateFunctionWithRam() throws Exception { CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); - assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(5656565656l)); + assertEquals(FN_NAME, creater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); + assertEquals(creater.getFunctionConfig().getResources().getRam(), Long.valueOf(5656565656L)); // cpu/disk should be default assertEquals(creater.getFunctionConfig().getResources().getCpu(), 1.0); - assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l)); + assertEquals(creater.getFunctionConfig().getResources().getDisk(), Long.valueOf(10737418240L)); verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString()); } @Test public void testCreateFunctionWithDisk() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "create", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -663,12 +603,12 @@ public void testCreateFunctionWithDisk() throws Exception { CreateFunction creater = cmd.getCreater(); - assertEquals(fnName, creater.getFunctionName()); - assertEquals(inputTopicName, creater.getInputs()); - assertEquals(outputTopicName, creater.getOutput()); - assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(8080808080808080l)); + assertEquals(FN_NAME, creater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); + assertEquals(creater.getFunctionConfig().getResources().getDisk(), Long.valueOf(8080808080808080L)); // cpu/Ram should be default - assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(1073741824l)); + assertEquals(creater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L)); assertEquals(creater.getFunctionConfig().getResources().getCpu(), 1.0); verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString()); } @@ -676,17 +616,12 @@ public void testCreateFunctionWithDisk() throws Exception { @Test public void testUpdateFunctionWithCpu() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "update", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -695,29 +630,24 @@ public void testUpdateFunctionWithCpu() throws Exception { UpdateFunction updater = cmd.getUpdater(); - assertEquals(fnName, updater.getFunctionName()); - assertEquals(inputTopicName, updater.getInputs()); - assertEquals(outputTopicName, updater.getOutput()); + assertEquals(FN_NAME, updater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, updater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, updater.getOutput()); assertEquals(updater.getFunctionConfig().getResources().getCpu(), 5.0); // Disk/Ram should be default - assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(1073741824l)); - assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l)); + assertEquals(updater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L)); + assertEquals(updater.getFunctionConfig().getResources().getDisk(), Long.valueOf(10737418240L)); verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString(), eq(new UpdateOptions())); } @Test public void testUpdateFunctionWithRam() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "update", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -726,29 +656,24 @@ public void testUpdateFunctionWithRam() throws Exception { UpdateFunction updater = cmd.getUpdater(); - assertEquals(fnName, updater.getFunctionName()); - assertEquals(inputTopicName, updater.getInputs()); - assertEquals(outputTopicName, updater.getOutput()); - assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(5656565656l)); + assertEquals(FN_NAME, updater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, updater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, updater.getOutput()); + assertEquals(updater.getFunctionConfig().getResources().getRam(), Long.valueOf(5656565656L)); // cpu/disk should be default assertEquals(updater.getFunctionConfig().getResources().getCpu(), 1.0); - assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l)); + assertEquals(updater.getFunctionConfig().getResources().getDisk(), Long.valueOf(10737418240L)); verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString(), eq(new UpdateOptions())); } @Test public void testUpdateFunctionWithDisk() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "update", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -757,29 +682,24 @@ public void testUpdateFunctionWithDisk() throws Exception { UpdateFunction updater = cmd.getUpdater(); - assertEquals(fnName, updater.getFunctionName()); - assertEquals(inputTopicName, updater.getInputs()); - assertEquals(outputTopicName, updater.getOutput()); - assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(8080808080808080l)); + assertEquals(FN_NAME, updater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, updater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, updater.getOutput()); + assertEquals(updater.getFunctionConfig().getResources().getDisk(), Long.valueOf(8080808080808080L)); // cpu/Ram should be default - assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(1073741824l)); + assertEquals(updater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L)); assertEquals(updater.getFunctionConfig().getResources().getCpu(), 1.0); verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString(), eq(new UpdateOptions())); } @Test public void testUpdateAuthData() throws Exception { - String fnName = TEST_NAME + "-function"; - String inputTopicName = TEST_NAME + "-input-topic"; - String outputTopicName = TEST_NAME + "-output-topic"; - - final String url = "file:" + JAR_NAME; cmd.run(new String[] { "update", - "--name", fnName, - "--inputs", inputTopicName, - "--output", outputTopicName, - "--jar", url, + "--name", FN_NAME, + "--inputs", INPUT_TOPIC_NAME, + "--output", OUTPUT_TOPIC_NAME, + "--jar", URL, "--tenant", "sample", "--namespace", "ns1", "--className", DummyFunction.class.getName(), @@ -789,12 +709,12 @@ public void testUpdateAuthData() throws Exception { UpdateFunction updater = cmd.getUpdater(); - assertEquals(fnName, updater.getFunctionName()); - assertEquals(inputTopicName, updater.getInputs()); - assertEquals(outputTopicName, updater.getOutput()); - assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(8080808080808080l)); + assertEquals(FN_NAME, updater.getFunctionName()); + assertEquals(INPUT_TOPIC_NAME, updater.getInputs()); + assertEquals(OUTPUT_TOPIC_NAME, updater.getOutput()); + assertEquals(updater.getFunctionConfig().getResources().getDisk(), Long.valueOf(8080808080808080L)); // cpu/Ram should be default - assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(1073741824l)); + assertEquals(updater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L)); assertEquals(updater.getFunctionConfig().getResources().getCpu(), 1.0); UpdateOptions updateOptions = new UpdateOptions(); updateOptions.setUpdateAuthData(true); diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java index 934b94182f5dc..726def1f0469d 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/utils/IOUtilsTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.pulsar.admin.cli.utils.IOUtils; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -145,4 +144,4 @@ public void test6() { // expected } } -} \ No newline at end of file +} diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java index 21b71eb042755..29b7ca949500c 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java @@ -18,7 +18,6 @@ */ package org.apache.pulsar.client.cli; -import java.net.MalformedURLException; import java.util.List; import java.util.Properties; import java.util.UUID; @@ -51,7 +50,7 @@ public void cleanup() throws Exception { } @Test - public void testInitialzation() throws MalformedURLException, InterruptedException, ExecutionException, PulsarAdminException { + public void testInitialzation() throws InterruptedException, ExecutionException, PulsarAdminException { Properties properties = new Properties(); properties.setProperty("serviceUrl", brokerUrl.toString()); From c8f077a961dfd66e60c00a6f4c8d3b9fdc91eeed Mon Sep 17 00:00:00 2001 From: Sergii Zhevzhyk Date: Wed, 4 Mar 2020 22:00:27 +0100 Subject: [PATCH 2/2] Fix a problem after refactoring of the tests in the pulsar-client-tools-test module --- .../test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java index ddd8ce877dd9d..c162c4b3f345a 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java @@ -553,7 +553,7 @@ public void testCreateFunctionWithCpu() throws Exception { assertEquals(FN_NAME, creater.getFunctionName()); assertEquals(INPUT_TOPIC_NAME, creater.getInputs()); - assertEquals(INPUT_TOPIC_NAME, creater.getOutput()); + assertEquals(OUTPUT_TOPIC_NAME, creater.getOutput()); assertEquals(creater.getFunctionConfig().getResources().getCpu(), 5.0); // Disk/Ram should be default assertEquals(creater.getFunctionConfig().getResources().getRam(), Long.valueOf(1073741824L));