Author: buildbot
Date: Tue Sep 22 10:14:09 2015
New Revision: 966327
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/org-apache-sling-junit-bundles.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 22 10:14:09 2015
@@ -1 +1 @@
-1704509
+1704513
Modified:
websites/staging/sling/trunk/content/documentation/bundles/org-apache-sling-junit-bundles.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/org-apache-sling-junit-bundles.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/org-apache-sling-junit-bundles.html
Tue Sep 22 10:14:09 2015
@@ -133,7 +133,7 @@ the test class names, like for example:<
<p>The <code>TeleporterRule</code> supplied by this bundle makes it easy to
write such tests, as it takes care of
all the mechanics of creating the test bundle, adding the above header,
installing it etc.</p>
<p>Using this rule the server-side tests can be mixed with other tests in the
source code if that's convenient, it just
-requires the <code>junit.core</code>and <code>junit.teleporter</code> modules
described on this page to create such tests. </p>
+requires the <code>junit.core</code> and <code>junit.teleporter</code> modules
described on this page to create such tests. </p>
<p>Here's a basic example of a server-side test that accesses OSGi
services:</p>
<div class="codehilite"><pre><span class="n">public</span> <span
class="n">class</span> <span class="n">BasicTeleporterTest</span> <span
class="p">{</span>
@@ -174,7 +174,7 @@ and combining them using JUnit's <code>R
<p>To try the JUnitServlet interactively, you can install the
<a
href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/sample-tests";>org.apache.sling.testing.samples.sampletests</a>
bundle, or any other bundle that contains tests and a
<code>Sling-Test-Regexp</code> bundle header that points to them, as
-described above. Or use the <code>TeleporterRule</code>and set a breakpoint in
the tests execution, when the test bundle in
+described above. Or use the <code>TeleporterRule</code> and set a breakpoint
in the tests execution, when the test bundle in
installed and listed by the test servlet.</p>
<p>To list the available tests, open <code>/system/sling/junit/</code> in your
browser. The servlet shows available tests and allows
you to execute them via a POST request.</p>
@@ -183,8 +183,9 @@ you to execute them via a POST request.<
<p>The JUnitServlet provides various output formats, including in particular
JSON, see
<code>/system/sling/junit/.json</code> for example.</p>
<h2
id="orgapacheslingjunitteleporter-client-side-teleporterrule-support">org.apache.sling.junit.teleporter:
client-side TeleporterRule support<a class="headerlink"
href="#orgapacheslingjunitteleporter-client-side-teleporterrule-support"
title="Permanent link">¶</a></h2>
-<p>This module provides the <code>ClientSideTeleporter</code> which the
<code>TeleporterRule</code> uses to teleport the tests
-to the server side. It is not a bundle, as it's used on the client only, as a
dependency when running the tests.</p>
+<p>This module provides the <code>ClientSideTeleporter</code> which the
<code>TeleporterRule</code> uses to package the server-side tests
+in bundles that's installed temporarily on the test server. </p>
+<p>This module is not a bundle, as it's used on the client only, as a
dependency when running the tests.</p>
<p>A <code>TeleporterRule.Customizer</code> is used to setup the
<code>ClientSideTeleporter</code>. That customizer is instantiated dynamically
based on a String passed to the <code>TeleporterRule</code> creation code.</p>
<p>As an example from our <code>launchpad/integration-tests</code> module,
this call</p>
@@ -243,7 +244,7 @@ same request again. </p>
but using the newer <code>TeleporterRule</code> described above is much
simpler. As a result, this bundle
should only be needed for existing tests that were written using its
mechanisms. </p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1704509 by bdelacretaz on Tue, 22 Sep 2015 10:07:27 +0000
+ Rev. 1704513 by bdelacretaz on Tue, 22 Sep 2015 10:13:52 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
