You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2014/10/21 10:18:18 UTC
svn commit: r926299 - in /websites/staging/sling/trunk/content: ./ documentation/development/sling-testing-tools.html downloads.html

Author: buildbot
Date: Tue Oct 21 08:18:18 2014
New Revision: 926299

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html
    websites/staging/sling/trunk/content/downloads.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Oct 21 08:18:18 2014
@@ -1 +1 @@
-1632684
+1633307

Modified: websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html Tue Oct 21 08:18:18 2014
@@ -147,6 +147,34 @@ For tighter integration with Sling, the 
 <li>To execute a test, the scriptable tests provider makes an HTTP requests to the test node's path, with a <code>.test.txt</code> selector and extension, and expects the output to contain only the string <code>TEST_PASSED</code>. Empty lines and comment lines starting with a hash sign (#) are ignored in the output, and other lines are reported as failures.</li>
 </ul>
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/integration-tests/src/test/java/org/apache/sling/testing/samples/integrationtests/serverside/scriptable/ScriptableTestsTest.java">ScriptableTestsTest</a> class, from the integration test samples module described below, sets up such a test node and its accompanying script, and calls the JUnitServlet to execute the test. It can be used as a detailed example of how this works.</p>
+<p>Here's a minimal example that sets up and executes a scriptable test:</p>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">Fjcr</span><span class="p">:</span><span class="n">primaryNodeType</span><span class="p">=</span><span class="n">sling</span><span class="p">:</span><span class="n">Folder</span> <span class="o">-</span><span class="n">Fsling</span><span class="p">:</span><span class="n">resourceType</span><span class="p">=</span><span class="n">foo</span> <span class="o">-</span><span class="n">Fjcr</span><span class="p">:</span><span class="n">mixinTypes</span><span class="p">=</span><span class="n">sling</span><span class="p">:</span><span class="n">Test</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><sp
 an class="n">foo</span>
+<span class="p">...</span>
+$ <span class="n">echo</span> <span class="n">TEST_PASSED</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">test</span><span class="p">.</span><span class="n">txt</span><span class="p">.</span><span class="n">esp</span> <span class="p">;</span> <span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">T</span><span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">test</span><span class="p">.</span><span class="n">txt</span><span class="p">.</span><span class="n">esp</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span cl
 ass="n">test</span><span class="p">.</span><span class="n">txt</span><span class="p">.</span><span class="n">esp</span>
+</pre></div>
+
+
+<p>At this point, foo.test.txt is what the scriptable test framework will request, and that outputs just TEST_PASSED:</p>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="p">.</span><span class="n">test</span><span class="p">.</span><span class="n">txt</span>
+<span class="n">TEST_PASSED</span>
+</pre></div>
+
+
+<p>And a POST to the JUnit servlet returns information on the test's execution:</p>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">XPOST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">system</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">junit</span><span class="o">/</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">junit</span><span class="p">.</span><span class="n">scriptable</span><span class="p">.</span><span class="n">ScriptableTestsProvider</span><span class="p">.</span><span class="n">json</span>
+<span class="p">[{</span>
+    &quot;<span class="n">INFO_TYPE</span>&quot;<span class="p">:</span> &quot;<span class="n">test</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">description</span>&quot;<span class="p">:</span> &quot;<span class="n">verifyContent</span><span class="p">[</span>0<span class="p">](</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">junit</span><span class="p">.</span><span class="n">scriptable</span><span class="p">.</span><span class="n">TestAllPaths</span><span class="p">)</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">test_metadata</span>&quot;<span class="p">:</span> <span class="p">{</span>
+      &quot;<span class="n">test_execution_time_msec</span>&quot;<span class="p">:</span> 2
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">]</span>
+</pre></div>
+
+
+<p>Test failures would be included in this JSON representation - you can test that by modifying the script to fail a making the
+same request again.      </p>
 <h1 id="integration-tests-example">Integration tests example</h1>
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/integration-tests">testing/samples/integration-tests</a> module runs some simple integration tests against a Sling Launchpad instance that's setup from scratch before running the tests.</p>
 <p>This module's pom and Java code can be used as examples to setup your own integration testing modules for Sling-based apps - or for any other runnable jar that provides an http service.</p>
@@ -174,7 +202,7 @@ for an example of how to do that.</p>
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java">SlingRemoteExecutionRule</a> is a JUnit Rule that allows tests to be executed remotely in a Sling instance from an IDE, assuming the test is available on both sides.</p>
 <p>The <a href="https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote/src/main/java/org/apache/sling/junit/remote/exported/ExampleRemoteTest.java">ExampleRemoteTest</a> class demonstrates this. To run it from your IDE, set the <code>sling.remote.test.url</code> in the IDE to the URL of the JUnitServlet, like http://localhost:8080/system/sling/junit for example.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1465659 by bdelacretaz on Mon, 8 Apr 2013 15:01:29 +0000
+        Rev. 1633137 by bdelacretaz on Mon, 20 Oct 2014 12:42:07 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Tue Oct 21 08:18:18 2014
@@ -249,9 +249,9 @@ incubator releases of Apache Sling, have
 </tr>
 <tr>
 <td>Auth Core</td>
-<td>1.3.0</td>
-<td><a href="[preferred]/sling/org.apache.sling.auth.core-1.3.0.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.0.jar.md5">md5</a>)</td>
-<td><a href="[preferred]/sling/org.apache.sling.auth.core-1.3.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.0-source-release.zip.md5">md5</a>)</td>
+<td>1.3.2</td>
+<td><a href="[preferred]/sling/org.apache.sling.auth.core-1.3.2.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.2.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.2.jar.md5">md5</a>)</td>
+<td><a href="[preferred]/sling/org.apache.sling.auth.core-1.3.2-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.auth.core-1.3.2-source-release.zip.md5">md5</a>)</td>
 </tr>
 <tr>
 <td>Auth Form</td>
@@ -1034,7 +1034,7 @@ incubator releases of Apache Sling, have
 
 
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1632670 by rombert on Fri, 17 Oct 2014 21:21:27 +0000
+        Rev. 1633307 by asanso on Tue, 21 Oct 2014 08:17:58 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project