You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by cb...@apache.org on 2018/07/07 17:06:02 UTC
svn commit: r1835324 - in
/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox:
JsonToolTests.java TestURLHandler.java XmlToolTests.java
Author: cbrisson
Date: Sat Jul 7 17:06:02 2018
New Revision: 1835324
URL: http://svn.apache.org/viewvc?rev=1835324&view=rev
Log:
[tools/view] Re-enable remote tests for JsonTool and XmlTool by means of a 'veltest:' URL protocol
Added:
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/TestURLHandler.java
Modified:
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/JsonToolTests.java
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/XmlToolTests.java
Modified: velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/JsonToolTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/JsonToolTests.java?rev=1835324&r1=1835323&r2=1835324&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/JsonToolTests.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/JsonToolTests.java Sat Jul 7 17:06:02 2018
@@ -23,7 +23,6 @@ import org.apache.velocity.tools.view.Js
import static org.junit.Assert.*;
import org.apache.velocity.tools.view.ViewContext;
-import org.junit.Ignore;
import org.junit.Test;
import javax.servlet.RequestDispatcher;
@@ -173,17 +172,13 @@ public class JsonToolTests
assertEquals(json.get("hey"), "bro");
}
- /*
- TODO - Test is ignored because it would fail while offline. We need to set up a local web server using Jetty to properly test it.
- Michael Osipov suggested this example:
- https://github.com/apache/maven-wagon/blob/master/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
- */
- public @Ignore @Test void testConfigFetchRemoteSource()
+ public @Test void testConfigFetchRemoteSource()
{
+ TestURLHandler.registerTestURL("foo.json", "{ \"foo\": \"bar\", \"array\": [ \"foo1\", \"foo2\"] }");
Map config = new HashMap();
- config.put("url", "http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/test/resources/foo.json?revision=1776916&view=co&pathrev=1776916");
+ config.put("url", "veltest://anywhere/foo.json");
JsonTool json = newJsonTool(config);
- assertEquals(json.get("foo"), "bar");
+ assertEquals("bar", json.get("foo"));
}
public @Test void testRequestContent()
Added: velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/TestURLHandler.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/TestURLHandler.java?rev=1835324&view=auto
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/TestURLHandler.java (added)
+++ velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/TestURLHandler.java Sat Jul 7 17:06:02 2018
@@ -0,0 +1,86 @@
+package org.apache.velocity.tools.test.blackbox;
+
+/*
+ * 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.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.*;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class TestURLHandler
+{
+ static final String TEST_PROTOCOL = "veltest";
+ static Map<String, String> contentMap;
+ static
+ {
+ contentMap = new ConcurrentHashMap<String, String>();
+ URLStreamHandlerFactory factory = new URLStreamHandlerFactory()
+ {
+ @Override
+ public URLStreamHandler createURLStreamHandler(String protocol)
+ {
+ URLStreamHandler handler = null;
+ if (TEST_PROTOCOL.equals(protocol))
+ {
+ handler = new URLStreamHandler()
+ {
+ @Override
+ protected URLConnection openConnection(URL url) throws IOException
+ {
+ return new URLConnection(url)
+ {
+ @Override
+ public void connect() throws IOException
+ {
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException
+ {
+ InputStream inputStream = null;
+ String path = getURL().getPath();
+ String content = contentMap.get(path);
+ if (content != null)
+ {
+ inputStream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
+ }
+ return inputStream;
+ }
+ };
+ }
+ };
+ }
+ return handler;
+ }
+ };
+ // this call may fail in non-fork mode if someone made it sooner (it's allowed only once)
+ URL.setURLStreamHandlerFactory(factory);
+ }
+
+ public static void registerTestURL(String path, String content)
+ {
+ if (path == null) path = "/";
+ else if (!path.startsWith("/")) path = "/" + path;
+ contentMap.put(path, content);
+ }
+}
Modified: velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/XmlToolTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/XmlToolTests.java?rev=1835324&r1=1835323&r2=1835324&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/XmlToolTests.java (original)
+++ velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/XmlToolTests.java Sat Jul 7 17:06:02 2018
@@ -21,7 +21,6 @@ package org.apache.velocity.tools.test.b
import org.apache.velocity.tools.view.ViewContext;
import org.apache.velocity.tools.view.XmlTool;
-import org.junit.Ignore;
import org.junit.Test;
import javax.servlet.RequestDispatcher;
@@ -179,10 +178,16 @@ public class XmlToolTests
Michael Osipov suggested this example:
https://github.com/apache/maven-wagon/blob/master/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
*/
- public @Ignore @Test void testConfigFetchRemoteSource()
+ public @Test void testConfigFetchRemoteSource()
{
+ TestURLHandler.registerTestURL("foo.xml",
+ "<foo>\n" +
+ " <bar name=\"a\"/>\n" +
+ " <baz>woogie</baz>\n" +
+ " <baz>wiggie</baz>\n" +
+ "</foo>");
Map config = new HashMap();
- config.put("url", "http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/test/resources/file.xml?revision=1776916&view=co&pathrev=1776916");
+ config.put("url", "veltest://anywhere/foo.xml");
XmlTool xml = newXmlTool(config);
assertEquals("woogie\n wiggie", xml.getText());
}