Github user HeartSaVioR commented on a diff in the pull request:
https://github.com/apache/storm/pull/2199#discussion_r134089305
--- Diff:
storm-server/src/test/java/org/apache/storm/scheduler/utils/ArtifactoryConfigLoaderTest.java
---
@@ -0,0 +1,352 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.storm.scheduler.utils;
+
+import org.apache.storm.Config;
+import org.apache.storm.utils.Time;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.After;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileWriter;
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Map;
+import org.yaml.snakeyaml.Yaml;
+
+public class ArtifactoryConfigLoaderTest {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(ArtifactoryConfigLoaderTest.class);
+ private Path tmpDirPath;
+
+ private class TestClass extends ArtifactoryConfigLoader {
+ String getData;
+ HashMap<String, String> getDataMap = new HashMap<String, String>();
+
+ public void setData(String api, String artifact, String data) {
+ if (api == null) {
+ getData = data;
+ } else {
+ getDataMap.put(artifact, data);
+ }
+ }
+
+ @Override
+ protected String doGet(String api, String artifact, String host,
Integer port) {
+ if (api == null) {
+ return getData;
+ }
+ return getDataMap.get(artifact);
+ }
+ };
+
+ @Before
+ public void createTempDir() throws Exception {
+ tmpDirPath =
Files.createTempDirectory("TestArtifactoryConfigLoader");
+ File f = tmpDirPath.toFile();
+ f.mkdir();
+ File dir=new File(f, "nimbus");
+ dir.mkdir();
+ }
+
+ private void recursiveDeleteFile(File dir) {
+ File[] listing = dir.listFiles();
+ if (listing != null) {
+ for (File f : listing) {
+ recursiveDeleteFile(f);
+ }
+ }
+ dir.delete();
+ }
+
+ @After
+ public void removeTempDir() throws Exception {
+ recursiveDeleteFile(tmpDirPath.toFile());
+ }
+
+ @Test
+ public void testInvalid() {
+ Config conf = new Config();
+ TestClass testClass = new TestClass();
+ testClass.prepare(conf);
+ Map ret = testClass.load();
+ Assert.assertNull("Unexpectedly returned not null", ret);
+ }
+
+ @Test
+ public void testPointingAtDirectory() {
+ // This is a test where we are configured to point right at an
artifact dir
+ Config conf = new Config();
+ conf.put(ArtifactoryConfigLoader.ARTIFACTORY_URI,
"http://bogushost.yahoo.com:9999/location/of/this/dir";);
+ conf.put(Config.STORM_LOCAL_DIR, tmpDirPath.toString());
+
+ TestClass testClass = new TestClass();
+
+ testClass.setData("Anything", "/location/of/this/dir",
+ "{\"children\" : [ { \"uri\" : \"/20160621204337.yaml\",
\"folder\" : false }]}" );
+ testClass.setData(null, null, "{one: 1, two: 2, three: 3, four :
4}");
+ testClass.prepare(conf);
+ Map ret = testClass.load();
+
+ Assert.assertNotNull("Unexpectedly returned null", ret);
+ Assert.assertEquals(1, ret.get("one"));
+ Assert.assertEquals(2, ret.get("two"));
+ Assert.assertEquals(3, ret.get("three"));
+ Assert.assertEquals(4, ret.get("four"));
+
+ // Now let's load w/o setting up gets and we should still get
valid map back
+ TestClass tc2 = new TestClass();
+ tc2.prepare(conf);
+ Map ret2 = tc2.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret2);
+ Assert.assertEquals(1, ret2.get("one"));
+ Assert.assertEquals(2, ret2.get("two"));
+ Assert.assertEquals(3, ret2.get("three"));
+ Assert.assertEquals(4, ret2.get("four"));
+ }
+
+ @Test
+ public void testArtifactUpdate() {
+ // This is a test where we are configured to point right at an
artifact dir
+ Config conf = new Config();
+ conf.put(ArtifactoryConfigLoader.ARTIFACTORY_URI,
"http://bogushost.yahoo.com:9999/location/of/test/dir";);
+ conf.put(Config.STORM_LOCAL_DIR, tmpDirPath.toString());
+
+ Time.startSimulating();
+
+ try {
+ TestClass testClass = new TestClass();
+
+ testClass.setData("Anything", "/location/of/test/dir",
+ "{\"children\" : [ { \"uri\" :
\"/20160621204337.yaml\", \"folder\" : false }]}" );
+ testClass.setData(null, null, "{one: 1, two: 2, three: 3}");
+ testClass.prepare(conf);
+ Map ret = testClass.load();
+
+ Assert.assertNotNull("Unexpectedly returned null", ret);
+ Assert.assertEquals(1, ret.get("one"));
+ Assert.assertEquals(2, ret.get("two"));
+ Assert.assertEquals(3, ret.get("three"));
+ Assert.assertNull("Unexpectedly contained \"four\"",
ret.get("four"));
+
+ // Now let's load w/o setting up gets and we should still get
valid map back
+ TestClass tc2 = new TestClass();
+ tc2.prepare(conf);
+ Map ret2 = tc2.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret2);
+ Assert.assertEquals(1, ret2.get("one"));
+ Assert.assertEquals(2, ret2.get("two"));
+ Assert.assertEquals(3, ret2.get("three"));
+ Assert.assertNull("Unexpectedly did not return null",
ret2.get("four"));
+
+ // Now let's update it, but not advance time. Should get old
map again.
+ testClass.setData("Anything", "/location/of/test/dir",
+ "{\"children\" : [ { \"uri\" :
\"/20160621204999.yaml\", \"folder\" : false }]}");
+ testClass.setData(null, null, "{one: 1, two: 2, three: 3,
four: 4}");
+ ret = testClass.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret);
+ Assert.assertEquals(1, ret.get("one"));
+ Assert.assertEquals(2, ret.get("two"));
+ Assert.assertEquals(3, ret.get("three"));
+ Assert.assertNull("Unexpectedly did not return null, not
enough time passed!", ret.get("four"));
+
+ // Re-load from cached' file.
+ ret2 = tc2.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret2);
+ Assert.assertEquals(1, ret2.get("one"));
+ Assert.assertEquals(2, ret2.get("two"));
+ Assert.assertEquals(3, ret2.get("three"));
+ Assert.assertNull("Unexpectedly did not return null, last
cached result should not have \"four\"", ret2.get("four"));
+
+ // Now, let's advance time.
+ Time.advanceTime(11*60*1000);
+
+ ret = testClass.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret);
+ Assert.assertEquals(1, ret.get("one"));
+ Assert.assertEquals(2, ret.get("two"));
+ Assert.assertEquals(3, ret.get("three"));
+ Assert.assertEquals(4, ret.get("four"));
+
+ // Re-load from cached' file.
+ ret2 = tc2.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret2);
+ Assert.assertEquals(1, ret2.get("one"));
+ Assert.assertEquals(2, ret2.get("two"));
+ Assert.assertEquals(3, ret2.get("three"));
+ Assert.assertEquals(4, ret2.get("four"));
+ } finally {
+ Time.stopSimulating();
+ }
+ }
+
+ @Test
+ public void testPointingAtSpecificArtifact() {
+ // This is a test where we are configured to point right at a
single artifact
+ Config conf = new Config();
+ conf.put(ArtifactoryConfigLoader.ARTIFACTORY_URI,
"http://bogushost.yahoo.com:9999/location/of/this/artifact";);
+ conf.put(Config.STORM_LOCAL_DIR, tmpDirPath.toString());
+
+ TestClass testClass = new TestClass();
+
+ testClass.setData("Anything", "/location/of/this/artifact", "{
\"downloadUri\": \"anything\"}");
+ testClass.setData(null, null, "{one: 1, two: 2, three: 3}");
+ testClass.prepare(conf);
+ Map ret = testClass.load();
+
+ Assert.assertNotNull("Unexpectedly returned null", ret);
+ Assert.assertEquals(1, ret.get("one"));
+ Assert.assertEquals(2, ret.get("two"));
+ Assert.assertEquals(3, ret.get("three"));
+
+ // Now let's load w/o setting up gets and we should still get
valid map back
+ TestClass tc2 = new TestClass();
+ tc2.prepare(conf);
+ Map ret2 = tc2.load();
+ Assert.assertNotNull("Unexpectedly returned null", ret2);
+ Assert.assertEquals(1, ret2.get("one"));
+ Assert.assertEquals(2, ret2.get("two"));
+ Assert.assertEquals(3, ret2.get("three"));
+ }
+
+ @Test
+ public void testInvalidConfig() throws Exception {
--- End diff --
Looks like redundant with `testInvalid()`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
