Github user GJL commented on a diff in the pull request:
https://github.com/apache/flink/pull/6320#discussion_r202299810
--- Diff:
flink-runtime/src/test/java/org/apache/flink/runtime/entrypoint/EntrypointClusterConfigurationParserFactoryTest.java
---
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.entrypoint;
+
+import org.apache.flink.runtime.entrypoint.parser.CommandLineParser;
+import org.apache.flink.util.TestLogger;
+
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests for the {@link EntrypointClusterConfigurationParserFactory}.
+ */
+public class EntrypointClusterConfigurationParserFactoryTest extends
TestLogger {
+
+ @Test
+ public void testEntrypointClusterConfigurationParsing() throws
FlinkParseException {
+ final CommandLineParser<EntrypointClusterConfiguration>
commandLineParser = new CommandLineParser<>(new
EntrypointClusterConfigurationParserFactory());
+
+ final String configDir = "/foo/bar";
+ final int restPort = 1234;
+ final String key = "key";
+ final String value = "value";
+ final String arg1 = "arg1";
+ final String arg2 = "arg2";
+ final String[] args = {"--configDir", configDir, "-r",
String.valueOf(restPort), String.format("-D%s=%s", key, value), arg1, arg2};
+
+ final EntrypointClusterConfiguration clusterConfiguration =
commandLineParser.parse(args);
+
+ assertThat(clusterConfiguration.getConfigDir(),
is(equalTo(configDir)));
+ assertThat(clusterConfiguration.getRestPort(),
is(equalTo(restPort)));
+ final Properties dynamicProperties =
clusterConfiguration.getDynamicProperties();
+
+ assertThat(dynamicProperties, hasEntry(key, value));
+
+ assertThat(clusterConfiguration.getArgs(),
arrayContaining(arg1, arg2));
+ }
+
+ @Test
+ public void testOnlyRequiredArguments() throws FlinkParseException {
+ final CommandLineParser<EntrypointClusterConfiguration>
commandLineParser = new CommandLineParser<>(new
EntrypointClusterConfigurationParserFactory());
+
+ final String configDir = "/foo/bar";
+ final String[] args = {"--configDir", configDir};
+
+ final EntrypointClusterConfiguration clusterConfiguration =
commandLineParser.parse(args);
+
+ assertThat(clusterConfiguration.getConfigDir(),
is(equalTo(configDir)));
+ assertThat(clusterConfiguration.getRestPort(), is(equalTo(-1)));
+ }
+
+ @Test(expected = FlinkParseException.class)
+ public void testMissingRequiredArgument() throws FlinkParseException {
+ final CommandLineParser<EntrypointClusterConfiguration>
commandLineParser = new CommandLineParser<>(new
EntrypointClusterConfigurationParserFactory());
+ final String[] args = {};
+
+ commandLineParser.parse(args);
+ fail("Expected an FlinkParseException.");
--- End diff --
With `fail` is superfluous here.
```
@Test(expected = FlinkParseException.class)
public void testMissingRequiredArgument() throws FlinkParseException {
try {
final CommandLineParser<ClusterConfiguration>
commandLineParser = new CommandLineParser<>(new
ClusterConfigurationParserFactory());
final String[] args = {};
commandLineParser.parse(args);
} catch (Exception e) {}
}
```
would already fail with:
```
java.lang.AssertionError: Expected exception:
org.apache.flink.runtime.entrypoint.FlinkParseException
at
org.junit.internal.runners.statements.ExpectException.evaluate(ExpectException.java:32)
at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:55)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
at
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
at
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at
com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:68)
at
com.intellij.rt.execution.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:47)
at
com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:242)
at
com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:70)
```
---
