You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/12/10 13:49:24 UTC
(sling-org-apache-sling-launchpad-integration-tests) branch master updated (7af18f0 -> 46cea4a)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git
from 7af18f0 docs: remove stale references to Launchpad Testing and to running tests (#22)
new dcaec65 SLING-12534 Switch to Parent 62, Java 11
new 46cea4a SLING-12534 apply spotless formatting
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.sling-module.json | 5 +
pom.xml | 714 ++++++------
.../customizers/LaunchpadCustomizer.java | 55 +-
.../AbstractSlingResourceTypeRenderingTest.java | 39 +-
.../integrationtest/AuthenticatedTestUtil.java | 203 ++--
.../webapp/integrationtest/BundleContentTest.java | 44 +-
.../ContentLoaderMiscPropertyTest.java | 31 +-
.../webapp/integrationtest/CreateNodeTest.java | 78 +-
.../DavExDisabledAnonAccessTest.java | 41 +-
.../integrationtest/DavExIntegrationTest.java | 44 +-
.../webapp/integrationtest/EspLoadTest.java | 77 +-
.../webapp/integrationtest/EventsCounterTest.java | 53 +-
.../webapp/integrationtest/ExecuteScriptTest.java | 30 +-
.../integrationtest/ExportedPackagesTest.java | 38 +-
.../webapp/integrationtest/FileUploadTest.java | 40 +-
.../webapp/integrationtest/FiltersTest.java | 34 +-
.../webapp/integrationtest/FiltersTest2.java | 35 +-
.../webapp/integrationtest/ForwardTest.java | 73 +-
.../integrationtest/GeneratedNodeNameTest.java | 54 +-
.../integrationtest/GeneratedNodeNameTestStar.java | 52 +-
.../webapp/integrationtest/GetStarTest.java | 26 +-
.../webapp/integrationtest/GetWithSuffixTest.java | 56 +-
.../webapp/integrationtest/HttpPingTest.java | 40 +-
.../ImmediateScriptActivationTest.java | 47 +-
.../webapp/integrationtest/IncludeTest.java | 113 +-
.../webapp/integrationtest/InitialContentTest.java | 55 +-
.../integrationtest/JavascriptWrappersTest.java | 45 +-
.../webapp/integrationtest/JsonRenderingTest.java | 203 ++--
.../webapp/integrationtest/JspForwardTest.java | 82 +-
.../webapp/integrationtest/JspIncludeTest.java | 145 +--
.../webapp/integrationtest/JspScriptingTest.java | 84 +-
.../LaunchpadConfigInstallerTest.java | 28 +-
.../integrationtest/MappingEventsProxyTest.java | 29 +-
.../webapp/integrationtest/MiscUnsafeTest.java | 4 +-
.../webapp/integrationtest/MkdirTest.java | 54 +-
.../NodeTypeBasedRenderingTest.java | 65 +-
.../integrationtest/NodetypeRenderingTest.java | 77 +-
.../webapp/integrationtest/PostRedirectTest.java | 89 +-
.../integrationtest/PropertyRenderingTest.java | 42 +-
.../webapp/integrationtest/RangeStreamingTest.java | 37 +-
.../webapp/integrationtest/RedirectTest.java | 45 +-
.../webapp/integrationtest/RenderingTestBase.java | 34 +-
.../integrationtest/RequestAttributeTest.java | 66 +-
.../integrationtest/ResourceDecoratorTest.java | 28 +-
.../integrationtest/ResourceSuperTypeTest.java | 200 ++--
.../ScriptBindingsValuesProviderTest.java | 64 +-
.../integrationtest/ScriptBuiltinObjectsTest.java | 46 +-
.../integrationtest/ServerSideScriptsTest.java | 80 +-
.../integrationtest/ServletResolverConfigTest.java | 38 +-
.../SlingResourceTypeRenderingTest.java | 91 +-
.../integrationtest/SlingWebDavServletTest.java | 22 +-
.../webapp/integrationtest/StaticContentTest.java | 34 +-
.../webapp/integrationtest/StreamServletTest.java | 39 +-
.../integrationtest/SyntheticResourceTest.java | 39 +-
.../webapp/integrationtest/UploadFileTest.java | 128 +--
.../webapp/integrationtest/ValueFromTest.java | 69 +-
.../webapp/integrationtest/VanityPathTest.java | 39 +-
.../integrationtest/VersionInfoServletTest.java | 70 +-
.../integrationtest/VersionParameterTest.java | 50 +-
.../integrationtest/WebDavDoubleSlashTest.java | 22 +-
.../webapp/integrationtest/WebdavDeleteTest.java | 35 +-
.../webapp/integrationtest/WebdavOptionsTest.java | 32 +-
.../webapp/integrationtest/WebdavUploadTest.java | 69 +-
.../WriteableResourcesProxyTest.java | 29 +-
.../auth/AuthenticationResponseCodeTest.java | 103 +-
.../webapp/integrationtest/crud/CrudTest.java | 31 +-
.../indexing/FullTextIndexingTest.java | 41 +-
.../installer/InstallManyBundlesTest.java | 77 +-
.../installer/ServerSideInstallerTest.java | 51 +-
.../integrationtest/issues/SLING2082Test.java | 9 +-
.../integrationtest/issues/SLING2085Test.java | 10 +-
.../integrationtest/issues/SLING2094Test.java | 17 +-
.../integrationtest/issues/SLING2522Test.java | 31 +-
.../integrationtest/issues/SLING2617Test.java | 10 +-
.../integrationtest/issues/SLING457Test.java | 10 +-
.../integrationtest/issues/SLING760Test.java | 12 +-
.../webapp/integrationtest/jakarta/JsonTest.java | 8 +-
.../integrationtest/jaxb/JaxbMarshallingTest.java | 4 +-
.../integrationtest/login/AnonymousAccessTest.java | 64 +-
.../login/AuthRequestLoginTest.java | 61 +-
.../login/RedirectOnLoginErrorTest.java | 68 +-
.../login/RedirectOnLogoutTest.java | 57 +-
.../provisioning/EmbeddedModelTest.java | 47 +-
.../repository/RepoinitPathTest.java | 34 +-
.../repository/RepositoryInitializersTest.java | 45 +-
.../repository/RepositoryNameTest.java | 40 +-
.../repository/SystemUsersTest.java | 42 +-
.../PlanetsResourceProviderTest.java | 75 +-
.../resourceresolver/ResourceResolverApiTest.java | 94 +-
.../ResourceResolverGeneralTest.java | 1173 +++++++++-----------
.../runmodes/InactiveRunModeTest.java | 35 +-
.../scripting/SlingJSPTaglibTest.java | 113 +-
.../scripting/StandaloneScriptExecutionTest.java | 78 +-
.../integrationtest/scripting/htl/HtlTest.java | 96 +-
.../integrationtest/servlets/HeadServletTest.java | 70 +-
.../servlets/R6WhiteboardServletTest.java | 30 +-
.../servlets/RequestDispatcherServletTest.java | 29 +-
.../servlets/post/CustomPostOperationTest.java | 57 +-
.../servlets/post/PostResponseCreatorTest.java | 32 +-
.../servlets/post/PostSendErrorTest.java | 83 +-
.../servlets/post/PostServletAtCopyTest.java | 48 +-
.../servlets/post/PostServletAtDeleteTest.java | 63 +-
.../servlets/post/PostServletAtMoveTest.java | 75 +-
.../servlets/post/PostServletCopyTest.java | 426 +++----
.../servlets/post/PostServletCreateTest.java | 185 +--
.../servlets/post/PostServletDeleteParentTest.java | 65 +-
.../servlets/post/PostServletDeleteTest.java | 74 +-
.../servlets/post/PostServletImportTest.java | 685 +++++++-----
.../servlets/post/PostServletMoveTest.java | 493 ++++----
.../servlets/post/PostServletNopTest.java | 35 +-
.../servlets/post/PostServletOrderTest.java | 101 +-
.../post/PostServletOutputContentTypeTest.java | 89 +-
.../servlets/post/PostServletPatchTest.java | 58 +-
.../post/PostServletPrivilegesUpdateTest.java | 347 +++---
.../servlets/post/PostServletUpdateTest.java | 152 +--
.../servlets/post/PostServletVersionableTest.java | 360 +++---
.../servlets/post/PostStatusTest.java | 39 +-
.../servlets/post/PostToRootTest.java | 62 +-
.../servlets/post/ReferenceTypeHintTest.java | 50 +-
.../servlets/post/SlingAutoPropertiesTest.java | 81 +-
.../servlets/post/SlingDateValuesTest.java | 75 +-
.../servlets/post/SlingDefaultValuesTest.java | 55 +-
.../servlets/post/SlingPostProcessorTest.java | 43 +-
.../servlets/post/SlingSessionInfoTest.java | 31 +-
.../servlets/resolution/ExtensionServletTest.java | 55 +-
.../resolution/HtmlDefaultServletTest.java | 47 +-
.../servlets/resolution/PathsServletTest.java | 38 +-
.../resolution/PathsServletWithNodeTest.java | 45 +-
.../servlets/resolution/PrefixTest.java | 56 +-
.../servlets/resolution/PrioritiesTest.java | 37 +-
.../servlets/resolution/PutMethodServletTest.java | 54 +-
.../servlets/resolution/RequestObjectTest.java | 51 +-
.../resolution/RequestUriOptingServletTest.java | 36 +-
.../servlets/resolution/ResolutionTestBase.java | 142 ++-
.../servlets/resolution/SelectorServletTest.java | 71 +-
.../resolver/errorhandler/ErrorHandlingTest.java | 259 ++---
.../teleporter/BasicTeleporterTest.java | 40 +-
.../EmbeddedDependenciesTeleporterTest.java | 36 +-
.../integrationtest/teleporter/GeneratorRule.java | 50 +-
.../teleporter/LdapFilterTeleporterTest.java | 38 +-
.../teleporter/LocalServiceTeleporterTest.java | 52 +-
.../teleporter/MultipleRulesTeleporterTest.java | 59 +-
.../teleporter/ServicesPresentTest.java | 35 +-
.../integrationtest/teleporter/SomePojo.java | 28 +-
.../integrationtest/teleporter/SomeService.java | 28 +-
.../integrationtest/teleporter/SomeString.java | 28 +-
.../integrationtest/teleporter/SomeUtility.java | 34 +-
.../teleporter/TeleportedResourcesFolderTest.java | 46 +-
.../teleporter/TeleportedResourcesSingleTest.java | 48 +-
.../teleporter/TeleporterOptionsTest.java | 36 +-
.../integrationtest/util/EventsCounterUtil.java | 12 +-
.../webapp/integrationtest/util/JsonUtil.java | 61 +-
.../integrationtest/util/RepositoryTestUtil.java | 21 +-
.../integrationtest/util/ServerSideTestClient.java | 77 +-
.../webapp/integrationtest/xml/DomTest.java | 4 +-
.../webapp/integrationtest/xml/SaxTest.java | 3 +-
.../webapp/integrationtest/xml/XPathTest.java | 4 +-
.../sling/launchpad/webapp/jsp/TagFileTest.java | 67 +-
158 files changed, 6358 insertions(+), 6299 deletions(-)
create mode 100644 .sling-module.json
(sling-org-apache-sling-launchpad-integration-tests) 01/02: SLING-12534 Switch to Parent 62, Java 11
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git
commit dcaec659510a71e0a28d5fc1c588d307ddce8350
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Dec 10 13:18:28 2024 +0100
SLING-12534 Switch to Parent 62, Java 11
---
.sling-module.json | 5 +++++
pom.xml | 53 ++++++++++++++++++++++++++++++++---------------------
2 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+ "jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 86e5e44..50fece5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>48</version>
+ <version>62</version>
<relativePath />
</parent>
@@ -35,7 +35,7 @@
</description>
<properties>
- <sling.java.version>8</sling.java.version>
+ <sling.java.version>11</sling.java.version>
<!-- HTTP port of Sling instance to test -->
<http.port>8080</http.port>
@@ -87,13 +87,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -178,12 +171,6 @@
<version>1.1.2</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.12</version>
- <scope>compile</scope>
- </dependency>
<!-- for DavExIntegrationTest -->
@@ -217,11 +204,13 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- Dependencies for the Test Build and Run -->
@@ -229,6 +218,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
<version>2.1.2</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -256,41 +246,49 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
<version>2.3.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.3.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.classloader</artifactId>
<version>1.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -299,14 +297,16 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -336,31 +336,37 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
<version>3.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>3.0.8</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.tools</artifactId>
<version>1.0.16</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.remote</artifactId>
<version>1.0.12</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.core</artifactId>
<version>1.0.28</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.teleporter</artifactId>
<version>1.0.20</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>commons-io</groupId>
@@ -378,26 +384,31 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.test-services</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.api</artifactId>
<version>1.2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.4.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
<version>3.6.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.9</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
(sling-org-apache-sling-launchpad-integration-tests) 02/02: SLING-12534 apply spotless formatting
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git
commit 46cea4aa8eeee4c3c3f3e0f8783556a7780f056c
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Dec 10 13:19:24 2024 +0100
SLING-12534 apply spotless formatting
---
pom.xml | 727 ++++++------
.../customizers/LaunchpadCustomizer.java | 55 +-
.../AbstractSlingResourceTypeRenderingTest.java | 39 +-
.../integrationtest/AuthenticatedTestUtil.java | 203 ++--
.../webapp/integrationtest/BundleContentTest.java | 44 +-
.../ContentLoaderMiscPropertyTest.java | 31 +-
.../webapp/integrationtest/CreateNodeTest.java | 78 +-
.../DavExDisabledAnonAccessTest.java | 41 +-
.../integrationtest/DavExIntegrationTest.java | 44 +-
.../webapp/integrationtest/EspLoadTest.java | 77 +-
.../webapp/integrationtest/EventsCounterTest.java | 53 +-
.../webapp/integrationtest/ExecuteScriptTest.java | 30 +-
.../integrationtest/ExportedPackagesTest.java | 38 +-
.../webapp/integrationtest/FileUploadTest.java | 40 +-
.../webapp/integrationtest/FiltersTest.java | 34 +-
.../webapp/integrationtest/FiltersTest2.java | 35 +-
.../webapp/integrationtest/ForwardTest.java | 73 +-
.../integrationtest/GeneratedNodeNameTest.java | 54 +-
.../integrationtest/GeneratedNodeNameTestStar.java | 52 +-
.../webapp/integrationtest/GetStarTest.java | 26 +-
.../webapp/integrationtest/GetWithSuffixTest.java | 56 +-
.../webapp/integrationtest/HttpPingTest.java | 40 +-
.../ImmediateScriptActivationTest.java | 47 +-
.../webapp/integrationtest/IncludeTest.java | 113 +-
.../webapp/integrationtest/InitialContentTest.java | 55 +-
.../integrationtest/JavascriptWrappersTest.java | 45 +-
.../webapp/integrationtest/JsonRenderingTest.java | 203 ++--
.../webapp/integrationtest/JspForwardTest.java | 82 +-
.../webapp/integrationtest/JspIncludeTest.java | 145 +--
.../webapp/integrationtest/JspScriptingTest.java | 84 +-
.../LaunchpadConfigInstallerTest.java | 28 +-
.../integrationtest/MappingEventsProxyTest.java | 29 +-
.../webapp/integrationtest/MiscUnsafeTest.java | 4 +-
.../webapp/integrationtest/MkdirTest.java | 54 +-
.../NodeTypeBasedRenderingTest.java | 65 +-
.../integrationtest/NodetypeRenderingTest.java | 77 +-
.../webapp/integrationtest/PostRedirectTest.java | 89 +-
.../integrationtest/PropertyRenderingTest.java | 42 +-
.../webapp/integrationtest/RangeStreamingTest.java | 37 +-
.../webapp/integrationtest/RedirectTest.java | 45 +-
.../webapp/integrationtest/RenderingTestBase.java | 34 +-
.../integrationtest/RequestAttributeTest.java | 66 +-
.../integrationtest/ResourceDecoratorTest.java | 28 +-
.../integrationtest/ResourceSuperTypeTest.java | 200 ++--
.../ScriptBindingsValuesProviderTest.java | 64 +-
.../integrationtest/ScriptBuiltinObjectsTest.java | 46 +-
.../integrationtest/ServerSideScriptsTest.java | 80 +-
.../integrationtest/ServletResolverConfigTest.java | 38 +-
.../SlingResourceTypeRenderingTest.java | 91 +-
.../integrationtest/SlingWebDavServletTest.java | 22 +-
.../webapp/integrationtest/StaticContentTest.java | 34 +-
.../webapp/integrationtest/StreamServletTest.java | 39 +-
.../integrationtest/SyntheticResourceTest.java | 39 +-
.../webapp/integrationtest/UploadFileTest.java | 128 +--
.../webapp/integrationtest/ValueFromTest.java | 69 +-
.../webapp/integrationtest/VanityPathTest.java | 39 +-
.../integrationtest/VersionInfoServletTest.java | 70 +-
.../integrationtest/VersionParameterTest.java | 50 +-
.../integrationtest/WebDavDoubleSlashTest.java | 22 +-
.../webapp/integrationtest/WebdavDeleteTest.java | 35 +-
.../webapp/integrationtest/WebdavOptionsTest.java | 32 +-
.../webapp/integrationtest/WebdavUploadTest.java | 69 +-
.../WriteableResourcesProxyTest.java | 29 +-
.../auth/AuthenticationResponseCodeTest.java | 103 +-
.../webapp/integrationtest/crud/CrudTest.java | 31 +-
.../indexing/FullTextIndexingTest.java | 41 +-
.../installer/InstallManyBundlesTest.java | 77 +-
.../installer/ServerSideInstallerTest.java | 51 +-
.../integrationtest/issues/SLING2082Test.java | 9 +-
.../integrationtest/issues/SLING2085Test.java | 10 +-
.../integrationtest/issues/SLING2094Test.java | 17 +-
.../integrationtest/issues/SLING2522Test.java | 31 +-
.../integrationtest/issues/SLING2617Test.java | 10 +-
.../integrationtest/issues/SLING457Test.java | 10 +-
.../integrationtest/issues/SLING760Test.java | 12 +-
.../webapp/integrationtest/jakarta/JsonTest.java | 8 +-
.../integrationtest/jaxb/JaxbMarshallingTest.java | 4 +-
.../integrationtest/login/AnonymousAccessTest.java | 64 +-
.../login/AuthRequestLoginTest.java | 61 +-
.../login/RedirectOnLoginErrorTest.java | 68 +-
.../login/RedirectOnLogoutTest.java | 57 +-
.../provisioning/EmbeddedModelTest.java | 47 +-
.../repository/RepoinitPathTest.java | 34 +-
.../repository/RepositoryInitializersTest.java | 45 +-
.../repository/RepositoryNameTest.java | 40 +-
.../repository/SystemUsersTest.java | 42 +-
.../PlanetsResourceProviderTest.java | 75 +-
.../resourceresolver/ResourceResolverApiTest.java | 94 +-
.../ResourceResolverGeneralTest.java | 1173 +++++++++-----------
.../runmodes/InactiveRunModeTest.java | 35 +-
.../scripting/SlingJSPTaglibTest.java | 113 +-
.../scripting/StandaloneScriptExecutionTest.java | 78 +-
.../integrationtest/scripting/htl/HtlTest.java | 96 +-
.../integrationtest/servlets/HeadServletTest.java | 70 +-
.../servlets/R6WhiteboardServletTest.java | 30 +-
.../servlets/RequestDispatcherServletTest.java | 29 +-
.../servlets/post/CustomPostOperationTest.java | 57 +-
.../servlets/post/PostResponseCreatorTest.java | 32 +-
.../servlets/post/PostSendErrorTest.java | 83 +-
.../servlets/post/PostServletAtCopyTest.java | 48 +-
.../servlets/post/PostServletAtDeleteTest.java | 63 +-
.../servlets/post/PostServletAtMoveTest.java | 75 +-
.../servlets/post/PostServletCopyTest.java | 426 +++----
.../servlets/post/PostServletCreateTest.java | 185 +--
.../servlets/post/PostServletDeleteParentTest.java | 65 +-
.../servlets/post/PostServletDeleteTest.java | 74 +-
.../servlets/post/PostServletImportTest.java | 685 +++++++-----
.../servlets/post/PostServletMoveTest.java | 493 ++++----
.../servlets/post/PostServletNopTest.java | 35 +-
.../servlets/post/PostServletOrderTest.java | 101 +-
.../post/PostServletOutputContentTypeTest.java | 89 +-
.../servlets/post/PostServletPatchTest.java | 58 +-
.../post/PostServletPrivilegesUpdateTest.java | 347 +++---
.../servlets/post/PostServletUpdateTest.java | 152 +--
.../servlets/post/PostServletVersionableTest.java | 360 +++---
.../servlets/post/PostStatusTest.java | 39 +-
.../servlets/post/PostToRootTest.java | 62 +-
.../servlets/post/ReferenceTypeHintTest.java | 50 +-
.../servlets/post/SlingAutoPropertiesTest.java | 81 +-
.../servlets/post/SlingDateValuesTest.java | 75 +-
.../servlets/post/SlingDefaultValuesTest.java | 55 +-
.../servlets/post/SlingPostProcessorTest.java | 43 +-
.../servlets/post/SlingSessionInfoTest.java | 31 +-
.../servlets/resolution/ExtensionServletTest.java | 55 +-
.../resolution/HtmlDefaultServletTest.java | 47 +-
.../servlets/resolution/PathsServletTest.java | 38 +-
.../resolution/PathsServletWithNodeTest.java | 45 +-
.../servlets/resolution/PrefixTest.java | 56 +-
.../servlets/resolution/PrioritiesTest.java | 37 +-
.../servlets/resolution/PutMethodServletTest.java | 54 +-
.../servlets/resolution/RequestObjectTest.java | 51 +-
.../resolution/RequestUriOptingServletTest.java | 36 +-
.../servlets/resolution/ResolutionTestBase.java | 142 ++-
.../servlets/resolution/SelectorServletTest.java | 71 +-
.../resolver/errorhandler/ErrorHandlingTest.java | 259 ++---
.../teleporter/BasicTeleporterTest.java | 40 +-
.../EmbeddedDependenciesTeleporterTest.java | 36 +-
.../integrationtest/teleporter/GeneratorRule.java | 50 +-
.../teleporter/LdapFilterTeleporterTest.java | 38 +-
.../teleporter/LocalServiceTeleporterTest.java | 52 +-
.../teleporter/MultipleRulesTeleporterTest.java | 59 +-
.../teleporter/ServicesPresentTest.java | 35 +-
.../integrationtest/teleporter/SomePojo.java | 28 +-
.../integrationtest/teleporter/SomeService.java | 28 +-
.../integrationtest/teleporter/SomeString.java | 28 +-
.../integrationtest/teleporter/SomeUtility.java | 34 +-
.../teleporter/TeleportedResourcesFolderTest.java | 46 +-
.../teleporter/TeleportedResourcesSingleTest.java | 48 +-
.../teleporter/TeleporterOptionsTest.java | 36 +-
.../integrationtest/util/EventsCounterUtil.java | 12 +-
.../webapp/integrationtest/util/JsonUtil.java | 61 +-
.../integrationtest/util/RepositoryTestUtil.java | 21 +-
.../integrationtest/util/ServerSideTestClient.java | 77 +-
.../webapp/integrationtest/xml/DomTest.java | 4 +-
.../webapp/integrationtest/xml/SaxTest.java | 3 +-
.../webapp/integrationtest/xml/XPathTest.java | 4 +-
.../sling/launchpad/webapp/jsp/TagFileTest.java | 67 +-
157 files changed, 6354 insertions(+), 6311 deletions(-)
diff --git a/pom.xml b/pom.xml
index 50fece5..421fdf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
- <!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
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.
@@ -16,62 +16,319 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>62</version>
- <relativePath />
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>62</version>
+ <relativePath />
+ </parent>
- <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
- <packaging>jar</packaging>
- <version>13-SNAPSHOT</version>
+ <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+ <version>13-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <name>Apache Sling Launchpad Integration Tests</name>
- <description>
- Sling Integration Tests, contains integration tests that
- are used by the testing project and other upstream testing projects.
- </description>
+ <name>Apache Sling Launchpad Integration Tests</name>
+ <description>Sling Integration Tests, contains integration tests that
+ are used by the testing project and other upstream testing projects.</description>
- <properties>
- <sling.java.version>11</sling.java.version>
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests.git</url>
+ </scm>
- <!-- HTTP port of Sling instance to test -->
- <http.port>8080</http.port>
+ <properties>
+ <sling.java.version>11</sling.java.version>
- <!-- path suffix for HTTP access to Sling test instance -->
- <http.base.path />
+ <!-- HTTP port of Sling instance to test -->
+ <http.port>8080</http.port>
- <!-- path suffix for WebDAV access to Sling test instance -->
- <webdav.workspace.path />
+ <!-- path suffix for HTTP access to Sling test instance -->
+ <http.base.path />
- <!-- hostname of Sling instance to test -->
- <test.host>localhost</test.host>
+ <!-- path suffix for WebDAV access to Sling test instance -->
+ <webdav.workspace.path />
- <!-- Timeout when checking for Sling readyness before starting tests -->
- <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
-
- <!-- Timeout for ClientSideTeleporter when waiting for server-side test to become available -->
- <ClientSideTeleporter.testReadyTimeoutSeconds>10</ClientSideTeleporter.testReadyTimeoutSeconds>
-
- <!-- Content-type for readiness check -->
- <launchpad.readiness.mediatype>.txt:text/plain</launchpad.readiness.mediatype>
+ <!-- hostname of Sling instance to test -->
+ <test.host>localhost</test.host>
- <jackrabbit.version>2.16.3</jackrabbit.version>
+ <!-- Timeout when checking for Sling readyness before starting tests -->
+ <HttpTestBase.readyTimeoutSeconds>62</HttpTestBase.readyTimeoutSeconds>
- <javadoc.excludePackageNames>org.apache.sling.*</javadoc.excludePackageNames>
- </properties>
+ <!-- Timeout for ClientSideTeleporter when waiting for server-side test to become available -->
+ <ClientSideTeleporter.testReadyTimeoutSeconds>10</ClientSideTeleporter.testReadyTimeoutSeconds>
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</developerConnection>
- <url>https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests.git</url>
- <tag>HEAD</tag>
- </scm>
+ <!-- Content-type for readiness check -->
+ <launchpad.readiness.mediatype>.txt:text/plain</launchpad.readiness.mediatype>
- <build>
- <plugins>
+ <jackrabbit.version>2.16.3</jackrabbit.version>
+
+ <javadoc.excludePackageNames>org.apache.sling.*</javadoc.excludePackageNames>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- for DavExIntegrationTest -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr2dav</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Pin some more Jackrabbit versions, to ensure all module versions are aligned -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Dependencies for the Test Build and Run -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.1.2</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Pin http client depenendencies to recent version.
+ Old ones are brought in by the testing tools and
+ using exclusions leads to weird results - classes not
+ seen at runtime -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.post</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.classloader</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.base</artifactId>
+ <version>3.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>3.0.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.tools</artifactId>
+ <version>1.0.16</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.junit.remote</artifactId>
+ <version>1.0.12</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.junit.core</artifactId>
+ <version>1.0.28</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.junit.teleporter</artifactId>
+ <version>1.0.20</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.6.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.9</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -80,335 +337,65 @@
<exclude>src/main/resources/**</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!--
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!--
SLING-1543, setup for running single integration tests with
-Dtest
-->
- <id>runTests</id>
- <activation>
- <property>
- <name>test</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
- <systemProperties>
- <!--
- Settings for running the integration against a specific Sling instance
- -->
- <property>
- <name>launchpad.http.server.url</name>
- <value>
- http://${test.host}:${http.port}/${http.base.path}
- </value>
- </property>
+ <id>runTests</id>
+ <activation>
<property>
- <name>launchpad.webdav.server.url</name>
- <value>
- http://${test.host}:${http.port}/${webdav.workspace.path}
- </value>
+ <name>test</name>
</property>
- <property>
- <name>HttpTestBase.readyTimeoutSeconds</name>
- <value>
- ${HttpTestBase.readyTimeoutSeconds}
- </value>
- </property>
- <property>
- <name>ClientSideTeleporter.testReadyTimeoutSeconds</name>
- <value>
- ${ClientSideTeleporter.testReadyTimeoutSeconds}
- </value>
- </property>
- <property>
- <name>launchpad.readiness.mediatype</name>
- <value>
- ${launchpad.readiness.mediatype}
- </value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.2</version>
- <scope>runtime</scope>
- </dependency>
-
-
- <!-- for DavExIntegrationTest -->
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr2dav</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Pin some more Jackrabbit versions, to ensure all module versions are aligned -->
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Dependencies for the Test Build and Run -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.1.2</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Pin http client depenendencies to recent version.
- Old ones are brought in by the testing tools and
- using exclusions leads to weird results - classes not
- seen at runtime -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlets.post</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.framework</artifactId>
- <version>1.9.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <version>1.6.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.base</artifactId>
- <version>3.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>3.0.8</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.tools</artifactId>
- <version>1.0.16</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.remote</artifactId>
- <version>1.0.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.core</artifactId>
- <version>1.0.28</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.junit.teleporter</artifactId>
- <version>1.0.20</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.test-services</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.6.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.9</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.16</version>
+ <configuration>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ <systemProperties>
+ <!--
+ Settings for running the integration against a specific Sling instance
+ -->
+ <property>
+ <name>launchpad.http.server.url</name>
+ <value>http://${test.host}:${http.port}/${http.base.path}</value>
+ </property>
+ <property>
+ <name>launchpad.webdav.server.url</name>
+ <value>http://${test.host}:${http.port}/${webdav.workspace.path}</value>
+ </property>
+ <property>
+ <name>HttpTestBase.readyTimeoutSeconds</name>
+ <value>${HttpTestBase.readyTimeoutSeconds}</value>
+ </property>
+ <property>
+ <name>ClientSideTeleporter.testReadyTimeoutSeconds</name>
+ <value>${ClientSideTeleporter.testReadyTimeoutSeconds}</value>
+ </property>
+ <property>
+ <name>launchpad.readiness.mediatype</name>
+ <value>${launchpad.readiness.mediatype}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java b/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
index b86d67a..77c8194 100644
--- a/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
+++ b/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
@@ -1,37 +1,39 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.junit.teleporter.customizers;
-import static org.junit.Assert.fail;
-
import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.launchpad.webapp.integrationtest.teleporter.TeleporterOptionsTest;
import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
+import static org.junit.Assert.fail;
+
/** TeleporterRule Customizer used for Sling launchpad integration tests.
- * Waits for Sling to be ready and sets the appropriate parameters
- * on the ClientSideTeleporter.
+ * Waits for Sling to be ready and sets the appropriate parameters
+ * on the ClientSideTeleporter.
*/
public class LaunchpadCustomizer implements TeleporterRule.Customizer {
- private final static HttpTest H = new HttpTest();
- private final static int testReadyTimeout = Integer.getInteger("ClientSideTeleporter.testReadyTimeoutSeconds",12);
-
+ private static final HttpTest H = new HttpTest();
+ private static final int testReadyTimeout = Integer.getInteger("ClientSideTeleporter.testReadyTimeoutSeconds", 12);
+
@Override
/** Customize the client-side TeleporterRule by first waiting
* for Sling to be ready and then setting it up with the test server
@@ -39,27 +41,28 @@ public class LaunchpadCustomizer implements TeleporterRule.Customizer {
*/
public void customize(TeleporterRule t, String options) {
// Used to test the options mechanism
- if(TeleporterOptionsTest.OPTIONS.equals(options)) {
+ if (TeleporterOptionsTest.OPTIONS.equals(options)) {
throw new TeleporterOptionsTest.OptionsException(options);
}
// Setup Sling and the ClientSideTeleporter
try {
H.setUp();
- } catch(Exception e) {
+ } catch (Exception e) {
fail("HttpTest setup failed: " + e);
}
- final ClientSideTeleporter cst = (ClientSideTeleporter)t;
+ final ClientSideTeleporter cst = (ClientSideTeleporter) t;
cst.setBaseUrl(HttpTest.HTTP_BASE_URL);
cst.setTestReadyTimeoutSeconds(testReadyTimeout);
cst.includeDependencyPrefix("org.apache.sling.launchpad.webapp");
-
+
// Get the testservices classes from that bundle, importing them
cst.includeDependencyPrefix("org.apache.sling.launchpad.testservices");
- cst.excludeDependencyPrefix(org.apache.sling.launchpad.testservices.events.EventsCounter.class.getPackage().getName());
+ cst.excludeDependencyPrefix(org.apache.sling.launchpad.testservices.events.EventsCounter.class
+ .getPackage()
+ .getName());
cst.excludeDependencyPrefix(org.apache.sling.launchpad.testservices.exported.StringTransformer.class.getName());
-
+
cst.setServerCredentials("admin", "admin");
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
index 37fbe00..384eb35 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
@@ -1,20 +1,22 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.launchpad.webapp.integrationtest;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +28,7 @@ import org.apache.sling.servlets.post.SlingPostConstants;
* script resolution
*/
public abstract class AbstractSlingResourceTypeRenderingTest extends RenderingTestBase {
-
+
protected String slingResourceType;
protected String secondFolderOfContentPath;
@@ -40,8 +42,9 @@ public abstract class AbstractSlingResourceTypeRenderingTest extends RenderingTe
// create the test node, under a path that's specific to this class to allow collisions
secondFolderOfContentPath = "" + System.currentTimeMillis();
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java
index 58c6453..607498f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java
@@ -1,29 +1,31 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpException;
@@ -40,15 +42,17 @@ import org.apache.sling.commons.testing.integration.HttpTest;
public class AuthenticatedTestUtil extends HttpTest {
/** Execute a POST request and check status */
- public void assertAuthenticatedAdminPostStatus(String url, int expectedStatusCode, List<NameValuePair> postParams, String assertMessage)
- throws IOException {
+ public void assertAuthenticatedAdminPostStatus(
+ String url, int expectedStatusCode, List<NameValuePair> postParams, String assertMessage)
+ throws IOException {
Credentials defaultcreds = new UsernamePasswordCredentials("admin", "admin");
assertAuthenticatedPostStatus(defaultcreds, url, expectedStatusCode, postParams, assertMessage);
}
/** Execute a POST request and check status */
- public void assertAuthenticatedPostStatus(Credentials creds, String url, int expectedStatusCode, List<NameValuePair> postParams, String assertMessage)
- throws IOException {
+ public void assertAuthenticatedPostStatus(
+ Credentials creds, String url, int expectedStatusCode, List<NameValuePair> postParams, String assertMessage)
+ throws IOException {
final PostMethod post = new PostMethod(url);
post.setFollowRedirects(false);
@@ -59,13 +63,13 @@ public class AuthenticatedTestUtil extends HttpTest {
try {
httpClient.getState().setCredentials(authScope, creds);
- if(postParams!=null) {
- final NameValuePair [] nvp = {};
+ if (postParams != null) {
+ final NameValuePair[] nvp = {};
post.setRequestBody(postParams.toArray(nvp));
}
final int status = httpClient.executeMethod(post);
- if(assertMessage == null) {
+ if (assertMessage == null) {
assertEquals(expectedStatusCode, status);
} else {
assertEquals(assertMessage, expectedStatusCode, status);
@@ -77,7 +81,8 @@ public class AuthenticatedTestUtil extends HttpTest {
/** Verify that given URL returns expectedStatusCode
* @throws IOException */
- public void assertAuthenticatedHttpStatus(Credentials creds, String urlString, int expectedStatusCode, String assertMessage) throws IOException {
+ public void assertAuthenticatedHttpStatus(
+ Credentials creds, String urlString, int expectedStatusCode, String assertMessage) throws IOException {
URL baseUrl = new URL(HTTP_BASE_URL);
AuthScope authScope = new AuthScope(baseUrl.getHost(), baseUrl.getPort(), AuthScope.ANY_REALM);
GetMethod getMethod = new GetMethod(urlString);
@@ -87,8 +92,8 @@ public class AuthenticatedTestUtil extends HttpTest {
httpClient.getState().setCredentials(authScope, creds);
final int status = httpClient.executeMethod(getMethod);
- if(assertMessage == null) {
- assertEquals(urlString,expectedStatusCode, status);
+ if (assertMessage == null) {
+ assertEquals(urlString, expectedStatusCode, status);
} else {
assertEquals(assertMessage, expectedStatusCode, status);
}
@@ -97,12 +102,17 @@ public class AuthenticatedTestUtil extends HttpTest {
}
}
-
/** retrieve the contents of given URL and assert its content type
* @param expectedContentType use CONTENT_TYPE_DONTCARE if must not be checked
* @throws IOException
* @throws HttpException */
- public String getAuthenticatedContent(Credentials creds, String url, String expectedContentType, List<NameValuePair> params, int expectedStatusCode) throws IOException {
+ public String getAuthenticatedContent(
+ Credentials creds,
+ String url,
+ String expectedContentType,
+ List<NameValuePair> params,
+ int expectedStatusCode)
+ throws IOException {
final GetMethod get = new GetMethod(url);
URL baseUrl = new URL(HTTP_BASE_URL);
@@ -112,39 +122,38 @@ public class AuthenticatedTestUtil extends HttpTest {
try {
httpClient.getState().setCredentials(authScope, creds);
- if(params != null) {
- final NameValuePair [] nvp = new NameValuePair[0];
+ if (params != null) {
+ final NameValuePair[] nvp = new NameValuePair[0];
get.setQueryString(params.toArray(nvp));
}
final int status = httpClient.executeMethod(get);
final InputStream is = get.getResponseBodyAsStream();
final StringBuffer content = new StringBuffer();
final String charset = get.getResponseCharSet();
- final byte [] buffer = new byte[16384];
+ final byte[] buffer = new byte[16384];
int n = 0;
- while( (n = is.read(buffer, 0, buffer.length)) > 0) {
+ while ((n = is.read(buffer, 0, buffer.length)) > 0) {
content.append(new String(buffer, 0, n, charset));
}
- assertEquals("Expected status " + expectedStatusCode + " for " + url + " (content=" + content + ")",
- expectedStatusCode,status);
+ assertEquals(
+ "Expected status " + expectedStatusCode + " for " + url + " (content=" + content + ")",
+ expectedStatusCode,
+ status);
final Header h = get.getResponseHeader("Content-Type");
- if(expectedContentType == null) {
- if(h!=null) {
+ if (expectedContentType == null) {
+ if (h != null) {
fail("Expected null Content-Type, got " + h.getValue());
}
- } else if(CONTENT_TYPE_DONTCARE.equals(expectedContentType)) {
+ } else if (CONTENT_TYPE_DONTCARE.equals(expectedContentType)) {
// no check
- } else if(h==null) {
- fail(
- "Expected Content-Type that starts with '" + expectedContentType
- +" but got no Content-Type header at " + url
- );
+ } else if (h == null) {
+ fail("Expected Content-Type that starts with '" + expectedContentType
+ + " but got no Content-Type header at " + url);
} else {
assertTrue(
- "Expected Content-Type that starts with '" + expectedContentType
- + "' for " + url + ", got '" + h.getValue() + "'",
- h.getValue().startsWith(expectedContentType)
- );
+ "Expected Content-Type that starts with '" + expectedContentType + "' for " + url + ", got '"
+ + h.getValue() + "'",
+ h.getValue().startsWith(expectedContentType));
}
return content.toString();
@@ -157,58 +166,62 @@ public class AuthenticatedTestUtil extends HttpTest {
* @param expectedContentType use CONTENT_TYPE_DONTCARE if must not be checked
* @throws IOException
* @throws HttpException */
- public String getAuthenticatedPostContent(Credentials creds, String url, String expectedContentType, List<NameValuePair> postParams, int expectedStatusCode) throws IOException {
+ public String getAuthenticatedPostContent(
+ Credentials creds,
+ String url,
+ String expectedContentType,
+ List<NameValuePair> postParams,
+ int expectedStatusCode)
+ throws IOException {
final PostMethod post = new PostMethod(url);
URL baseUrl = new URL(HTTP_BASE_URL);
AuthScope authScope = new AuthScope(baseUrl.getHost(), baseUrl.getPort(), AuthScope.ANY_REALM);
post.setDoAuthentication(true);
Credentials oldCredentials = httpClient.getState().getCredentials(authScope);
- try {
- httpClient.getState().setCredentials(authScope, creds);
-
- if(postParams!=null) {
- final NameValuePair [] nvp = {};
- post.setRequestBody(postParams.toArray(nvp));
- }
-
- final int status = httpClient.executeMethod(post);
- final InputStream is = post.getResponseBodyAsStream();
- final StringBuffer content = new StringBuffer();
- final String charset = post.getResponseCharSet();
- final byte [] buffer = new byte[16384];
- int n = 0;
- while( (n = is.read(buffer, 0, buffer.length)) > 0) {
- content.append(new String(buffer, 0, n, charset));
- }
- assertEquals("Expected status " + expectedStatusCode + " for " + url + " (content=" + content + ")",
- expectedStatusCode,status);
- final Header h = post.getResponseHeader("Content-Type");
- if(expectedContentType == null) {
- if(h!=null) {
- fail("Expected null Content-Type, got " + h.getValue());
- }
- } else if(CONTENT_TYPE_DONTCARE.equals(expectedContentType)) {
- // no check
- } else if(h==null) {
- fail(
- "Expected Content-Type that starts with '" + expectedContentType
- +" but got no Content-Type header at " + url
- );
- } else {
- assertTrue(
- "Expected Content-Type that starts with '" + expectedContentType
- + "' for " + url + ", got '" + h.getValue() + "'",
- h.getValue().startsWith(expectedContentType)
- );
- }
- return content.toString();
-
- } finally {
- httpClient.getState().setCredentials(authScope, oldCredentials);
- }
- }
+ try {
+ httpClient.getState().setCredentials(authScope, creds);
+ if (postParams != null) {
+ final NameValuePair[] nvp = {};
+ post.setRequestBody(postParams.toArray(nvp));
+ }
+
+ final int status = httpClient.executeMethod(post);
+ final InputStream is = post.getResponseBodyAsStream();
+ final StringBuffer content = new StringBuffer();
+ final String charset = post.getResponseCharSet();
+ final byte[] buffer = new byte[16384];
+ int n = 0;
+ while ((n = is.read(buffer, 0, buffer.length)) > 0) {
+ content.append(new String(buffer, 0, n, charset));
+ }
+ assertEquals(
+ "Expected status " + expectedStatusCode + " for " + url + " (content=" + content + ")",
+ expectedStatusCode,
+ status);
+ final Header h = post.getResponseHeader("Content-Type");
+ if (expectedContentType == null) {
+ if (h != null) {
+ fail("Expected null Content-Type, got " + h.getValue());
+ }
+ } else if (CONTENT_TYPE_DONTCARE.equals(expectedContentType)) {
+ // no check
+ } else if (h == null) {
+ fail("Expected Content-Type that starts with '" + expectedContentType
+ + " but got no Content-Type header at " + url);
+ } else {
+ assertTrue(
+ "Expected Content-Type that starts with '" + expectedContentType + "' for " + url + ", got '"
+ + h.getValue() + "'",
+ h.getValue().startsWith(expectedContentType));
+ }
+ return content.toString();
+
+ } finally {
+ httpClient.getState().setCredentials(authScope, oldCredentials);
+ }
+ }
private static long randomId = System.currentTimeMillis();
@@ -226,13 +239,13 @@ public class AuthenticatedTestUtil extends HttpTest {
postParams.add(new NameValuePair(":name", testUserId));
postParams.add(new NameValuePair("pwd", "testPwd"));
postParams.add(new NameValuePair("pwdConfirm", "testPwd"));
- Credentials creds = new UsernamePasswordCredentials("admin", "admin");
- final String msg = "Unexpected status while attempting to create test user at " + postUrl;
+ Credentials creds = new UsernamePasswordCredentials("admin", "admin");
+ final String msg = "Unexpected status while attempting to create test user at " + postUrl;
assertAuthenticatedPostStatus(creds, postUrl, HttpServletResponse.SC_OK, postParams, msg);
-
+
final String sessionInfoUrl = HTTP_BASE_URL + "/system/sling/info.sessionInfo.json";
- assertAuthenticatedHttpStatus(creds, sessionInfoUrl, HttpServletResponse.SC_OK,
- "session info failed for user " + testUserId);
+ assertAuthenticatedHttpStatus(
+ creds, sessionInfoUrl, HttpServletResponse.SC_OK, "session info failed for user " + testUserId);
return testUserId;
}
@@ -244,7 +257,7 @@ public class AuthenticatedTestUtil extends HttpTest {
List<NameValuePair> postParams = new ArrayList<NameValuePair>();
postParams.add(new NameValuePair(":name", testGroupId));
- //success would be a redirect to the welcome page of the webapp
+ // success would be a redirect to the welcome page of the webapp
assertAuthenticatedAdminPostStatus(postUrl, HttpServletResponse.SC_OK, postParams, null);
return testGroupId;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java
index 16a137f..6beacb8 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java
@@ -1,25 +1,27 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import java.io.IOException;
-
import javax.json.JsonObject;
+import java.io.IOException;
+
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
@@ -36,24 +38,24 @@ public class BundleContentTest extends HttpTestBase {
final String content = getContent(HTTP_BASE_URL + "/sling-test/sling/from-bundle.2.json", CONTENT_TYPE_JSON);
assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
-
+
public void testBundleContentParentList() throws IOException {
final String expected = "from-bundle";
final String content = getContent(HTTP_BASE_URL + "/sling-test/sling.2.json", CONTENT_TYPE_JSON);
assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
-
+
/**
* Test fix for SLING-1733 - BundleResourceProvider fails to find resources when multiple bundles have the same Sling-Bundle-Resources path
*/
- public void testBundleContentParentFromMultipleBundles() throws IOException{
+ public void testBundleContentParentFromMultipleBundles() throws IOException {
final String content = getContent(HTTP_BASE_URL + "/system.1.json", CONTENT_TYPE_JSON);
JsonObject jsonObj = JsonUtil.parseObject(content);
- //provided by the servlets.post bundle
+ // provided by the servlets.post bundle
assertTrue("Expected sling.js in the /system folder", jsonObj.containsKey("sling.js"));
- //provided by the launchpad.test-services bundle
+ // provided by the launchpad.test-services bundle
assertTrue("Expected sling-1733.txt in the /system folder", jsonObj.containsKey("sling-1733.txt"));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
index 30af5b8..5b708e1 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -29,8 +31,8 @@ public class ContentLoaderMiscPropertyTest extends HttpTestBase {
* Verify that the test node's properties are set correctly.
*/
public void testLoaded() throws IOException {
- final String content = getContent(
- HTTP_BASE_URL + "/sling-test/property-types-test/test-node.txt", CONTENT_TYPE_PLAIN);
+ final String content =
+ getContent(HTTP_BASE_URL + "/sling-test/property-types-test/test-node.txt", CONTENT_TYPE_PLAIN);
assertPropertyValue(content, "Resource type", "sling:propertySetTestNodeType");
assertPropertyValue(content, "string", "Sling");
@@ -51,5 +53,4 @@ public class ContentLoaderMiscPropertyTest extends HttpTestBase {
final String expected = String.format("%s: %s", name, value);
assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
index 62c8b02..0485913 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -30,22 +32,22 @@ public class CreateNodeTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/CreateNodeTest_1_" + System.currentTimeMillis();
// add some properties to the node
- final Map<String,String> props = new HashMap<String,String>();
- props.put("name1","value1");
- props.put("name2","value2");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("name1", "value1");
+ props.put("name2", "value2");
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
// get and check URL of created node
final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfNewNode + " must be accessible after createNode", 200, status);
final String responseBodyStr = get.getResponseBodyAsString();
assertTrue(responseBodyStr.contains("value1"));
assertTrue(responseBodyStr.contains("value2"));
@@ -66,39 +68,39 @@ public class CreateNodeTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/CreateNodeTest_2_" + System.currentTimeMillis();
// add some properties to the node
- final Map<String,String> props = new HashMap<String,String>();
- props.put("name1","value1B");
- props.put("name2","value2B");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("name1", "value1B");
+ props.put("name2", "value2B");
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props, null, true);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
// check node contents (not all renderings - those are tested above)
final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfNewNode + " must be accessible after createNode", 200, status);
final String responseBodyStr = get.getResponseBodyAsString();
assertTrue(responseBodyStr.contains("value1B"));
assertTrue(responseBodyStr.contains("value2B"));
- }
+ }
public void testCreateNodeWithNodeType() throws IOException {
final String url = HTTP_BASE_URL + "/CreateNodeTest_3_" + System.currentTimeMillis();
// add node type param
- final Map<String,String> props = new HashMap<String,String>();
- props.put("jcr:primaryType","nt:folder");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("jcr:primaryType", "nt:folder");
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
@@ -110,14 +112,14 @@ public class CreateNodeTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/CreateNodeTest_4_" + System.currentTimeMillis() + "/*";
// add node type param
- final Map<String,String> props = new HashMap<String,String>();
- props.put("jcr:primaryType","nt:folder");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("jcr:primaryType", "nt:folder");
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
@@ -129,16 +131,16 @@ public class CreateNodeTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/CreateNodeTest_5_" + System.currentTimeMillis();
// add node type param
- final Map<String,String> props = new HashMap<String,String>();
- props.put("jcr:primaryType","nt:folder");
- props.put("foo/jcr:primaryType","nt:folder");
- props.put("foo/bar/jcr:primaryType","nt:folder");
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("jcr:primaryType", "nt:folder");
+ props.put("foo/jcr:primaryType", "nt:folder");
+ props.put("foo/bar/jcr:primaryType", "nt:folder");
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
@@ -153,19 +155,19 @@ public class CreateNodeTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/CreateNodeTest_6_" + System.currentTimeMillis();
// add node type param
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
// POST and get URL of created node
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, props);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
// get and check URL of created node
final GetMethod get = new GetMethod(urlOfNewNode + DEFAULT_EXT);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfNewNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfNewNode + " must be accessible after createNode", 200, status);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java
index 6f915b9..3c92b64 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java
@@ -1,18 +1,20 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -30,14 +32,19 @@ public class DavExDisabledAnonAccessTest extends DavExIntegrationTest {
@Override
protected void configureServerAfterTest() throws Exception {
- assertPostStatus(ANON_SERVLET_URL, 200, Collections.singletonList(new NameValuePair("action", "enable")),
+ assertPostStatus(
+ ANON_SERVLET_URL,
+ 200,
+ Collections.singletonList(new NameValuePair("action", "enable")),
"Unable to enable anonymous access");
-
}
@Override
protected void configureServerBeforeTest() throws Exception {
- assertPostStatus(ANON_SERVLET_URL, 200, Collections.singletonList(new NameValuePair("action", "disable")),
+ assertPostStatus(
+ ANON_SERVLET_URL,
+ 200,
+ Collections.singletonList(new NameValuePair("action", "disable")),
"Unable to disable anonymous access");
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java
index 69c8762..8cd1781 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java
@@ -1,34 +1,32 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
import javax.jcr.Credentials;
-import javax.jcr.GuestCredentials;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.sling.commons.testing.integration.HttpTestBase;
@@ -38,7 +36,7 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
public class DavExIntegrationTest extends HttpTestBase {
private Repository repository;
- public static final String DAVEX_SERVER_URL = HTTP_BASE_URL + "/server/";
+ public static final String DAVEX_SERVER_URL = HTTP_BASE_URL + "/server/";
@Override
protected void setUp() throws Exception {
@@ -47,8 +45,7 @@ public class DavExIntegrationTest extends HttpTestBase {
repository = JcrUtils.getRepository(DAVEX_SERVER_URL);
}
- protected void configureServerBeforeTest() throws Exception {
- }
+ protected void configureServerBeforeTest() throws Exception {}
public void testDescriptor() throws Exception {
assertEquals("2.0", repository.getDescriptor(Repository.SPEC_VERSION_DESC));
@@ -91,6 +88,5 @@ public class DavExIntegrationTest extends HttpTestBase {
super.tearDown();
}
- protected void configureServerAfterTest() throws Exception {
- }
+ protected void configureServerAfterTest() throws Exception {}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
index 9cd446d..4097793 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
@@ -1,88 +1,91 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.servlet.http.HttpServletResponse;
+
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Test the SLING-428 esp load function */
public class EspLoadTest extends HttpTestBase {
-
+
private String basePath;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
basePath = "/" + getClass().getSimpleName() + "_" + System.currentTimeMillis();
}
-
+
public void testNestedInclude() throws Exception {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("scriptToInclude", "included-a.esp");
props.put(SLING_RESOURCE_TYPE, getClass().getSimpleName());
final TestNode tn = new TestNode(HTTP_BASE_URL + basePath, props);
final String subfolder = tn.scriptPath + "/subfolder";
testClient.mkdirs(WEBDAV_BASE_URL, subfolder);
- final String [] toDelete = {
- uploadTestScript(tn.scriptPath, "esp-load/main.esp", "html.esp"),
- uploadTestScript(tn.scriptPath, "esp-load/included-a.esp", "included-a.esp"),
- uploadTestScript(subfolder,
- "esp-load/subfolder/included-b.esp", "included-b.esp")
+ final String[] toDelete = {
+ uploadTestScript(tn.scriptPath, "esp-load/main.esp", "html.esp"),
+ uploadTestScript(tn.scriptPath, "esp-load/included-a.esp", "included-a.esp"),
+ uploadTestScript(subfolder, "esp-load/subfolder/included-b.esp", "included-b.esp")
};
try {
final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML);
-
- final String [] expectedStringsInOrder = {
- "main.esp before load",
- "included-a.esp before load",
- "included-b.esp",
- "included-a.esp after load",
- "main.esp after load",
- "Here's more from included-a"
+
+ final String[] expectedStringsInOrder = {
+ "main.esp before load",
+ "included-a.esp before load",
+ "included-b.esp",
+ "included-a.esp after load",
+ "main.esp after load",
+ "Here's more from included-a"
};
-
+
int pos = 0;
- for(String expected : expectedStringsInOrder) {
+ for (String expected : expectedStringsInOrder) {
final int newPos = content.indexOf(expected);
assertTrue("Content (" + content + ") must contain '" + expected + "'", newPos >= 0);
assertTrue("String '" + expected + "' must come after previous expected string", newPos > pos);
pos = newPos;
}
} finally {
- for(String s : toDelete) {
+ for (String s : toDelete) {
testClient.delete(s);
}
}
}
-
+
public void testNonExistentInclude() throws Exception {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
final String badScript = "nonexistent.esp";
props.put("scriptToInclude", badScript);
props.put(SLING_RESOURCE_TYPE, getClass().getSimpleName());
final TestNode tn = new TestNode(HTTP_BASE_URL + basePath, props);
final String toDelete = uploadTestScript(tn.scriptPath, "esp-load/main.esp", "html.esp");
try {
- assertHttpStatus(tn.nodeUrl + ".html", HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ assertHttpStatus(
+ tn.nodeUrl + ".html",
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"Including " + badScript + " must fail");
} finally {
testClient.delete(toDelete);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java
index 8a24b32..7bd6525 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java
@@ -1,23 +1,23 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertTrue;
-
import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.commons.testing.junit.Retry;
import org.apache.sling.commons.testing.junit.RetryRule;
@@ -27,36 +27,41 @@ import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/** Test the EventsCounter servlet and underlying events subsystems */
public class EventsCounterTest {
-
+
private static int initialResourceEventsCount;
private static String toDelete;
public static final String TOPIC = "org/apache/sling/api/resource/Resource/ADDED";
-
+
@Rule
public RetryRule retryRule = new RetryRule();
-
+
/** HTTP tests helper */
private static final HttpTest H = new HttpTest();
-
+
@BeforeClass
public static void setupClass() throws Exception {
H.setUp();
initialResourceEventsCount = EventsCounterUtil.getEventsCount(H, TOPIC);
- final String testResourcePath = HttpTest.HTTP_BASE_URL + "/testing/" + EventsCounterTest.class.getName() + "." + System.currentTimeMillis();
+ final String testResourcePath = HttpTest.HTTP_BASE_URL + "/testing/" + EventsCounterTest.class.getName() + "."
+ + System.currentTimeMillis();
toDelete = H.getTestClient().createNode(testResourcePath, null);
}
-
+
@AfterClass
public static void cleanup() throws Exception {
H.getTestClient().delete(toDelete);
H.tearDown();
}
-
+
@Retry
@Test
public void testResourceEvents() throws Exception {
- assertTrue("Expecting events counter to have changed", EventsCounterUtil.getEventsCount(H, TOPIC) > initialResourceEventsCount);
+ assertTrue(
+ "Expecting events counter to have changed",
+ EventsCounterUtil.getEventsCount(H, TOPIC) > initialResourceEventsCount);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
index f6bbb6a..a71761c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
@@ -1,26 +1,26 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
-
/** Test the executeScript test method */
public class ExecuteScriptTest extends RenderingTestBase {
-
+
public void testEspScript() throws Exception {
final String content = executeScript("serverscripts/servertest.esp");
assertContains(content, "ESP path = /apps/SlingTesting");
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java
index 74905f5..11a1a2c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java
@@ -1,18 +1,20 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -21,18 +23,18 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
public class ExportedPackagesTest extends HttpTestBase {
private void assertExported(String pack) throws Exception {
- final String content = getContent(HTTP_BASE_URL + "/.EXPORTED_PACKAGES.txt?package=" + pack, CONTENT_TYPE_PLAIN);
+ final String content =
+ getContent(HTTP_BASE_URL + "/.EXPORTED_PACKAGES.txt?package=" + pack, CONTENT_TYPE_PLAIN);
final String marker = "PACKAGE FOUND:";
assertTrue("Expecting '" + marker + "' in content '" + content + "'", content.contains(marker));
assertTrue("Expecting '" + pack + "' in content '" + content + "'", content.contains(pack));
}
-
+
public void testSlingApiPackage() throws Exception {
assertExported("org.apache.sling.api");
}
-
+
public void testPackageFromTestServices() throws Exception {
assertExported("org.apache.sling.launchpad.testservices.exported");
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
index 836c1e9..b19a4d1 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -23,10 +25,10 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Test uploading files to the Sling repository
* via WebDAV, as a first step towards testing the
- * complete content creation and rendering scenario.
+ * complete content creation and rendering scenario.
*/
public class FileUploadTest extends HttpTestBase {
-
+
/** This only tests the WebDAV interface. We know it works, so
* we're mostly testing our test code here ;-)
*/
@@ -34,19 +36,19 @@ public class FileUploadTest extends HttpTestBase {
final String testFile = "/integration-test/testfile.txt";
final InputStream data = getClass().getResourceAsStream(testFile);
try {
- assertNotNull("Local test file " + testFile + " must be found",data);
-
+ assertNotNull("Local test file " + testFile + " must be found", data);
+
final String webdavUrl = WEBDAV_BASE_URL + "/FileUploadTest." + System.currentTimeMillis() + ".txt";
-
+
// Upload a file via WebDAV, verify, delete and verify
assertHttpStatus(webdavUrl, 404, "Resource " + webdavUrl + " must not exist before test");
int status = testClient.upload(webdavUrl, data);
- assertEquals("upload must return status code 201",201,status);
+ assertEquals("upload must return status code 201", 201, status);
assertHttpStatus(webdavUrl, 200, "Resource " + webdavUrl + " must exist after upload");
testClient.delete(webdavUrl);
assertHttpStatus(webdavUrl, 404, "Resource " + webdavUrl + " must not exist anymore after deleting");
} finally {
- if(data!=null) {
+ if (data != null) {
data.close();
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java
index 81b343c..83713d4 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.sling.launchpad.webapp.integrationtest;
/* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -15,8 +33,10 @@ package org.apache.sling.launchpad.webapp.integrationtest;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
import org.apache.commons.httpclient.HttpMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
@@ -24,13 +44,13 @@ public class FiltersTest extends HttpTestBase {
public void testCounters() throws IOException {
HttpMethod get = assertHttpStatus(HTTP_BASE_URL + "/index.html", HttpServletResponse.SC_OK);
- final String [] headers = {
- "FILTER_COUNTER_SLING",
- "FILTER_COUNTER_NOPROP"
- };
- for(String header : headers) {
+ final String[] headers = {"FILTER_COUNTER_SLING", "FILTER_COUNTER_NOPROP"};
+ for (String header : headers) {
assertNotNull("Expecting header '" + header + "'", get.getResponseHeader(header));
- assertEquals("Expecting value 1 for header '" + header + "'", "1", get.getResponseHeader(header).getValue());
+ assertEquals(
+ "Expecting value 1 for header '" + header + "'",
+ "1",
+ get.getResponseHeader(header).getValue());
}
assertNull(get.getResponseHeader("FILTER_COUNTER_SLING_WITH_PATTERN"));
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java
index fee5ed0..f6f4986 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java
@@ -1,3 +1,21 @@
+/*
+ * 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.sling.launchpad.webapp.integrationtest;
/* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -15,8 +33,10 @@ package org.apache.sling.launchpad.webapp.integrationtest;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
import org.apache.commons.httpclient.HttpMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
@@ -24,14 +44,13 @@ public class FiltersTest2 extends HttpTestBase {
public void testCounters() throws IOException {
HttpMethod get = assertHttpStatus(HTTP_BASE_URL + "/system.json", HttpServletResponse.SC_OK);
- final String [] headers = {
- "FILTER_COUNTER_SLING",
- "FILTER_COUNTER_NOPROP",
- "FILTER_COUNTER_SLING_WITH_PATTERN"
- };
- for(String header : headers) {
+ final String[] headers = {"FILTER_COUNTER_SLING", "FILTER_COUNTER_NOPROP", "FILTER_COUNTER_SLING_WITH_PATTERN"};
+ for (String header : headers) {
assertNotNull("Expecting header '" + header + "'", get.getResponseHeader(header));
- assertEquals("Expecting value 1 for header '" + header + "'", "1", get.getResponseHeader(header).getValue());
+ assertEquals(
+ "Expecting value 1 for header '" + header + "'",
+ "1",
+ get.getResponseHeader(header).getValue());
}
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
index 31935f7..fa48793 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -26,10 +28,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
-
-
/** Test the {link ScriptHelper#forward) functionality */
- public class ForwardTest extends HttpTestBase {
+public class ForwardTest extends HttpTestBase {
private String nodeUrlA;
private String testTextA;
@@ -48,8 +48,9 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
// Create two test nodes and store their paths
testTextA = "Text A " + System.currentTimeMillis();
@@ -70,7 +71,7 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Node C is used for the infinite loop detection test
props.remove("pathToInclude");
- props.put("testInfiniteLoop","true");
+ props.put("testInfiniteLoop", "true");
nodeUrlC = testClient.createNode(url, props);
// Node D is used for the "force resource type" test
@@ -83,42 +84,42 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Script for forced resource type
scriptPath = "/apps/" + forcedResourceType;
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- toDelete.add(uploadTestScript(scriptPath,"forward-forced.esp","html.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "forward-forced.esp", "html.esp"));
// The main rendering script goes under /apps in the repository
scriptPath = "/apps/nt/unstructured";
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- toDelete.add(uploadTestScript(scriptPath,"forward-test.esp","html.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "forward-test.esp", "html.esp"));
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
- for(String script : toDelete) {
+ for (String script : toDelete) {
testClient.delete(script);
}
}
public void testWithoutForward() throws IOException {
final String content = getContent(nodeUrlA + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
IncludeTest.assertNoIncludeRequestAttributes(content);
}
public void testWithForward() throws IOException {
final String content = getContent(nodeUrlB + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is not included (" + content + ")",!content.contains(testTextB));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content + ")", !content.contains(testTextB));
IncludeTest.assertNoIncludeRequestAttributes(content);
}
public void testWithForwardAndExtension() throws IOException {
final String content = getContent(nodeUrlE + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is not included (" + content + ")",!content.contains(testTextB));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content + ")", !content.contains(testTextB));
IncludeTest.assertNoIncludeRequestAttributes(content);
}
@@ -129,8 +130,8 @@ import org.apache.sling.servlets.post.SlingPostConstants;
httpClient.executeMethod(get);
final String content = get.getResponseBodyAsString();
assertTrue(
- "Response contains infinite loop error message",
- content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
+ "Response contains infinite loop error message",
+ content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
// TODO: SLING-515, status is 500 when running the tests as part of the maven build
// but 200 if running tests against a separate instance started with mvn jetty:run
@@ -140,10 +141,12 @@ import org.apache.sling.servlets.post.SlingPostConstants;
public void testForcedResourceType() throws IOException {
final String content = getContent(nodeUrlD + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is included (" + content + ")",!content.contains(testTextB));
- assertTrue("Resource type has been forced (" + content + ")",content.contains("Forced resource type:" + forcedResourceType));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is included (" + content + ")", !content.contains(testTextB));
+ assertTrue(
+ "Resource type has been forced (" + content + ")",
+ content.contains("Forced resource type:" + forcedResourceType));
IncludeTest.assertNoIncludeRequestAttributes(content);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
index 99b6d47..0a4b7e9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -28,8 +30,9 @@ import org.apache.sling.servlets.post.SlingPostConstants;
*/
public class GeneratedNodeNameTest extends HttpTestBase {
- private final String postFolder = HTTP_BASE_URL + "/" + getClass().getSimpleName() ;
- private final String postUrl = postFolder + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ private final String postFolder = HTTP_BASE_URL + "/" + getClass().getSimpleName();
+ private final String postUrl =
+ postFolder + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
protected void setUp() throws Exception {
@@ -44,52 +47,53 @@ public class GeneratedNodeNameTest extends HttpTestBase {
}
public void testTitle() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("title", "Hello There");
final String location = testClient.createNode(postUrl, props);
final String expect = "hello_there";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testSlingPostNodeNameParam() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put(":name", "MyNodeName");
final String location = testClient.createNode(postUrl, props);
final String expect = "MyNodeName";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testSlingPostNodeNameHintParam() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put(":nameHint", "AnotherNodeName");
final String location = testClient.createNode(postUrl, props);
final String expect = "AnotherNodeName".toLowerCase();
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testTitleWithSavePrefix() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("./title", "Hello There 2");
props.put("title", "not this one");
final String location = testClient.createNode(postUrl, props);
final String expect = "hello_there_2";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testCollision() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("title", "Hello There");
// posting twice with the same title must work, and return different locations
final String locationA = testClient.createNode(postUrl, props);
final String locationB = testClient.createNode(postUrl, props);
- assertFalse("Locations A and B must be different (" + locationA + "," + locationB + ")",
+ assertFalse(
+ "Locations A and B must be different (" + locationA + "," + locationB + ")",
locationA.equals(locationB));
}
public void testNoParams() throws IOException {
final String location = testClient.createNode(postUrl, null);
- assertTrue("Location end with a digit",Character.isDigit(location.charAt(location.length() - 1)));
+ assertTrue("Location end with a digit", Character.isDigit(location.charAt(location.length() - 1)));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
index ceecf7a..cfaa764 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -28,55 +30,57 @@ import org.apache.sling.servlets.post.SlingPostConstants;
*/
public class GeneratedNodeNameTestStar extends HttpTestBase {
- private final String postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.STAR_CREATE_SUFFIX;
+ private final String postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.STAR_CREATE_SUFFIX;
public void testTitle() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("title", "Hello There");
final String location = testClient.createNode(postUrl, props);
final String expect = "hello_there";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testSlingPostNodeNameParam() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put(":name", "MyNodeName");
final String location = testClient.createNode(postUrl, props);
final String expect = "MyNodeName";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testSlingPostNodeNameHintParam() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put(":nameHint", "AnotherNodeName");
final String location = testClient.createNode(postUrl, props);
final String expect = "AnotherNodeName".toLowerCase();
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testTitleWithSavePrefix() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("./title", "Hello There 2");
props.put("title", "not this one");
final String location = testClient.createNode(postUrl, props);
final String expect = "hello_there_2";
- assertTrue("Location " + location + " ends with " + expect,location.endsWith(expect));
+ assertTrue("Location " + location + " ends with " + expect, location.endsWith(expect));
}
public void testCollision() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("title", "Hello There");
// posting twice with the same title must work, and return different locations
final String locationA = testClient.createNode(postUrl, props);
final String locationB = testClient.createNode(postUrl, props);
- assertFalse("Locations A and B must be different (" + locationA + "," + locationB + ")",
+ assertFalse(
+ "Locations A and B must be different (" + locationA + "," + locationB + ")",
locationA.equals(locationB));
}
public void testNoParams() throws IOException {
final String location = testClient.createNode(postUrl, null);
- assertTrue("Location end with a digit",Character.isDigit(location.charAt(location.length() - 1)));
+ assertTrue("Location end with a digit", Character.isDigit(location.charAt(location.length() - 1)));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
index e8475e3..b49c2bb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
index 3cd9e4d..f1268b9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
@@ -1,27 +1,29 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
/** GET requests with a suffix should fail with a 404, otherwise
* we get a lot of extra possible URLs which point to the same
* content.
@@ -37,7 +39,7 @@ public class GetWithSuffixTest extends RenderingTestBase {
// create the test node, under a path that's specific to this class to allow collisions
final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "_" + System.currentTimeMillis();
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
@@ -47,38 +49,38 @@ public class GetWithSuffixTest extends RenderingTestBase {
}
public void testWithExactUrl() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDelete);
}
}
public void testGETScript() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","GET.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "GET.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p>" + testText + "</p>"));
final String content2 = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertTrue("Content includes ESP marker",content2.contains("ESP template"));
- assertTrue("Content contains formatted test text",content2.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content2.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content2.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDelete);
}
}
public void testWithExtraPathA() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","txt.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "txt.esp");
try {
// expected to be found as resource with ext .txt and suffix
final String content = getContent(displayUrl + ".txt/extra.html", CONTENT_TYPE_PLAIN);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDelete);
}
@@ -88,7 +90,7 @@ public class GetWithSuffixTest extends RenderingTestBase {
* script name, verify that both give a 404
*/
public void testWithExtraPathB() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","GET.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "GET.esp");
try {
// expected to not be found as dispalyUrl has no dots
assertHttpStatus(displayUrl + "/extra/more.a4.html", HttpServletResponse.SC_NOT_FOUND);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
index c99e00a..f8b17fe 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -20,14 +22,12 @@ import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
-
/** Ping the Sling server to verify that our integration test
* setup is ok.
*/
public class HttpPingTest extends HttpTestBase {
-
- public void testWebServerRoot() throws Exception
- {
+
+ public void testWebServerRoot() throws Exception {
// by default, the Launchpad default servlet redirects / to starter.html
// but we keep it general to be on the safe side
final String url = HTTP_BASE_URL + "/";
@@ -36,13 +36,11 @@ public class HttpPingTest extends HttpTestBase {
final int status = httpClient.executeMethod(get);
assertEquals("Status must be 302 for " + url, 302, status);
final Header h = get.getResponseHeader("Location");
- assertNotNull("Location header must be provided",h);
+ assertNotNull("Location header must be provided", h);
assertTrue("Location header must end with .html", h.getValue().endsWith(".html"));
}
-
- public void test404() throws Exception
- {
+
+ public void test404() throws Exception {
assertHttpStatus(HTTP_BASE_URL + "/someNonExistentUrl", 404);
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java
index f6e25ca..7bb5172 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -26,22 +28,23 @@ public class ImmediateScriptActivationTest extends AbstractSlingResourceTypeRend
public static final int LOOP_COUNT = 10;
private final AtomicInteger counter = new AtomicInteger();
-
+
@Override
protected void setUp() throws Exception {
slingResourceType = getClass().getSimpleName() + "." + counter.incrementAndGet();
super.setUp();
}
-
- private void assertScriptActivation(String testId, String testScript, String extension, String expectedContent) throws IOException {
+
+ private void assertScriptActivation(String testId, String testScript, String extension, String expectedContent)
+ throws IOException {
final String testUrl = displayUrl + "." + testId + ".html";
{
final String content = getContent(testUrl, CONTENT_TYPE_HTML);
assertFalse("Expecting no rendering script initially", content.contains(expectedContent));
}
-
+
{
- final String toDelete = uploadTestScript(testScript,testId + ".html" + extension);
+ final String toDelete = uploadTestScript(testScript, testId + ".html" + extension);
try {
final String content = getContent(testUrl, CONTENT_TYPE_HTML);
assertContains(content, expectedContent);
@@ -50,16 +53,16 @@ public class ImmediateScriptActivationTest extends AbstractSlingResourceTypeRend
}
}
}
-
+
public void testEspActivation() throws IOException {
- for(int i=0; i < LOOP_COUNT; i++) {
+ for (int i = 0; i < LOOP_COUNT; i++) {
assertScriptActivation("test_" + i, "rendering-test.esp", ".esp", "ESP template");
}
}
-
+
public void testJspActivation() throws IOException {
- for(int i=0; i < LOOP_COUNT; i++) {
+ for (int i = 0; i < LOOP_COUNT; i++) {
assertScriptActivation("test_" + i, "rendering-test.jsp", ".jsp", "<h1>JSP rendering result</h1>");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
index 4694707..83fd029 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -26,9 +28,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
-
/** Test the {link ScriptHelper#include) functionality */
- public class IncludeTest extends HttpTestBase {
+public class IncludeTest extends HttpTestBase {
private String nodeUrlA;
private String testTextA;
@@ -46,8 +47,9 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
// Create two test nodes and store their paths
testTextA = "Text A " + System.currentTimeMillis();
@@ -68,7 +70,7 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Node C is used for the infinite loop detection test
props.remove("pathToInclude");
- props.put("testInfiniteLoop","true");
+ props.put("testInfiniteLoop", "true");
nodeUrlC = testClient.createNode(url, props);
// Node D is used for the "force resource type" test
@@ -81,45 +83,45 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Script for forced resource type
scriptPath = "/apps/" + forcedResourceType;
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- toDelete.add(uploadTestScript(scriptPath,"include-forced.esp","html.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "include-forced.esp", "html.esp"));
// The main rendering script goes under /apps in the repository
scriptPath = "/apps/nt/unstructured";
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- toDelete.add(uploadTestScript(scriptPath,"include-test.esp","html.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "include-test.esp", "html.esp"));
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
- for(String script : toDelete) {
+ for (String script : toDelete) {
testClient.delete(script);
}
}
public void testWithoutInclude() throws IOException {
final String content = getContent(nodeUrlA + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertFalse("Nothing has been included",content.contains("<p>Including"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertFalse("Nothing has been included", content.contains("<p>Including"));
assertNoIncludeRequestAttributes(content);
}
public void testWithInclude() throws IOException {
final String content = getContent(nodeUrlB + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
assertIncludeRequestAttributes(content);
}
public void testWithIncludeAndExtension() throws IOException {
final String content = getContent(nodeUrlE + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
assertIncludeRequestAttributes(content);
}
@@ -130,8 +132,8 @@ import org.apache.sling.servlets.post.SlingPostConstants;
httpClient.executeMethod(get);
final String content = get.getResponseBodyAsString();
assertTrue(
- "Response contains infinite loop error message",
- content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
+ "Response contains infinite loop error message",
+ content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
// TODO: SLING-515, status is 500 when running the tests as part of the maven build
// but 200 if running tests against a separate instance started with mvn jetty:run
@@ -141,11 +143,13 @@ import org.apache.sling.servlets.post.SlingPostConstants;
public void testForcedResourceType() throws IOException {
final String content = getContent(nodeUrlD + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
- assertTrue("Resource type has been forced (" + content + ")",content.contains("Forced resource type:" + testTextA));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
+ assertTrue(
+ "Resource type has been forced (" + content + ")",
+ content.contains("Forced resource type:" + testTextA));
assertIncludeRequestAttributes(content);
}
@@ -164,29 +168,20 @@ import org.apache.sling.servlets.post.SlingPostConstants;
// Servlet API attributes set on include
// except javax.servlet.include.query_string which not be set in request
- assertRequestAttribute(content, tag,
- "javax.servlet.include.request_uri");
- assertRequestAttribute(content, tag,
- "javax.servlet.include.context_path");
- assertRequestAttribute(content, tag,
- "javax.servlet.include.servlet_path");
+ assertRequestAttribute(content, tag, "javax.servlet.include.request_uri");
+ assertRequestAttribute(content, tag, "javax.servlet.include.context_path");
+ assertRequestAttribute(content, tag, "javax.servlet.include.servlet_path");
assertRequestAttribute(content, tag, "javax.servlet.include.path_info");
- assertRequestAttribute(content, tag,
- "javax.servlet.include.request_uri");
- assertRequestAttribute(content, tag,
- "javax.servlet.include.request_uri");
- assertRequestAttribute(content, tag,
- "org.apache.sling.api.include.servlet");
- assertRequestAttribute(content, tag,
- "org.apache.sling.api.include.resource");
- assertRequestAttribute(content, tag,
- "org.apache.sling.api.include.request_path_info");
+ assertRequestAttribute(content, tag, "javax.servlet.include.request_uri");
+ assertRequestAttribute(content, tag, "javax.servlet.include.request_uri");
+ assertRequestAttribute(content, tag, "org.apache.sling.api.include.servlet");
+ assertRequestAttribute(content, tag, "org.apache.sling.api.include.resource");
+ assertRequestAttribute(content, tag, "org.apache.sling.api.include.request_path_info");
}
- private static void assertRequestAttribute(final String content,
- final String tag,
- final String attrName) {
- assertTrue("Expected content contains '-" + tag + "-" + attrName + "-'",
- content.contains("-" + tag + "-" + attrName + "-"));
+ private static void assertRequestAttribute(final String content, final String tag, final String attrName) {
+ assertTrue(
+ "Expected content contains '-" + tag + "-" + attrName + "-'",
+ content.contains("-" + tag + "-" + attrName + "-"));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
index a83b082..34d2aff 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
@@ -1,17 +1,20 @@
-/* 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
+/*
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -24,33 +27,33 @@ public class InitialContentTest extends HttpTestBase {
public void testIndex() throws IOException {
final String expected = "Do not remove this comment, used for Launchpad integration tests";
final String content = getContent(HTTP_BASE_URL + "/index.html", CONTENT_TYPE_HTML);
- assertTrue("Content contains expected marker (" + content + ")",content.contains(expected));
+ assertTrue("Content contains expected marker (" + content + ")", content.contains(expected));
}
public void testRootRedirectProperty() throws IOException {
- final String expected = "\"sling:resourceType\":\"sling:redirect\"";
- final String content = getContent(HTTP_BASE_URL + "/.json", CONTENT_TYPE_JSON);
- assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
+ final String expected = "\"sling:resourceType\":\"sling:redirect\"";
+ final String content = getContent(HTTP_BASE_URL + "/.json", CONTENT_TYPE_JSON);
+ assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
public void testInitialContentA() throws IOException {
- final String expected = "42";
- final String content = getContent(
- HTTP_BASE_URL + "/sling-test/sling/initial-content-test/marker.txt", CONTENT_TYPE_PLAIN);
- assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
+ final String expected = "42";
+ final String content =
+ getContent(HTTP_BASE_URL + "/sling-test/sling/initial-content-test/marker.txt", CONTENT_TYPE_PLAIN);
+ assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
public void testInitialContentB() throws IOException {
- final String expected = "46";
- final String content = getContent(
- HTTP_BASE_URL + "/sling-test/initial-content-folder/folder-content-test/marker.txt", CONTENT_TYPE_PLAIN);
- assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
+ final String expected = "46";
+ final String content = getContent(
+ HTTP_BASE_URL + "/sling-test/initial-content-folder/folder-content-test/marker.txt",
+ CONTENT_TYPE_PLAIN);
+ assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
public void testInitialContentInSubNodeRoot() throws IOException {
final String expected = "\"testProperty\":\"value\"";
- final String content = getContent(
- HTTP_BASE_URL + "/sling-test.json", CONTENT_TYPE_JSON);
+ final String content = getContent(HTTP_BASE_URL + "/sling-test.json", CONTENT_TYPE_JSON);
assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
index 00dc466..a081c00 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -30,7 +32,7 @@ public class JavascriptWrappersTest extends HttpTestBase {
private void createNodes(TestNode n, String prefix, int levels) throws Exception {
String url = n.nodeUrl;
- while(levels >= 1) {
+ while (levels >= 1) {
url += "/" + prefix + levels;
testClient.createNode(url, null);
levels--;
@@ -58,19 +60,16 @@ public class JavascriptWrappersTest extends HttpTestBase {
try {
final String content = getContent(testRootNode.nodeUrl + ".html", CONTENT_TYPE_HTML);
- final String expected =
- "1 " + basePath + "/testnode\n"
- + "2 " + basePath + "/testnode/a3\n"
- + "3 " + basePath + "/testnode/a3/a2\n"
- + "4 " + basePath + "/testnode/a3/a2/a1\n"
- + "2 " + basePath + "/testnode/b1\n"
- + "2 " + basePath + "/testnode/c2\n"
- + "3 " + basePath + "/testnode/c2/c1\n"
- ;
+ final String expected = "1 " + basePath + "/testnode\n"
+ + "2 " + basePath + "/testnode/a3\n"
+ + "3 " + basePath + "/testnode/a3/a2\n"
+ + "4 " + basePath + "/testnode/a3/a2/a1\n"
+ + "2 " + basePath + "/testnode/b1\n"
+ + "2 " + basePath + "/testnode/c2\n"
+ + "3 " + basePath + "/testnode/c2/c1\n";
assertEquals(expected, content);
} finally {
testClient.delete(toDelete);
}
-
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
index 1a2fc14..4730450 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
@@ -1,27 +1,29 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
import org.slf4j.Logger;
@@ -31,10 +33,9 @@ import org.slf4j.LoggerFactory;
public class JsonRenderingTest extends HttpTestBase {
/** Logger instance */
- private static final Logger log =
- LoggerFactory.getLogger(JsonRenderingTest.class);
+ private static final Logger log = LoggerFactory.getLogger(JsonRenderingTest.class);
- private final String testPath = "/" + getClass().getSimpleName();
+ private final String testPath = "/" + getClass().getSimpleName();
private String postUrl;
private String testText;
@@ -52,9 +53,8 @@ public class JsonRenderingTest extends HttpTestBase {
// create the test node, under a path that's specific to this class to
// allow collisions
- postUrl = HTTP_BASE_URL + testPath + "_"
- + System.currentTimeMillis()
- + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ postUrl =
+ HTTP_BASE_URL + testPath + "_" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
createdNodeUrl = testClient.createNode(postUrl, props);
@@ -78,20 +78,17 @@ public class JsonRenderingTest extends HttpTestBase {
props.put("text", testText);
final String parentNodeUrl = testClient.createNode(postUrl, props);
- final String[] children = { "A", "B", "C" };
+ final String[] children = {"A", "B", "C"};
for (String child : children) {
props.put("child", child);
testClient.createNode(parentNodeUrl + "/" + child, props);
}
- final String json = getContent(parentNodeUrl + ".1.json",
- CONTENT_TYPE_JSON);
+ final String json = getContent(parentNodeUrl + ".1.json", CONTENT_TYPE_JSON);
assertJavascript(testText, json, "out.print(data.text)");
for (String child : children) {
- assertJavascript(child, json, "out.print(data[\"" + child
- + "\"].child)");
- assertJavascript(testText, json, "out.print(data[\"" + child
- + "\"].text)");
+ assertJavascript(child, json, "out.print(data[\"" + child + "\"].child)");
+ assertJavascript(testText, json, "out.print(data[\"" + child + "\"].text)");
}
}
@@ -104,49 +101,45 @@ public class JsonRenderingTest extends HttpTestBase {
props.put("text", testText);
final String parentNodeUrl = testClient.createNode(postUrl, props);
- final String[] children = { "A", "B", "C" };
+ final String[] children = {"A", "B", "C"};
for (String child : children) {
props.put("child", child);
testClient.createNode(parentNodeUrl + "/" + child, props);
}
// .json and .0.json must both return 0 levels
- final String[] extensions = { ".json", ".0.json" };
+ final String[] extensions = {".json", ".0.json"};
for (String extension : extensions) {
- final String json = getContent(parentNodeUrl + extension,
- CONTENT_TYPE_JSON);
+ final String json = getContent(parentNodeUrl + extension, CONTENT_TYPE_JSON);
assertJavascript(testText, json, "out.print(data.text)");
for (String child : children) {
final String testInfo = "extension: " + extension;
- assertJavascript("undefined", json, "out.print(typeof data[\""
- + child + "\"])", testInfo);
+ assertJavascript("undefined", json, "out.print(typeof data[\"" + child + "\"])", testInfo);
}
}
-
}
-
+
/** Test to see if node.infinity returns 300 when there are too many nodes */
public void testRecursiveInfinityTooDeep() throws IOException {
- final Map<String, String> props = new HashMap<String, String>();
- for (int i = 0; i < 20;i++) {
- props.put("a" + i + "/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s", "yes");
- }
- final String url = testClient.createNode(postUrl, props);
- final String json = getContent(url + ".infinity.json",
- CONTENT_TYPE_JSON, null, 300);
- log.info("Url: {}", url);
- log.info("postUrl: {}", postUrl);
- // Get the resource url. (everything after the port)
- // We skip http://localhost:8080/org.apache.sling.launchpad.testing-6-SNAPSHOT/
- // or http://localhost:8080/
- String resourceUrl = url;
- final int toSkip = resourceUrl.contains("/org.apache.sling.launchpad") ? 4 : 3;
- for (int i = toSkip;i>0;i--) {
- resourceUrl = resourceUrl.substring(resourceUrl.indexOf("/") + 1);
- }
- for (int i = 10; i >=0; i--) {
- assertJavascript("/" + resourceUrl + "." + i + ".json", json, "out.print(data[" + (10 - i) + "])");
- }
+ final Map<String, String> props = new HashMap<String, String>();
+ for (int i = 0; i < 20; i++) {
+ props.put("a" + i + "/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s", "yes");
+ }
+ final String url = testClient.createNode(postUrl, props);
+ final String json = getContent(url + ".infinity.json", CONTENT_TYPE_JSON, null, 300);
+ log.info("Url: {}", url);
+ log.info("postUrl: {}", postUrl);
+ // Get the resource url. (everything after the port)
+ // We skip http://localhost:8080/org.apache.sling.launchpad.testing-6-SNAPSHOT/
+ // or http://localhost:8080/
+ String resourceUrl = url;
+ final int toSkip = resourceUrl.contains("/org.apache.sling.launchpad") ? 4 : 3;
+ for (int i = toSkip; i > 0; i--) {
+ resourceUrl = resourceUrl.substring(resourceUrl.indexOf("/") + 1);
+ }
+ for (int i = 10; i >= 0; i--) {
+ assertJavascript("/" + resourceUrl + "." + i + ".json", json, "out.print(data[" + (10 - i) + "])");
+ }
}
/** Test the "infinity" recursion level */
@@ -155,16 +148,13 @@ public class JsonRenderingTest extends HttpTestBase {
props.put("text", testText);
props.put("a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y", "yes");
final String url = testClient.createNode(postUrl, props);
- final String json = getContent(url + ".infinity.json",
- CONTENT_TYPE_JSON);
+ final String json = getContent(url + ".infinity.json", CONTENT_TYPE_JSON);
assertJavascript(testText, json, "out.print(data.text)");
- assertJavascript("yes", json,
- "out.print(data.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y)");
+ assertJavascript("yes", json, "out.print(data.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y)");
}
public void testInvalidLevel() throws IOException {
- assertHttpStatus(createdNodeUrl + ".notAnIntegerOnPurpose.json",
- HttpServletResponse.SC_BAD_REQUEST);
+ assertHttpStatus(createdNodeUrl + ".notAnIntegerOnPurpose.json", HttpServletResponse.SC_BAD_REQUEST);
}
public void testEscapedStrings() throws IOException {
@@ -174,16 +164,14 @@ public class JsonRenderingTest extends HttpTestBase {
props.put("cb", "Some text with {curly brackets}");
props.put("sb", "Some text with [square brackets]");
props.put("eol", "Some text with end\nof\nlines\nand\ttabs");
- props.put("html",
- "Some text with <body class=\"black\" mode=\'none yet\'/> html-like tags");
+ props.put("html", "Some text with <body class=\"black\" mode=\'none yet\'/> html-like tags");
props.put("bs", "Some text with \\backslashes \\here and \\\"there\"");
final String location = testClient.createNode(postUrl, props);
final String json = getContent(location + ".json", CONTENT_TYPE_JSON);
for (String key : props.keySet()) {
- assertJavascript(props.get(key), json, "out.println(data." + key
- + ")");
+ assertJavascript(props.get(key), json, "out.println(data." + key + ")");
}
}
@@ -194,57 +182,58 @@ public class JsonRenderingTest extends HttpTestBase {
props.put("c", "The \u0429 cyrillic capital letter shcha");
props.put("d", "The \u13C8 cherokee letter qui");
- final String location = testClient.createNode(postUrl, props, null,
- true);
+ final String location = testClient.createNode(postUrl, props, null, true);
final String json = getContent(location + ".json", CONTENT_TYPE_JSON);
for (String key : props.keySet()) {
- assertJavascript(props.get(key), json, "out.println(data." + key
- + ")");
+ assertJavascript(props.get(key), json, "out.println(data." + key + ")");
}
}
-
+
protected static int countOccurences(String str, char toCount) {
- int result = 0;
- for(char c : str.toCharArray()) {
- if(c == toCount) {
- result++;
- }
- }
- return result;
+ int result = 0;
+ for (char c : str.toCharArray()) {
+ if (c == toCount) {
+ result++;
+ }
+ }
+ return result;
}
-
+
public void testTidyNonRecursive() throws IOException {
- // Count end-of-line chars, there must be more in the tidy form
- int noTidyCount = countOccurences(getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON), '\n');
- int tidyCount = countOccurences(getContent(createdNodeUrl + ".tidy.json", CONTENT_TYPE_JSON), '\n');
- int delta = tidyCount - noTidyCount;
-
- // Output contains two properties so at least two EOL chars
- int min = 2;
-
- assertTrue("The .tidy selector should add at least 2 EOL chars to json output (delta=" + delta + ")", delta > min);
+ // Count end-of-line chars, there must be more in the tidy form
+ int noTidyCount = countOccurences(getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON), '\n');
+ int tidyCount = countOccurences(getContent(createdNodeUrl + ".tidy.json", CONTENT_TYPE_JSON), '\n');
+ int delta = tidyCount - noTidyCount;
+
+ // Output contains two properties so at least two EOL chars
+ int min = 2;
+
+ assertTrue(
+ "The .tidy selector should add at least 2 EOL chars to json output (delta=" + delta + ")", delta > min);
}
-
+
public void testTidyRecursive() throws IOException {
final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
props.put("a/b", "yes");
final String url = testClient.createNode(postUrl, props);
-
- int noTidyCount = countOccurences(getContent(url + ".infinity.json", CONTENT_TYPE_JSON), '\n');
- int tidyCount = countOccurences(getContent(url + ".tidy.infinity.json", CONTENT_TYPE_JSON), '\n');
- int delta = tidyCount - noTidyCount;
-
- // Output contains 3 properties and a subnode with one, so at least 5 EOL chars
- int min = 5;
-
- assertTrue("The .tidy selector should add at least 5 EOL chars to json output (delta=" + delta + ")", delta > min);
+
+ int noTidyCount = countOccurences(getContent(url + ".infinity.json", CONTENT_TYPE_JSON), '\n');
+ int tidyCount = countOccurences(getContent(url + ".tidy.infinity.json", CONTENT_TYPE_JSON), '\n');
+ int delta = tidyCount - noTidyCount;
+
+ // Output contains 3 properties and a subnode with one, so at least 5 EOL chars
+ int min = 5;
+
+ assertTrue(
+ "The .tidy selector should add at least 5 EOL chars to json output (delta=" + delta + ")", delta > min);
}
-
+
public void testHarrayWithAndWithoutTidy() throws IOException {
final int withoutTidy = countOccurences(getContent(HTTP_BASE_URL + "/.harray.1.json", CONTENT_TYPE_JSON), '\n');
- final int withTidy = countOccurences(getContent(HTTP_BASE_URL + "/.harray.tidy.1.json", CONTENT_TYPE_JSON), '\n');
+ final int withTidy =
+ countOccurences(getContent(HTTP_BASE_URL + "/.harray.tidy.1.json", CONTENT_TYPE_JSON), '\n');
assertTrue("Expecting more EOL chars in tidy output", withTidy > withoutTidy);
}
@@ -263,16 +252,16 @@ public class JsonRenderingTest extends HttpTestBase {
final String json = getContent(HTTP_BASE_URL + "/.harray.1.json", CONTENT_TYPE_JSON);
assertJavascript("true", json, "out.print(data[\"__children__\"][0].__name__.length > 0)");
}
-
+
public void testRootNoRecursion() throws IOException {
- final String json = getContent(HTTP_BASE_URL + "/.json", CONTENT_TYPE_JSON);
- assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
- assertJavascript("undefined", json, "out.print(typeof data[\"jcr:system\"])");
+ final String json = getContent(HTTP_BASE_URL + "/.json", CONTENT_TYPE_JSON);
+ assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
+ assertJavascript("undefined", json, "out.print(typeof data[\"jcr:system\"])");
}
-
+
public void testRootWithRecursion() throws IOException {
- final String json = getContent(HTTP_BASE_URL + "/.1.json", CONTENT_TYPE_JSON);
- assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
- assertJavascript("rep:system", json, "out.print(data[\"jcr:system\"][\"jcr:primaryType\"])");
+ final String json = getContent(HTTP_BASE_URL + "/.1.json", CONTENT_TYPE_JSON);
+ assertJavascript("rep:root", json, "out.print(data[\"jcr:primaryType\"])");
+ assertJavascript("rep:system", json, "out.print(data[\"jcr:system\"][\"jcr:primaryType\"])");
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
index 8415097..9cd09ba 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
@@ -34,9 +34,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
/** Test the {link ScriptHelper#forward) functionality */
- public class JspForwardTest {
+public class JspForwardTest {
private String nodeUrlA;
private String testTextA;
@@ -52,7 +53,7 @@ import org.junit.Test;
/** HTTP tests helper */
private final HttpTest H = new HttpTest();
-
+
@Rule
public RetryRule retryRule = new RetryRule();
@@ -62,8 +63,9 @@ import org.junit.Test;
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String url = HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
// Create two test nodes and store their paths
testTextA = "Text A " + System.currentTimeMillis();
@@ -90,7 +92,7 @@ import org.junit.Test;
// Node C is used for the infinite loop detection test
props.remove("pathToInclude");
props.remove("forwardStyle");
- props.put("testInfiniteLoop","true");
+ props.put("testInfiniteLoop", "true");
nodeUrlC = H.getTestClient().createNode(url, props);
// Node D is used for the "force resource type" test
@@ -103,18 +105,18 @@ import org.junit.Test;
// Script for forced resource type
scriptPath = "/apps/" + forcedResourceType;
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, scriptPath);
- toDelete.add(H.uploadTestScript(scriptPath,"forward-forced.jsp","html.jsp"));
+ toDelete.add(H.uploadTestScript(scriptPath, "forward-forced.jsp", "html.jsp"));
// The main rendering script goes under /apps in the repository
scriptPath = "/apps/nt/unstructured";
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, scriptPath);
- toDelete.add(H.uploadTestScript(scriptPath,"forward-test.jsp","html.jsp"));
+ toDelete.add(H.uploadTestScript(scriptPath, "forward-test.jsp", "html.jsp"));
}
@After
public void tearDown() throws Exception {
H.tearDown();
- for(String script : toDelete) {
+ for (String script : toDelete) {
H.getTestClient().delete(script);
}
}
@@ -123,35 +125,35 @@ import org.junit.Test;
@Retry
public void testWithoutForward() throws IOException {
final String content = H.getContent(nodeUrlA + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
}
@Test
@Retry
public void testWithForward() throws IOException {
final String content = H.getContent(nodeUrlB + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is not included (" + content + ")",!content.contains(testTextB));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content + ")", !content.contains(testTextB));
}
@Test
@Retry
public void testWithForwardAndExtension() throws IOException {
final String content = H.getContent(nodeUrlE + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is not included (" + content + ")",!content.contains(testTextB));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content + ")", !content.contains(testTextB));
}
@Test
@Retry
public void testWithJspForward() throws IOException {
final String content = H.getContent(nodeUrlF + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is not included (" + content + ")",!content.contains(testTextB));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content + ")", !content.contains(testTextB));
}
@Test
@@ -163,8 +165,8 @@ import org.junit.Test;
H.getHttpClient().executeMethod(get);
final String content = get.getResponseBodyAsString();
assertTrue(
- "Response contains infinite loop error message",
- content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
+ "Response contains infinite loop error message",
+ content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
// TODO: SLING-515, status is 500 when running the tests as part of the maven build
// but 200 if running tests against a separate instance started with mvn jetty:run
@@ -176,9 +178,11 @@ import org.junit.Test;
@Retry
public void testForcedResourceType() throws IOException {
final String content = H.getContent(nodeUrlD + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertTrue("Text of node A is included (" + content + ")",!content.contains(testTextB));
- assertTrue("Resource type has been forced (" + content + ")",content.contains("Forced resource type:" + forcedResourceType));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is included (" + content + ")", !content.contains(testTextB));
+ assertTrue(
+ "Resource type has been forced (" + content + ")",
+ content.contains("Forced resource type:" + forcedResourceType));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
index d22571f..f0eac74 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
@@ -1,24 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,9 +34,12 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/** Test the {link ScriptHelper#include) functionality */
- public class JspIncludeTest {
-
+public class JspIncludeTest {
+
private String nodeUrlA;
private String testTextA;
private String nodeUrlB;
@@ -48,7 +50,7 @@ import org.junit.Test;
private String nodeUrlF;
private String nodeUrlG;
private String nodeUrlH;
- private String nodeUrlI;
+ private String nodeUrlI;
private String forcedResourceType;
private Set<String> toDelete = new HashSet<String>();
@@ -64,8 +66,9 @@ import org.junit.Test;
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String url = HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
// Create two test nodes and store their paths
testTextA = "Text A " + System.currentTimeMillis();
@@ -85,13 +88,13 @@ import org.junit.Test;
nodeUrlE = H.getTestClient().createNode(url, props);
// Node F is used for the max calls detection test
- props.put("testMaxCalls","true");
+ props.put("testMaxCalls", "true");
nodeUrlF = H.getTestClient().createNode(url, props);
// Node C is used for the infinite loop detection test
props.remove("pathToInclude");
props.remove("testMaxCalls");
- props.put("testInfiniteLoop","true");
+ props.put("testInfiniteLoop", "true");
nodeUrlC = H.getTestClient().createNode(url, props);
// Node D is used for the "force resource type" test
@@ -106,11 +109,11 @@ import org.junit.Test;
props.remove("pathToInclude");
props.put("testCallScript", "called-test.jsp");
nodeUrlG = H.getTestClient().createNode(url, props);
-
+
// Node I is used for the "var" test
props.remove("forceResourceType");
props.remove("testCallScript");
- props.put("testVarInclude","true");
+ props.put("testVarInclude", "true");
props.put("pathToInclude", pathToInclude);
props.put("VAR_INCLUDE", "VALUE");
nodeUrlI = H.getTestClient().createNode(url, props);
@@ -118,13 +121,13 @@ import org.junit.Test;
// Script for forced resource type
H.setScriptPath("/apps/" + forcedResourceType);
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, H.getScriptPath());
- toDelete.add(H.uploadTestScript(H.getScriptPath(),"include-forced.jsp","html.jsp"));
+ toDelete.add(H.uploadTestScript(H.getScriptPath(), "include-forced.jsp", "html.jsp"));
// The main rendering script goes under /apps in the repository
H.setScriptPath("/apps/nt/unstructured");
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, H.getScriptPath());
- toDelete.add(H.uploadTestScript(H.getScriptPath(),"include-test.jsp","html.jsp"));
- toDelete.add(H.uploadTestScript(H.getScriptPath(),"called-test.jsp","called-test.jsp"));
+ toDelete.add(H.uploadTestScript(H.getScriptPath(), "include-test.jsp", "html.jsp"));
+ toDelete.add(H.uploadTestScript(H.getScriptPath(), "called-test.jsp", "called-test.jsp"));
// Node H is used for "call" test where the called script is inherited from the supertype
String nodeHResourceType = getClass().getSimpleName() + "/" + System.currentTimeMillis();
@@ -134,50 +137,50 @@ import org.junit.Test;
nodeUrlH = H.getTestClient().createNode(url, props);
H.setScriptPath("/apps/" + nodeHResourceType);
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, H.getScriptPath());
- toDelete.add(H.uploadTestScript(H.getScriptPath(),"calling-test.jsp","html.jsp"));
+ toDelete.add(H.uploadTestScript(H.getScriptPath(), "calling-test.jsp", "html.jsp"));
H.setScriptPath("/apps/" + nodeHSuperResourceType);
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, H.getScriptPath());
- toDelete.add(H.uploadTestScript(H.getScriptPath(),"called-test.jsp","called-test.jsp"));
+ toDelete.add(H.uploadTestScript(H.getScriptPath(), "called-test.jsp", "called-test.jsp"));
}
@After
public void tearDown() throws Exception {
H.tearDown();
- for(String script : toDelete) {
- H.getTestClient().delete(script);
+ for (String script : toDelete) {
+ H.getTestClient().delete(script);
}
}
- @Test
+ @Test
@Retry
public void testWithoutInclude() throws IOException {
final String content = H.getContent(nodeUrlA + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextA + "</p>"));
- assertFalse("Nothing has been included",content.contains("<p>Including"));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextA + "</p>"));
+ assertFalse("Nothing has been included", content.contains("<p>Including"));
}
- @Test
+ @Test
@Retry
public void testWithInclude() throws IOException {
final String content = H.getContent(nodeUrlB + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
}
- @Test
+ @Test
@Retry
public void testWithIncludeAndExtension() throws IOException {
final String content = H.getContent(nodeUrlE + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
}
- @Test
+ @Test
@Retry
public void testInfiniteLoopDetection() throws IOException {
// Node C has a property that causes an infinite include loop,
@@ -186,8 +189,8 @@ import org.junit.Test;
H.getHttpClient().executeMethod(get);
final String content = get.getResponseBodyAsString();
assertTrue(
- "Response contains infinite loop error message",
- content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
+ "Response contains infinite loop error message",
+ content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
// TODO: SLING-515, status is 500 when running the tests as part of the maven build
// but 200 if running tests against a separate instance started with mvn jetty:run
@@ -195,7 +198,7 @@ import org.junit.Test;
// assertEquals("Status is 500 for infinite loop",HttpServletResponse.SC_INTERNAL_SERVER_ERROR, status);
}
- @Test
+ @Test
@Retry
public void testMaxCallsDetection() throws IOException {
// Node F has a property that causes over 1000 includes
@@ -204,8 +207,8 @@ import org.junit.Test;
H.getHttpClient().executeMethod(get);
final String content = get.getResponseBodyAsString();
assertTrue(
- "Response contains infinite loop error message",
- content.contains("org.apache.sling.api.request.TooManyCallsException"));
+ "Response contains infinite loop error message",
+ content.contains("org.apache.sling.api.request.TooManyCallsException"));
// TODO: SLING-515, status is 500 when running the tests as part of the maven build
// but 200 if running tests against a separate instance started with mvn jetty:run
@@ -213,39 +216,41 @@ import org.junit.Test;
// assertEquals("Status is 500 for infinite loop",HttpServletResponse.SC_INTERNAL_SERVER_ERROR, status);
}
- @Test
+ @Test
@Retry
public void testForcedResourceType() throws IOException {
final String content = H.getContent(nodeUrlD + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Include has been used",content.contains("<p>Including"));
- assertTrue("Text of node A is included (" + content + ")",content.contains(testTextA));
- assertTrue("Resource type has been forced (" + content + ")",content.contains("Forced resource type:" + forcedResourceType));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Include has been used", content.contains("<p>Including"));
+ assertTrue("Text of node A is included (" + content + ")", content.contains(testTextA));
+ assertTrue(
+ "Resource type has been forced (" + content + ")",
+ content.contains("Forced resource type:" + forcedResourceType));
}
- @Test
+ @Test
@Retry
public void testCall() throws IOException {
final String content = H.getContent(nodeUrlG + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Content contains formatted test text",content.contains("<p class=\"main\">" + testTextB + "</p>"));
- assertTrue("Call has been used",content.contains("<p>Calling"));
- assertTrue("Call has been made",content.contains("called"));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p class=\"main\">" + testTextB + "</p>"));
+ assertTrue("Call has been used", content.contains("<p>Calling"));
+ assertTrue("Call has been made", content.contains("called"));
}
- @Test
+ @Test
@Retry
public void testCallToSupertype() throws IOException {
final String content = H.getContent(nodeUrlH + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker",content.contains("JSP template"));
- assertTrue("Call has been made",content.contains("called"));
+ assertTrue("Content includes JSP marker", content.contains("JSP template"));
+ assertTrue("Call has been made", content.contains("called"));
}
-
- @Test
+
+ @Test
@Retry
- public void testVarInclude() throws IOException{
+ public void testVarInclude() throws IOException {
final String content = H.getContent(nodeUrlI + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("Content includes Loaded test content:",content.contains("Loaded test content:"));
+ assertTrue("Content includes Loaded test content:", content.contains("Loaded test content:"));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
index 17f201e..32e7f4b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertTrue;
-
import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.commons.testing.integration.HttpTestNode;
import org.apache.sling.commons.testing.junit.Retry;
@@ -29,6 +29,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/** Test JSP scripting
* TODO this class can be generalized to be used for any scripting language,
* that would help in testing all scripting engines.
@@ -38,13 +40,13 @@ public class JspScriptingTest {
private String testRootUrl;
private HttpTestNode rtNode;
private HttpTestNode unstructuredNode;
-
+
public static final int CHECK_CONTENT_TIMEOUT_SECONDS = 5;
public static final int CHECK_CONTENT_INTERVAL_MSEC = 500;
/** HTTP tests helper */
private final HttpTest H = new HttpTest();
-
+
@Rule
public RetryRule retryRule = new RetryRule();
@@ -52,7 +54,8 @@ public class JspScriptingTest {
public void setUp() throws Exception {
H.setUp();
- final String testRootPath = HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
+ final String testRootPath =
+ HttpTest.HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
testRootUrl = H.getTestClient().createNode(testRootPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX, null);
rtNode = new HttpTestNode(H.getTestClient(), testRootPath + "/rt", null);
unstructuredNode = new HttpTestNode(H.getTestClient(), testRootPath + "/unstructured", null);
@@ -77,7 +80,9 @@ public class JspScriptingTest {
public void testUnstructuredNoScript() throws Exception {
final String content = H.getContent(unstructuredNode.nodeUrl + ".txt", HttpTest.CONTENT_TYPE_PLAIN);
assertTrue(content.contains("PlainTextRenderer"));
- assertTrue("Content contains " + unstructuredNode.testText + " (" + content + ")", content.contains(unstructuredNode.testText));
+ assertTrue(
+ "Content contains " + unstructuredNode.testText + " (" + content + ")",
+ content.contains(unstructuredNode.testText));
}
@Test
@@ -87,7 +92,7 @@ public class JspScriptingTest {
try {
checkContent(rtNode);
} finally {
- if(toDelete != null) {
+ if (toDelete != null) {
H.getTestClient().delete(toDelete);
}
}
@@ -100,7 +105,7 @@ public class JspScriptingTest {
try {
checkContent(unstructuredNode);
} finally {
- if(toDelete != null) {
+ if (toDelete != null) {
H.getTestClient().delete(toDelete);
}
}
@@ -117,7 +122,9 @@ public class JspScriptingTest {
tagUsingScript = H.uploadTestScript(unstructuredNode.scriptPath, "withtag.jsp", "html.jsp");
final String content = H.getContent(unstructuredNode.nodeUrl + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("JSP script executed as expected (" + content + ")", content.contains("<h1>Hello, Sling User</h1>"));
+ assertTrue(
+ "JSP script executed as expected (" + content + ")",
+ content.contains("<h1>Hello, Sling User</h1>"));
} finally {
if (tagFile != null) {
@@ -129,18 +136,18 @@ public class JspScriptingTest {
}
}
- /* Verify that overwriting a JSP script changes the output within a reasonable time
+ /* Verify that overwriting a JSP script changes the output within a reasonable time
* (might not be immediate as there's some observation and caching involved) */
@Test
public void testChangingJsp() throws Exception {
String toDelete = null;
try {
- final String [] scripts = { "jsp1.jsp", "jsp2.jsp" };
- for(String script : scripts) {
+ final String[] scripts = {"jsp1.jsp", "jsp2.jsp"};
+ for (String script : scripts) {
toDelete = H.uploadTestScript(unstructuredNode.scriptPath, script, "html.jsp");
final String expected = "text from " + script + ":" + unstructuredNode.testText;
-
+
final Condition c = new Condition() {
public String getDescription() {
@@ -148,20 +155,21 @@ public class JspScriptingTest {
}
public boolean isTrue() throws Exception {
- final String content = H.getContent(unstructuredNode.nodeUrl + ".html", HttpTest.CONTENT_TYPE_HTML);
+ final String content =
+ H.getContent(unstructuredNode.nodeUrl + ".html", HttpTest.CONTENT_TYPE_HTML);
return content.contains(expected);
}
};
-
+
new RetryLoop(c, CHECK_CONTENT_TIMEOUT_SECONDS, CHECK_CONTENT_INTERVAL_MSEC);
}
} finally {
- if(toDelete != null) {
+ if (toDelete != null) {
H.getTestClient().delete(toDelete);
}
}
}
-
+
@Test
@Retry
public void testEnum() throws Exception {
@@ -169,11 +177,11 @@ public class JspScriptingTest {
try {
toDelete = H.uploadTestScript(unstructuredNode.scriptPath, "enum-test.jsp", "txt.jsp");
final String content = H.getContent(unstructuredNode.nodeUrl + ".txt", HttpTest.CONTENT_TYPE_PLAIN);
- for(String expected : new String[] { "FOO=FOO", "BAR=BAR"}) {
+ for (String expected : new String[] {"FOO=FOO", "BAR=BAR"}) {
assertTrue("Content contains '" + expected + "'(" + content + ")", content.contains(expected));
}
} finally {
- if(toDelete != null) {
+ if (toDelete != null) {
H.getTestClient().delete(toDelete);
}
}
@@ -181,14 +189,14 @@ public class JspScriptingTest {
private void checkContent(final HttpTestNode tn) throws Exception {
final String content = H.getContent(tn.nodeUrl + ".html", HttpTest.CONTENT_TYPE_HTML);
- assertTrue("JSP script executed as expected (" + content + ")", content.contains("<h1>JSP rendering result</h1>"));
-
- final String [] expected = {
- "using resource.adaptTo:" + tn.testText,
- "using currentNode:" + tn.testText,
+ assertTrue(
+ "JSP script executed as expected (" + content + ")", content.contains("<h1>JSP rendering result</h1>"));
+
+ final String[] expected = {
+ "using resource.adaptTo:" + tn.testText, "using currentNode:" + tn.testText,
};
- for(String exp : expected) {
+ for (String exp : expected) {
assertTrue("Content contains " + exp + "(" + content + ")", content.contains(exp));
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java
index cecc488..5ab9e3c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -24,7 +26,7 @@ public class LaunchpadConfigInstallerTest extends HttpTestBase {
final String url = HTTP_BASE_URL + "/testing/GetConfigServlet.tidy.json/integrationTestsConfig";
final String json = getContent(url, CONTENT_TYPE_JSON);
final String expectMessage = "This test config should be loaded at startup";
- final String code = "out.print(data.properties.message)";
+ final String code = "out.print(data.properties.message)";
assertJavascript(expectMessage, json, code);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java
index f2786eb..e4e1e87 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -23,6 +25,7 @@ import org.junit.Test;
public class MappingEventsProxyTest {
@Test
public void runWriteableResourcesTest() throws Exception {
- new ServerSideTestClient().assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.MappingEventsTest", -1);
+ new ServerSideTestClient()
+ .assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.MappingEventsTest", -1);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java
index 8b73b0c..ddffa2e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java
@@ -24,16 +24,14 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/**
* The <tt>MiscUnsafeTest</tt> verifies that the <tt>sun.misc.Unsafe</tt> class can be loaded
- *
+ *
*/
public class MiscUnsafeTest extends HttpTestBase {
-
public void testSunMiscUnsafeIsLoaded() throws IOException {
String content = getContent(HTTP_BASE_URL + "/bin/miscUnsafe.txt", CONTENT_TYPE_PLAIN);
assertTrue("Response did not start with sun.misc:\n" + content, content.startsWith("sun.misc"));
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
index 38ef6af..c7efc2b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -20,45 +22,45 @@ import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTestBase;
-/** Test the MicroslingIntegrationTestClient's mkdir functions */
+/** Test the MicroslingIntegrationTestClient's mkdir functions */
public class MkdirTest extends HttpTestBase {
-
+
/** Try creating a directory via WebDAV */
public void testMkdir() throws IOException {
final String testDirUrl = WEBDAV_BASE_URL + TEST_PATH + System.currentTimeMillis();
-
+
assertHttpStatus(testDirUrl, 404, testDirUrl);
-
+
try {
testClient.mkdir(testDirUrl);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail(ioe.getMessage());
}
-
+
assertHttpStatus(testDirUrl + DEFAULT_EXT, 200, testDirUrl);
-
+
try {
testClient.mkdir(testDirUrl);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("mkdir must succeed on an existing directory, got IOException:" + ioe);
}
-
+
assertHttpStatus(testDirUrl + DEFAULT_EXT, 200, testDirUrl);
-
+
testClient.delete(testDirUrl);
assertHttpStatus(testDirUrl, 404, testDirUrl + " must be gone after DELETE");
}
-
+
/** Try creating a deep directory structure */
public void testMkdirDeep() throws IOException {
final String path = TEST_PATH + "/mkdir-test-" + System.currentTimeMillis() + "/something";
final String url = WEBDAV_BASE_URL + path;
- assertHttpStatus(url,404,url + " must not exist before test");
+ assertHttpStatus(url, 404, url + " must not exist before test");
try {
testClient.mkdirs(WEBDAV_BASE_URL, path);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("mkdirs failed:" + ioe);
}
- assertHttpStatus(url + DEFAULT_EXT,200,url + " must exist after test");
+ assertHttpStatus(url + DEFAULT_EXT, 200, url + " must exist after test");
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
index 3f0f0d7..274880e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -24,7 +26,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/** Test rendering resources based on their JCR node type */
-public class NodeTypeBasedRenderingTest extends RenderingTestBase{
+public class NodeTypeBasedRenderingTest extends RenderingTestBase {
public static final String TEST_PATH = "/testing/" + NodeTypeBasedRenderingTest.class.getSimpleName();
private String testNodeUrl;
private List<String> toDelete = new ArrayList<String>();
@@ -37,37 +39,37 @@ public class NodeTypeBasedRenderingTest extends RenderingTestBase{
testNodeUrl = null;
toDelete.clear();
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
- for(String url : toDelete) {
+ for (String url : toDelete) {
testClient.delete(url);
}
}
- private void testSpecificNodeType(String nodeType, String ... moreProperties) throws IOException {
+ private void testSpecificNodeType(String nodeType, String... moreProperties) throws IOException {
// Create test node of specified type
testClient.mkdirs(HTTP_BASE_URL, TEST_PATH);
final Map<String, String> props = new HashMap<String, String>();
props.put("jcr:primaryType", nodeType);
-
- if(moreProperties != null) {
- for(int i=0; i < moreProperties.length; i+=2) {
- props.put(moreProperties[i], moreProperties[i+1]);
+
+ if (moreProperties != null) {
+ for (int i = 0; i < moreProperties.length; i += 2) {
+ props.put(moreProperties[i], moreProperties[i + 1]);
}
}
-
+
final String testNodePath = TEST_PATH + "/test_" + counter.incrementAndGet();
testNodeUrl = testClient.createNode(HTTP_BASE_URL + testNodePath, props);
toDelete.add(testNodeUrl);
-
+
{
// No script -> default rendering
final String content = getContent(testNodeUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "dumped by HtmlRenderer");
}
-
+
{
// With script -> custom rendering based on mapping of JCR
// node type to Sling resource type
@@ -80,33 +82,32 @@ public class NodeTypeBasedRenderingTest extends RenderingTestBase{
assertContains(content, "PATH " + testNodePath);
}
}
-
+
public void testNtFolder() throws IOException {
testSpecificNodeType("nt:folder");
}
-
+
public void testNtUnstructured() throws IOException {
testSpecificNodeType("nt:unstructured");
}
-
+
public void testNtUnstructuredWithResourceType() throws IOException {
testSpecificNodeType("nt:unstructured", "sling:resourceType", "nt:unstructured");
}
-
+
public void testSlingFolder() throws IOException {
testSpecificNodeType("sling:Folder");
}
-
+
public void testSlingFolderWithResourceType() throws IOException {
testSpecificNodeType("sling:Folder", "sling:resourceType", "sling:Folder");
}
-
+
public void testSlingOrderedFolder() throws IOException {
testSpecificNodeType("sling:OrderedFolder");
}
-
+
public void testSlingOrderedFolderWithResourceType() throws IOException {
testSpecificNodeType("sling:OrderedFolder", "sling:resourceType", "sling:OrderedFolder");
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
index 63fed99..e84e430 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -39,8 +41,9 @@ public class NodetypeRenderingTest extends RenderingTestBase {
// create the test node, under a path that's specific to this class to allow collisions
secondFolderOfContentPath = "" + System.currentTimeMillis();
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + secondFolderOfContentPath
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
@@ -60,17 +63,17 @@ public class NodetypeRenderingTest extends RenderingTestBase {
}
public void testMiniScriptHtml() throws IOException {
- final String toDelete = uploadTestScript("no-code.esp","html.esp");
+ final String toDelete = uploadTestScript("no-code.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertEquals("There's no code in this script, just this constant string",content);
+ assertEquals("There's no code in this script, just this constant string", content);
} finally {
testClient.delete(toDelete);
}
}
-
+
public void testPrint() throws IOException {
- final String toDelete = uploadTestScript("print.esp","html.esp");
+ final String toDelete = uploadTestScript("print.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
final String expected = "print.esp ends";
@@ -79,9 +82,9 @@ public class NodetypeRenderingTest extends RenderingTestBase {
testClient.delete(toDelete);
}
}
-
+
public void testEspHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -92,7 +95,7 @@ public class NodetypeRenderingTest extends RenderingTestBase {
}
public void testEspXml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","xml.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "xml.esp");
try {
final String content = getContent(displayUrl + ".xml", CONTENT_TYPE_XML);
assertContains(content, "ESP template");
@@ -107,13 +110,13 @@ public class NodetypeRenderingTest extends RenderingTestBase {
// make sure there's no leftover rendering script
{
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertFalse("Content must not include ESP marker before test",content.contains("ESP template"));
+ assertFalse("Content must not include ESP marker before test", content.contains("ESP template"));
}
// put our script in the /apps/<second folder level of content> (SLING-125)
final String path = "/apps/" + secondFolderOfContentPath;
testClient.mkdirs(WEBDAV_BASE_URL, path);
- final String toDelete = uploadTestScript(path,"rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript(path, "rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -124,7 +127,7 @@ public class NodetypeRenderingTest extends RenderingTestBase {
}
public void testEspPlain() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","txt.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "txt.esp");
try {
final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
assertContains(content, "ESP template");
@@ -135,44 +138,46 @@ public class NodetypeRenderingTest extends RenderingTestBase {
}
public void TODO_FAILS_testVltHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.vlt","html.vlt");
+ final String toDelete = uploadTestScript("rendering-test.vlt", "html.vlt");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes VLT marker",content.contains("Velocity template"));
- assertTrue("Content contains formatted test text",content.contains("<p><b>" + testText + "</b></p>"));
+ assertTrue("Content includes VLT marker", content.contains("Velocity template"));
+ assertTrue("Content contains formatted test text", content.contains("<p><b>" + testText + "</b></p>"));
} finally {
testClient.delete(toDelete);
}
}
public void TODO_FAILS_testJsHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
+ final String toDelete = uploadTestScript("rendering-test.ecma", "html.ecma");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes JS marker",content.contains("Raw javascript template"));
- assertTrue("Content contains formatted test text",content.contains("<p><em>" + testText + "</em></p>"));
+ assertTrue("Content includes JS marker", content.contains("Raw javascript template"));
+ assertTrue("Content contains formatted test text", content.contains("<p><em>" + testText + "</em></p>"));
} finally {
testClient.delete(toDelete);
}
}
public void TODO_FAILS_testFtlHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.ftl","html.ftl");
+ final String toDelete = uploadTestScript("rendering-test.ftl", "html.ftl");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes FreeMarker marker",content.contains("FreeMarker template"));
- assertTrue("Content contains formatted test text",content.contains("<p><span>" + testText + "</span></p>"));
+ assertTrue("Content includes FreeMarker marker", content.contains("FreeMarker template"));
+ assertTrue(
+ "Content contains formatted test text", content.contains("<p><span>" + testText + "</span></p>"));
} finally {
testClient.delete(toDelete);
}
}
public void TODO_FAILS_testErbHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.erb","html.erb");
+ final String toDelete = uploadTestScript("rendering-test.erb", "html.erb");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes Ruby marker",content.contains("Ruby template"));
- assertTrue("Content contains formatted test text",content.contains("<p><span>" + testText + "</span></p>"));
+ assertTrue("Content includes Ruby marker", content.contains("Ruby template"));
+ assertTrue(
+ "Content contains formatted test text", content.contains("<p><span>" + testText + "</span></p>"));
} finally {
testClient.delete(toDelete);
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
index 97c1ace..321da69 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -28,8 +30,7 @@ public class PostRedirectTest extends HttpTestBase {
private String postPath = "CreateNodeTest/" + System.currentTimeMillis();
- private String postUrl = HTTP_BASE_URL + "/" + postPath
- + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ private String postUrl = HTTP_BASE_URL + "/" + postPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
public void testEncodedRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
@@ -38,10 +39,10 @@ public class PostRedirectTest extends HttpTestBase {
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
- assertTrue("With UTF-8 in path, redirect must be encoded :"+location,
- location.contains(postPath + "/%D0%94%D1%80%D1%83%D0%B3%D0%B0"));
+ final String location = testClient.createNode(postUrl, params, headers, false);
+ assertTrue(
+ "With UTF-8 in path, redirect must be encoded :" + location,
+ location.contains(postPath + "/%D0%94%D1%80%D1%83%D0%B3%D0%B0"));
}
public void testForcedRedirect() throws IOException {
@@ -50,21 +51,19 @@ public class PostRedirectTest extends HttpTestBase {
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
+ final String location = testClient.createNode(postUrl, params, headers, false);
// the servlet container prepends the host information to the redirect location
- assertEquals(
- "With forced redirect and Referer, redirect must be forced",
- HTTP_BASE_URL + "/forced", location);
+ assertEquals("With forced redirect and Referer, redirect must be forced", HTTP_BASE_URL + "/forced", location);
}
public void testDefaultRedirect() throws IOException {
final Map<String, String> params = new HashMap<String, String>();
params.put(":redirect", null);
final String location = testClient.createNode(postUrl, null);
- assertTrue("With no headers or parameters, redirect (" + location
- + ") must point to created node (path=" + postPath + ")",
- location.contains(postPath));
+ assertTrue(
+ "With no headers or parameters, redirect (" + location + ") must point to created node (path="
+ + postPath + ")",
+ location.contains(postPath));
}
public void testMagicStarRedirect() throws IOException {
@@ -72,11 +71,10 @@ public class PostRedirectTest extends HttpTestBase {
params.put(":redirect", "*");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
- assertTrue("With magic star, redirect (" + location
- + ") must point to created node (path=" + postPath + ")",
- location.contains(postPath));
+ final String location = testClient.createNode(postUrl, params, headers, false);
+ assertTrue(
+ "With magic star, redirect (" + location + ") must point to created node (path=" + postPath + ")",
+ location.contains(postPath));
}
public void testMagicStarRedirectPrefix() throws IOException {
@@ -85,10 +83,10 @@ public class PostRedirectTest extends HttpTestBase {
params.put(":redirect", prefix + "*");
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
- assertTrue("With magic star, redirect (" + location
- + ") must start with prefix " + prefix, location.contains(prefix));
+ final String location = testClient.createNode(postUrl, params, headers, false);
+ assertTrue(
+ "With magic star, redirect (" + location + ") must start with prefix " + prefix,
+ location.contains(prefix));
}
public void testMagicStarRedirectSuffix() throws IOException {
@@ -97,10 +95,10 @@ public class PostRedirectTest extends HttpTestBase {
params.put(":redirect", "*" + suffix);
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
- assertTrue("With magic star, redirect (" + location
- + ") must end with suffix " + suffix, location.endsWith(suffix));
+ final String location = testClient.createNode(postUrl, params, headers, false);
+ assertTrue(
+ "With magic star, redirect (" + location + ") must end with suffix " + suffix,
+ location.endsWith(suffix));
}
public void testMagicStarRedirectPrefixSuffix() throws IOException {
@@ -110,10 +108,11 @@ public class PostRedirectTest extends HttpTestBase {
params.put(":redirect", prefix + "*" + suffix);
final Map<String, String> headers = new HashMap<String, String>();
headers.put("Referer", "http://referer/");
- final String location = testClient.createNode(postUrl, params, headers,
- false);
- assertTrue("With magic star, redirect (" + location
- + ") must start with prefix " + prefix + " and end with suffix "
- + suffix, location.contains(prefix) && location.endsWith(suffix));
+ final String location = testClient.createNode(postUrl, params, headers, false);
+ assertTrue(
+ "With magic star, redirect (" + location
+ + ") must start with prefix " + prefix + " and end with suffix "
+ + suffix,
+ location.contains(prefix) && location.endsWith(suffix));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
index ae2a134..38bee28 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
@@ -1,25 +1,27 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import java.io.IOException;
-
import javax.json.JsonObject;
+import java.io.IOException;
+
import org.apache.sling.commons.testing.integration.NameValuePairList;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
import org.apache.sling.servlets.post.SlingPostConstants;
@@ -32,8 +34,7 @@ import org.slf4j.LoggerFactory;
public class PropertyRenderingTest extends RenderingTestBase {
/** Logger instance */
- private static final Logger log =
- LoggerFactory.getLogger(PropertyRenderingTest.class);
+ private static final Logger log = LoggerFactory.getLogger(PropertyRenderingTest.class);
private String slingResourceType;
@@ -52,7 +53,8 @@ public class PropertyRenderingTest extends RenderingTestBase {
slingResourceType = getClass().getName();
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/ANON_CAN_READ/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/ANON_CAN_READ/" + getClass().getSimpleName() + "/"
+ + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
NameValuePairList list = new NameValuePairList();
list.add("sling:resourceType", slingResourceType);
@@ -93,7 +95,9 @@ public class PropertyRenderingTest extends RenderingTestBase {
public void testMultiValuedTextJson() throws Exception {
final String json = getContent(displayUrl + "/multiText.json", CONTENT_TYPE_JSON);
final JsonObject obj = JsonUtil.parseObject(json);
- assertEquals("[\"" + testMultiText1 + "\",\""+ testMultiText2 + "\"]", JsonUtil.toString(obj.getJsonArray("multiText")));
+ assertEquals(
+ "[\"" + testMultiText1 + "\",\"" + testMultiText2 + "\"]",
+ JsonUtil.toString(obj.getJsonArray("multiText")));
}
public void testMultiValuedTextHtml() throws IOException {
@@ -117,4 +121,4 @@ public class PropertyRenderingTest extends RenderingTestBase {
final String data = getContent(displayUrl + "/sling:resourceType", CONTENT_TYPE_PLAIN);
assertEquals(slingResourceType, data);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java
index 35a116b..ce07308 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java
@@ -40,11 +40,9 @@ public class RangeStreamingTest extends HttpTestBase {
// Create the test nodes under a path that's specific to this class to
// allow collisions
- final String path = "/" + getClass().getSimpleName() + "/"
- + System.currentTimeMillis();
+ final String path = "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
testClient.mkdirs(WEBDAV_BASE_URL, path);
- rootUrl = uploadTestScript(path, "rangestreaming.txt",
- "rangestreaming.txt");
+ rootUrl = uploadTestScript(path, "rangestreaming.txt", "rangestreaming.txt");
}
@Override
@@ -122,46 +120,41 @@ public class RangeStreamingTest extends HttpTestBase {
assertEquals("Expect 206/PARTIAL CONTENT", 206, status);
String contentType = get.getResponseHeader("Content-Type").getValue();
- assertTrue("Content Type must be multipart/byteranges",
- contentType.contains("multipart/byteranges"));
- String boundary = contentType.substring(contentType.indexOf("boundary=")
- + "boundary=".length());
+ assertTrue("Content Type must be multipart/byteranges", contentType.contains("multipart/byteranges"));
+ String boundary = contentType.substring(contentType.indexOf("boundary=") + "boundary=".length());
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- get.getResponseBodyAsStream()));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(get.getResponseBodyAsStream()));
String line = reader.readLine();
while (!("--" + boundary).equals(line)) {
line = reader.readLine();
}
- assertEquals("Expected content to start with boundary",
- "--" + boundary, line);
+ assertEquals("Expected content to start with boundary", "--" + boundary, line);
assertEntityHeaders(reader, "text/plain", "bytes 0-9/79");
assertEquals("The quick ", reader.readLine());
- assertEquals("Expected content to start with boundary",
- "--" + boundary, reader.readLine());
+ assertEquals("Expected content to start with boundary", "--" + boundary, reader.readLine());
assertEntityHeaders(reader, "text/plain", "bytes 69-78/79");
assertEquals("corpus sic", reader.readLine());
char[] buf = new char[boundary.length() + 4];
reader.read(buf);
- assertEquals("Expected content to start with boundary", "--" + boundary
- + "--", new String(buf));
+ assertEquals("Expected content to start with boundary", "--" + boundary + "--", new String(buf));
}
- private void assertEntityHeaders(final BufferedReader reader,
- final String expectedContentType, final String expectedRange)
+ private void assertEntityHeaders(
+ final BufferedReader reader, final String expectedContentType, final String expectedRange)
throws IOException {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
line = line.toLowerCase();
if (line.startsWith("content-type:")) {
- assertTrue("Wrong content type: " + line + "; expected="
- + expectedContentType, line.contains(expectedContentType));
+ assertTrue(
+ "Wrong content type: " + line + "; expected=" + expectedContentType,
+ line.contains(expectedContentType));
} else if (line.startsWith("content-range:")) {
- assertTrue("Wrong content range: " + line + "; expected="
- + expectedRange, line.contains(expectedRange));
+ assertTrue(
+ "Wrong content range: " + line + "; expected=" + expectedRange, line.contains(expectedRange));
} else if (line.length() == 0) {
return;
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
index 6cae93c..397ae3b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
@@ -1,28 +1,30 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
@@ -40,10 +42,10 @@ public class RedirectTest extends HttpTestBase {
// create the test node, under a path that's specific to this class to
// allow collisions
postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "_"
- + System.currentTimeMillis()
- + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
}
-
+
private void testRedirectToIndexHtml(String redirNodeUrl, int statusCode) throws IOException {
// get the created node without following redirects
@@ -94,7 +96,7 @@ public class RedirectTest extends HttpTestBase {
props.put("sling:resourceType", "sling:redirect");
props.put("sling:target", "/index.html");
String redirNodeUrl = testClient.createNode(postUrl, props);
-
+
testRedirectToIndexHtml(redirNodeUrl, 302);
}
@@ -107,10 +109,10 @@ public class RedirectTest extends HttpTestBase {
props.put("sling:target", "/index.html");
props.put("sling:status", "301");
String redirNodeUrl = testClient.createNode(postUrl, props);
-
+
testRedirectToIndexHtml(redirNodeUrl, 301);
}
-
+
/** test 302 response with existing sling:target */
public void testRedirect302_absolute() throws IOException {
@@ -231,5 +233,4 @@ public class RedirectTest extends HttpTestBase {
assertEquals("sling:redirect", json.getString("sling:resourceType"));
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
index f2f37ca..bd5ee40 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -27,15 +29,15 @@ public abstract class RenderingTestBase extends HttpTestBase {
protected String scriptPath;
protected String testText;
protected String displayUrl;
-
- protected String uploadTestScript(String localFilename,String filenameOnServer) throws IOException {
+
+ protected String uploadTestScript(String localFilename, String filenameOnServer) throws IOException {
return uploadTestScript(scriptPath, localFilename, filenameOnServer);
}
-
+
protected void assertContains(String content, String expected) {
HttpTest.assertContains(content, expected);
}
-
+
protected void assertNotContains(String content, String notExpected) {
HttpTest.assertNotContains(content, notExpected);
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
index 41800f5..fbb7078 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -49,8 +51,8 @@ public class RequestAttributeTest extends HttpTestBase {
// Create the test nodes under a path that's specific to this class to
// allow collisions
final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName()
- + "/" + System.currentTimeMillis()
- + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
final Map<String, String> props = new HashMap<String, String>();
// Create two test nodes and store their paths
@@ -66,14 +68,10 @@ public class RequestAttributeTest extends HttpTestBase {
// The main rendering script goes under /apps in the repository
scriptPath = "/apps/nt/unstructured";
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- toDelete.add(uploadTestScript(scriptPath, "request-attribute-test.esp",
- "txt.esp"));
- toDelete.add(uploadTestScript(scriptPath,
- "request-attribute-test-sel1.esp", "sel1.txt.esp"));
- toDelete.add(uploadTestScript(scriptPath,
- "request-attribute-test-sel2.esp", "sel2.txt.esp"));
- toDelete.add(uploadTestScript(scriptPath,
- "request-attribute-test-sel3.esp", "sel3.txt.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "request-attribute-test.esp", "txt.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "request-attribute-test-sel1.esp", "sel1.txt.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "request-attribute-test-sel2.esp", "sel2.txt.esp"));
+ toDelete.add(uploadTestScript(scriptPath, "request-attribute-test-sel3.esp", "sel3.txt.esp"));
}
@Override
@@ -94,31 +92,23 @@ public class RequestAttributeTest extends HttpTestBase {
final String pB = new URL(nodeUrlB).getPath();
// this is from txt.esp
- assertEquals("Request Servlet 0 is null", "null",
- props.get("servlet00"));
- assertEquals("Request Resource 0 is null", "null",
- props.get("resource00"));
- assertEquals("Request Servlet 1 is null", "null",
- props.get("servlet01"));
- assertEquals("Request Resource 1 is null", "null",
- props.get("resource01"));
+ assertEquals("Request Servlet 0 is null", "null", props.get("servlet00"));
+ assertEquals("Request Resource 0 is null", "null", props.get("resource00"));
+ assertEquals("Request Servlet 1 is null", "null", props.get("servlet01"));
+ assertEquals("Request Resource 1 is null", "null", props.get("resource01"));
// this is from sel1.txt.esp, included by txt.esp
- assertEquals("Request Servlet 10", "/apps/nt/unstructured/txt.esp",
- props.get("servlet10"));
+ assertEquals("Request Servlet 10", "/apps/nt/unstructured/txt.esp", props.get("servlet10"));
assertEquals("Request Resource 10", pA, props.get("resource10"));
- assertEquals("Request Servlet 11", "/apps/nt/unstructured/txt.esp",
- props.get("servlet11"));
+ assertEquals("Request Servlet 11", "/apps/nt/unstructured/txt.esp", props.get("servlet11"));
assertEquals("Request Resource 11", pA, props.get("resource11"));
// this is from sel2.txt.esp, included by txt.esp
- assertEquals("Request Servlet 20", "/apps/nt/unstructured/txt.esp",
- props.get("servlet20"));
+ assertEquals("Request Servlet 20", "/apps/nt/unstructured/txt.esp", props.get("servlet20"));
assertEquals("Request Resource 20", pA, props.get("resource20"));
// this is from sel3.txt.esp, included by sel1.txt.esp
- assertEquals("Request Servlet 30",
- "/apps/nt/unstructured/sel1.txt.esp", props.get("servlet30"));
+ assertEquals("Request Servlet 30", "/apps/nt/unstructured/sel1.txt.esp", props.get("servlet30"));
assertEquals("Request Resource 30", pB, props.get("resource30"));
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java
index e3c5ac4..bb3b091 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java
@@ -1,25 +1,27 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
import org.apache.sling.commons.testing.integration.HttpTestBase;
public class ResourceDecoratorTest extends HttpTestBase {
-
+
public void testDecoratedResource() throws Exception {
final String path = "/testing/TestResourceDecorator/resource" + System.currentTimeMillis();
final TestNode tn = new TestNode(HTTP_BASE_URL + path, null);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
index 89eb426..4f8f374 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -23,91 +25,91 @@ import java.util.Map;
/** Test resource supertypes */
public class ResourceSuperTypeTest extends RenderingTestBase {
- public static final String ST_PROP = "sling:resourceSuperType";
- private List<String> toDelete = new ArrayList<String>();
- private String testPath;
- private int counter;
- private String uniqueId;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- toDelete.clear();
- uniqueId = "" + (++counter) + System.currentTimeMillis();
- testPath = "/" + ResourceSuperTypeTest.class.getSimpleName() + uniqueId;
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- testClient.delete(WEBDAV_BASE_URL + testPath);
- for(String url : toDelete) {
- testClient.delete(url);
- }
- }
-
- /** Test setting the sling:resourceSuperType directly on a node */
- public void testSuperTypeOnResource() throws Exception {
- final String superType = getClass().getSimpleName() + uniqueId + "SuperType";
- String superTypeScriptPath = "/apps/" + superType;
- testClient.mkdirs(WEBDAV_BASE_URL, superTypeScriptPath);
-
- final Map<String, String> props = new HashMap<String, String>();
- props.put(ST_PROP, superType);
- final TestNode tn= new TestNode(HTTP_BASE_URL + testPath, props);
-
- // Without any scripts -> default rendering
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
-
- // Add supertype script and check that it is used
- toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
-
- // Add own resource type, but no script -> no change
- final String myType = getClass().getSimpleName() + uniqueId + "MyResourceType";
- String myTypeScriptPath = "/apps/" + myType;
- testClient.mkdirs(WEBDAV_BASE_URL, myTypeScriptPath);
- props.put("sling:resourceType", myType);
- testClient.createNode(tn.nodeUrl, props);
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
-
- // Add script for own resource type and check that it is used
- toDelete.add(uploadTestScript(myTypeScriptPath, "rendering-test-2.esp", "html.esp"));
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "Template #2 for ESP tests");
- }
-
- /** Test setting the sling:resourceSuperType on the folder that contains the scripts
- * of the node's own resource type */
- public void testSuperTypeOnScriptFolder() throws Exception {
-
- final String superType = getClass().getSimpleName() + uniqueId + "SuperType";
- String superTypeScriptPath = "/apps/" + superType;
- testClient.mkdirs(WEBDAV_BASE_URL, superTypeScriptPath);
-
- final String myType = getClass().getSimpleName() + uniqueId + "MyResourceType";
- String myTypeScriptPath = "/apps/" + myType;
- {
- // Set ST_PROP on the folder node that contains
- // the myType scripts
- final Map<String, String> props = new HashMap<String, String>();
- props.put("jcr:primaryType", "sling:Folder");
- props.put(ST_PROP, superType);
- testClient.createNode(HTTP_BASE_URL + myTypeScriptPath, props);
- }
-
- final Map<String, String> props = new HashMap<String, String>();
- props.put("sling:resourceType", myType);
- final TestNode tn= new TestNode(HTTP_BASE_URL + testPath, props);
-
- // Without any scripts -> default rendering
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
-
- // Add supertype script and check that it is used
- toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
-
- // Add script for own resource type and check that it is used
- toDelete.add(uploadTestScript(myTypeScriptPath, "rendering-test-2.esp", "html.esp"));
- assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "Template #2 for ESP tests");
- }
+ public static final String ST_PROP = "sling:resourceSuperType";
+ private List<String> toDelete = new ArrayList<String>();
+ private String testPath;
+ private int counter;
+ private String uniqueId;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ toDelete.clear();
+ uniqueId = "" + (++counter) + System.currentTimeMillis();
+ testPath = "/" + ResourceSuperTypeTest.class.getSimpleName() + uniqueId;
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ testClient.delete(WEBDAV_BASE_URL + testPath);
+ for (String url : toDelete) {
+ testClient.delete(url);
+ }
+ }
+
+ /** Test setting the sling:resourceSuperType directly on a node */
+ public void testSuperTypeOnResource() throws Exception {
+ final String superType = getClass().getSimpleName() + uniqueId + "SuperType";
+ String superTypeScriptPath = "/apps/" + superType;
+ testClient.mkdirs(WEBDAV_BASE_URL, superTypeScriptPath);
+
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put(ST_PROP, superType);
+ final TestNode tn = new TestNode(HTTP_BASE_URL + testPath, props);
+
+ // Without any scripts -> default rendering
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
+
+ // Add supertype script and check that it is used
+ toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
+
+ // Add own resource type, but no script -> no change
+ final String myType = getClass().getSimpleName() + uniqueId + "MyResourceType";
+ String myTypeScriptPath = "/apps/" + myType;
+ testClient.mkdirs(WEBDAV_BASE_URL, myTypeScriptPath);
+ props.put("sling:resourceType", myType);
+ testClient.createNode(tn.nodeUrl, props);
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
+
+ // Add script for own resource type and check that it is used
+ toDelete.add(uploadTestScript(myTypeScriptPath, "rendering-test-2.esp", "html.esp"));
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "Template #2 for ESP tests");
+ }
+
+ /** Test setting the sling:resourceSuperType on the folder that contains the scripts
+ * of the node's own resource type */
+ public void testSuperTypeOnScriptFolder() throws Exception {
+
+ final String superType = getClass().getSimpleName() + uniqueId + "SuperType";
+ String superTypeScriptPath = "/apps/" + superType;
+ testClient.mkdirs(WEBDAV_BASE_URL, superTypeScriptPath);
+
+ final String myType = getClass().getSimpleName() + uniqueId + "MyResourceType";
+ String myTypeScriptPath = "/apps/" + myType;
+ {
+ // Set ST_PROP on the folder node that contains
+ // the myType scripts
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("jcr:primaryType", "sling:Folder");
+ props.put(ST_PROP, superType);
+ testClient.createNode(HTTP_BASE_URL + myTypeScriptPath, props);
+ }
+
+ final Map<String, String> props = new HashMap<String, String>();
+ props.put("sling:resourceType", myType);
+ final TestNode tn = new TestNode(HTTP_BASE_URL + testPath, props);
+
+ // Without any scripts -> default rendering
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "dumped by HtmlRenderer");
+
+ // Add supertype script and check that it is used
+ toDelete.add(uploadTestScript(superTypeScriptPath, "rendering-test.esp", "html.esp"));
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "ESP template");
+
+ // Add script for own resource type and check that it is used
+ toDelete.add(uploadTestScript(myTypeScriptPath, "rendering-test-2.esp", "html.esp"));
+ assertContains(getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML), "Template #2 for ESP tests");
+ }
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
index a290fd9..1e843f3 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -35,8 +37,9 @@ public class ScriptBindingsValuesProviderTest extends RenderingTestBase {
testText = "This is a test " + System.currentTimeMillis();
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
@@ -47,41 +50,50 @@ public class ScriptBindingsValuesProviderTest extends RenderingTestBase {
}
public void testGenericProvider() throws IOException {
- final String toDelete = uploadTestScript("bindingsprovided.esp","html.esp");
+ final String toDelete = uploadTestScript("bindingsprovided.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker (" + content + ")",content.contains("ESP template"));
+ assertTrue("Content includes ESP marker (" + content + ")", content.contains("ESP template"));
assertTrue("Content includes test text (" + content + ")", content.contains("Hello World!"));
- assertTrue("Content doesn't include Groovy-specific test text (" + content + ")", content.contains("groovyHelloWorld:undefined"));
+ assertTrue(
+ "Content doesn't include Groovy-specific test text (" + content + ")",
+ content.contains("groovyHelloWorld:undefined"));
} finally {
testClient.delete(toDelete);
}
}
public void testJSPProvider() throws IOException {
- final String toDelete = uploadTestScript("bindingsprovided.jsp","html.jsp");
+ final String toDelete = uploadTestScript("bindingsprovided.jsp", "html.jsp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker (" + content + ")",content.contains("bindingsprovided.jsp"));
+ assertTrue("Content includes JSP marker (" + content + ")", content.contains("bindingsprovided.jsp"));
assertTrue("Content includes test text (" + content + ")", content.contains("Hello World!"));
- assertTrue("Content includes JSP-specific test text (" + content + ")", content.contains("Hello World from JSP!"));
- assertFalse("Content doesn't includes Groovy-specific test text (" + content + ")", content.contains("Hello World from Groovy!"));
+ assertTrue(
+ "Content includes JSP-specific test text (" + content + ")",
+ content.contains("Hello World from JSP!"));
+ assertFalse(
+ "Content doesn't includes Groovy-specific test text (" + content + ")",
+ content.contains("Hello World from Groovy!"));
} finally {
testClient.delete(toDelete);
}
}
public void testJSPProviderEL() throws IOException {
- final String toDelete = uploadTestScript("bindingsprovided_el.jsp","html.jsp");
+ final String toDelete = uploadTestScript("bindingsprovided_el.jsp", "html.jsp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes JSP marker (" + content + ")",content.contains("bindingsprovided_el.jsp"));
+ assertTrue("Content includes JSP marker (" + content + ")", content.contains("bindingsprovided_el.jsp"));
assertTrue("Content includes test text (" + content + ")", content.contains("Hello World!"));
- assertTrue("Content includes JSP-specific test text (" + content + ")", content.contains("Hello World from JSP!"));
- assertFalse("Content doesn't includes Groovy-specific test text (" + content + ")", content.contains("Hello World from Groovy!"));
+ assertTrue(
+ "Content includes JSP-specific test text (" + content + ")",
+ content.contains("Hello World from JSP!"));
+ assertFalse(
+ "Content doesn't includes Groovy-specific test text (" + content + ")",
+ content.contains("Hello World from Groovy!"));
} finally {
testClient.delete(toDelete);
}
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
index 8651f57..fa44966 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -35,8 +37,9 @@ public class ScriptBuiltinObjectsTest extends RenderingTestBase {
testText = "This is a test " + System.currentTimeMillis();
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
props.put("sling:resourceType", slingResourceType);
props.put("text", testText);
displayUrl = testClient.createNode(url, props);
@@ -47,17 +50,20 @@ public class ScriptBuiltinObjectsTest extends RenderingTestBase {
}
public void testEspBuiltinObjects() throws IOException {
- final String toDelete = uploadTestScript("builtin-objects.esp","html.esp");
+ final String toDelete = uploadTestScript("builtin-objects.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker (" + content + ")",content.contains("ESP template"));
+ assertTrue("Content includes ESP marker (" + content + ")", content.contains("ESP template"));
assertTrue("Content includes test text (" + content + ")", content.contains(testText));
- assertTrue("Content includes currentNode text (" + content + ")", content.contains("currentNode.text:" + testText));
- assertTrue("Content includes sc data (" + content + ")",content.contains("sc:null"));
- assertTrue("Content includes response data (" + content + ")",content.contains("SlingHttpServletResponse:false"));
+ assertTrue(
+ "Content includes currentNode text (" + content + ")",
+ content.contains("currentNode.text:" + testText));
+ assertTrue("Content includes sc data (" + content + ")", content.contains("sc:null"));
+ assertTrue(
+ "Content includes response data (" + content + ")",
+ content.contains("SlingHttpServletResponse:false"));
} finally {
testClient.delete(toDelete);
}
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
index 615ae1b..1d9a8bf 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.io.File;
import java.io.FileInputStream;
import java.net.URI;
@@ -41,6 +38,9 @@ import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/**
* Execute all server-side test scripts found in a specified
* (class) resource folder.
@@ -76,22 +76,22 @@ public class ServerSideScriptsTest {
this.testScriptFile = file;
this.willFail = willFail;
}
-
+
@Override
public String toString() {
return testScriptFile.getName();
}
}
-
+
private static class Collector {
private final List<Definition> tests = new ArrayList<Definition>();
private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
+
Collector() {
addScripts(TEST_SCRIPT_DIR_DEFAULT, false);
addScripts(TEST_SCRIPT_DIR_FAIL_DEFAULT, true);
}
-
+
/**
* Get the directory for a resource path
* @param resourcePath The resource path pointing to the script directory
@@ -100,19 +100,19 @@ public class ServerSideScriptsTest {
private File getScriptDirectory(final String resourcePath) {
final URL url = ServerSideScriptsTest.class.getClassLoader().getResource(resourcePath);
if (url != null) {
- if ( url.getProtocol().equals("file") ) {
+ if (url.getProtocol().equals("file")) {
URI uri = null;
try {
uri = url.toURI();
final File dir = new File(uri);
- if ( dir.exists() && dir.isDirectory() ) {
+ if (dir.exists() && dir.isDirectory()) {
return dir;
}
} catch (final URISyntaxException e) {
- logger.info("Failed to get scripts from " + url , e);
+ logger.info("Failed to get scripts from " + url, e);
// ignore
}
- } else if ( url.getProtocol().equals("jar") ) {
+ } else if (url.getProtocol().equals("jar")) {
final String urlString = url.toString();
final int pos = urlString.indexOf('!');
try {
@@ -134,7 +134,7 @@ public class ServerSideScriptsTest {
expander.execute();
final File dir = new File(tempDir, resourcePath);
- if ( dir.exists() && dir.isDirectory() ) {
+ if (dir.exists() && dir.isDirectory()) {
return dir;
}
} catch (final Exception e) {
@@ -148,21 +148,20 @@ public class ServerSideScriptsTest {
}
return null;
}
-
+
/**
* Collect all scripts of a directory specified by the resource path.
*
* @param resourcePath The resource path pointing to the script directory
* @param willFail <code>false</code> if this test is expected to succeed, <code>true</code> otherwise
*/
- private void addScripts(final String resourcePath,
- final boolean willFail) {
+ private void addScripts(final String resourcePath, final boolean willFail) {
final File scriptDir = getScriptDirectory(resourcePath);
- if ( scriptDir != null && scriptDir.list() != null && scriptDir.list().length > 0) {
- for(final File f : scriptDir.listFiles()) {
- if ( !f.isHidden() ) {
- if ( f.isFile() ) {
+ if (scriptDir != null && scriptDir.list() != null && scriptDir.list().length > 0) {
+ for (final File f : scriptDir.listFiles()) {
+ if (!f.isHidden()) {
+ if (f.isFile()) {
logger.info("Found test script {}", f.getAbsolutePath());
final Definition test = new Definition(f, willFail);
@@ -175,20 +174,21 @@ public class ServerSideScriptsTest {
logger.info("No test scripts found with resource path {}", resourcePath);
}
}
-
+
List<Definition> getTests() {
return tests;
}
- };
+ }
+ ;
private final ServerSideTestClient slingClient;
private final Definition test;
-
- @Parameters(name="{index} - {0}")
+
+ @Parameters(name = "{index} - {0}")
public static Collection<Object[]> data() {
- final List<Object []> result = new ArrayList<Object []>();
- for(Definition t : new Collector().getTests()) {
- result.add(new Object[] { t });
+ final List<Object[]> result = new ArrayList<Object[]>();
+ for (Definition t : new Collector().getTests()) {
+ result.add(new Object[] {t});
}
return result;
}
@@ -216,39 +216,45 @@ public class ServerSideScriptsTest {
try {
// create test node
- this.slingClient.createNode(scriptPath,
- "jcr:primaryType", "sling:Folder",
- "jcr:mixinTypes", "sling:Test",
- "sling:resourceType", RESOURCE_TYPE_PREFIX + '/' + test.testName);
+ this.slingClient.createNode(
+ scriptPath,
+ "jcr:primaryType",
+ "sling:Folder",
+ "jcr:mixinTypes",
+ "sling:Test",
+ "sling:resourceType",
+ RESOURCE_TYPE_PREFIX + '/' + test.testName);
toDelete = scriptPath;
final String destPath = scriptPath + "/test.txt" + test.scriptExtension;
logger.info("Setting up node {} for {}", destPath, test.testScriptFile.getAbsoluteFile());
this.slingClient.upload(destPath, new FileInputStream(test.testScriptFile), -1, false);
-
+
// SLING-3087 with Oak, the Sling JUnit's scriptable module TestAllPaths class
// might still see the old script, and not yet the new one, for some time.
// There's probably a better way to avoid this...for now just wait a bit
Thread.sleep(2000L);
final long startTime = System.currentTimeMillis();
- final ServerSideTestClient.TestResults results = slingClient.runTests("org.apache.sling.junit.scriptable.ScriptableTestsProvider");
+ final ServerSideTestClient.TestResults results =
+ slingClient.runTests("org.apache.sling.junit.scriptable.ScriptableTestsProvider");
assertEquals("Expecting 1 scriptable test", 1, results.getTestCount());
final int failureCount = test.willFail ? 1 : 0;
- if( results.getFailures().size() != failureCount) {
+ if (results.getFailures().size() != failureCount) {
fail("Expected "
- + failureCount + " failing tests but got " + results.getFailures().size()
+ + failureCount + " failing tests but got "
+ + results.getFailures().size()
+ " for " + test.testScriptFile.getAbsolutePath()
+ ": " + results.getFailures());
}
-
+
logger.info("Execution of {} took {} msec", test, System.currentTimeMillis() - startTime);
} finally {
- if(toDelete != null) {
+ if (toDelete != null) {
this.slingClient.delete(toDelete);
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java
index 804ab7a..656437c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -27,17 +29,15 @@ public class ServletResolverConfigTest extends HttpTestBase {
public static final String CONFIG_PID = "org.apache.sling.servlets.resolver.SlingServletResolver";
public static final String GET_CONFIG_PATH = "/testing/GetConfigServlet.tidy.json/" + CONFIG_PID;
public static final String CONFIG_PROP = "servletresolver.cacheSize";
-
+
public void testCacheDisabled() throws Exception {
final String content = getContent(HTTP_BASE_URL + GET_CONFIG_PATH, CONTENT_TYPE_JSON);
final JsonObject json = JsonUtil.parseObject(content);
final int cacheSize = Integer.parseInt(json.getJsonObject("properties").getString(CONFIG_PROP));
- if(cacheSize != 0) {
- fail(
- "ServletResolver cache size should be set to zero for testing, current value=" + cacheSize
+ if (cacheSize != 0) {
+ fail("ServletResolver cache size should be set to zero for testing, current value=" + cacheSize
+ " *** THIS MIGHT CAUSE MANY OTHER TESTS TO FAIL!! ***"
- + " (" + CONFIG_PID + "/" + CONFIG_PROP + ")"
- );
+ + " (" + CONFIG_PID + "/" + CONFIG_PROP + ")");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
index 8c6af5f..a0ff752 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -35,7 +37,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void testEspHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -47,7 +49,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void testEspJavaCode() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -67,7 +69,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
// put our script under /apps/<resource type>
final String path = "/apps/" + slingResourceType;
testClient.mkdirs(WEBDAV_BASE_URL, path);
- final String toDelete = uploadTestScript(path,"rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript(path, "rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -88,7 +90,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
// put our script in the /apps/<second folder level of content> (SLING-125)
final String path = "/apps/" + secondFolderOfContentPath;
testClient.mkdirs(WEBDAV_BASE_URL, path);
- final String toDelete = uploadTestScript(path,"rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript(path, "rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertContains(content, "ESP template");
@@ -100,26 +102,35 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
public void testEspHtmlWithSelectors() throws IOException {
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath + "/a4");
- final String toDeleteA = uploadTestScript("rendering-test.esp","html.esp");
- final String toDeleteB = uploadTestScript("rendering-test-2.esp","a4.esp");
- final String toDeleteC = uploadTestScript("rendering-test-3.esp","a4/print.esp");
+ final String toDeleteA = uploadTestScript("rendering-test.esp", "html.esp");
+ final String toDeleteB = uploadTestScript("rendering-test-2.esp", "a4.esp");
+ final String toDeleteC = uploadTestScript("rendering-test-3.esp", "a4/print.esp");
try {
String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Without selectors, content includes standard marker",content.contains("ESP template"));
- assertTrue("Without selectors, content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Without selectors, content includes standard marker", content.contains("ESP template"));
+ assertTrue(
+ "Without selectors, content contains formatted test text",
+ content.contains("<p>" + testText + "</p>"));
content = getContent(displayUrl + ".a4.print.html", CONTENT_TYPE_HTML);
- assertTrue("With a4.print selectors, content includes marker 3",content.contains("Template #3 for ESP tests"));
- assertTrue("With a4.print selectors, content contains italic text",content.contains("<em>" + testText + "</em>"));
+ assertTrue(
+ "With a4.print selectors, content includes marker 3",
+ content.contains("Template #3 for ESP tests"));
+ assertTrue(
+ "With a4.print selectors, content contains italic text",
+ content.contains("<em>" + testText + "</em>"));
content = getContent(displayUrl + ".a4.html", CONTENT_TYPE_HTML);
- assertTrue("With a4 selector, content includes marker 2",content.contains("Template #2 for ESP tests"));
- assertTrue("With a4 selector, content contains bold text",content.contains("<b>" + testText + "</b>"));
+ assertTrue("With a4 selector, content includes marker 2", content.contains("Template #2 for ESP tests"));
+ assertTrue("With a4 selector, content contains bold text", content.contains("<b>" + testText + "</b>"));
content = getContent(displayUrl + ".different.html", CONTENT_TYPE_HTML);
- assertTrue("With different selector only, content includes standard marker",content.contains("ESP template"));
- assertTrue("With different selector only, content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue(
+ "With different selector only, content includes standard marker", content.contains("ESP template"));
+ assertTrue(
+ "With different selector only, content contains formatted test text",
+ content.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDeleteA);
testClient.delete(toDeleteB);
@@ -128,22 +139,22 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void TODO_FAILS_testEspHtmlUppercase() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "html.esp");
try {
final String content = getContent(displayUrl + ".HTML", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDelete);
}
}
public void TODO_FAILS_testEspNoExtension() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","GET.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "GET.esp");
try {
final String content = getContent(displayUrl, CONTENT_TYPE_PLAIN);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
+ assertTrue("Content includes ESP marker", content.contains("ESP template"));
+ assertTrue("Content contains formatted test text", content.contains("<p>" + testText + "</p>"));
} finally {
testClient.delete(toDelete);
}
@@ -151,7 +162,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
/** SLING-107, verify that extension is used instead of Content-Type for script name */
public void testEspJs() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","js.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "js.esp");
try {
final String content = getContent(displayUrl + ".js", CONTENT_TYPE_JS);
// template makes no JS sense, that's not a problem for this test
@@ -163,7 +174,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void testEspXml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","xml.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "xml.esp");
try {
final String content = getContent(displayUrl + ".xml", CONTENT_TYPE_XML);
assertContains(content, "ESP template");
@@ -174,7 +185,7 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void testEspPlain() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","txt.esp");
+ final String toDelete = uploadTestScript("rendering-test.esp", "txt.esp");
try {
final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
assertContains(content, "ESP template");
@@ -185,13 +196,13 @@ public class SlingResourceTypeRenderingTest extends AbstractSlingResourceTypeRen
}
public void TODO_FAILS_testJsHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
+ final String toDelete = uploadTestScript("rendering-test.ecma", "html.ecma");
try {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes JS marker",content.contains("Raw javascript template"));
- assertTrue("Content contains formatted test text",content.contains("<p><em>" + testText + "</em></p>"));
+ assertTrue("Content includes JS marker", content.contains("Raw javascript template"));
+ assertTrue("Content contains formatted test text", content.contains("<p><em>" + testText + "</em></p>"));
} finally {
testClient.delete(toDelete);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java
index 553ea6d..f7a1ffa 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import org.apache.commons.io.IOUtils;
-import org.apache.sling.commons.testing.integration.HttpAnyMethod;
-
import java.io.IOException;
import java.io.InputStream;
+import org.apache.commons.io.IOUtils;
+import org.apache.sling.commons.testing.integration.HttpAnyMethod;
/*
* handler ranking identifier
@@ -36,14 +35,14 @@ import java.io.InputStream;
public class SlingWebDavServletTest extends RenderingTestBase {
private final String testDir = "/sling-test/" + getClass().getSimpleName() + System.currentTimeMillis();
-
+
// TODO there was previously no /default and the test passed, with a // before the testDir path
// - need to clarify if this was by design
private final String testDirUrl = HTTP_BASE_URL + "/dav/default" + testDir;
- private final String HANDLER = "test-io-handler-";
- private final String HANDLER_1 = "test-io-handler-1";
- private final String HANDLER_11 = "test-io-handler-11";
+ private final String HANDLER = "test-io-handler-";
+ private final String HANDLER_1 = "test-io-handler-1";
+ private final String HANDLER_11 = "test-io-handler-11";
private final String HANDLER_111 = "test-io-handler-111";
private static final String NUMMY_DATA = "dummy-data";
@@ -65,7 +64,7 @@ public class SlingWebDavServletTest extends RenderingTestBase {
public void testServiceRunning() throws IOException {
final String url = getHandlerUrl(HANDLER_1);
- final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND",url);
+ final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND", url);
int status = httpClient.executeMethod(propfind);
assertEquals("PROPFIND " + url + " must return status 207", 207, status);
final String content = propfind.getResponseBodyAsString();
@@ -86,7 +85,7 @@ public class SlingWebDavServletTest extends RenderingTestBase {
* @throws IOException
*/
private void checkHandler(String handlerName, String identifier) throws IOException {
- final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND",handlerName);
+ final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND", handlerName);
int status = httpClient.executeMethod(propfind);
assertEquals("PROPFIND " + handlerName + " must return status 207", 207, status);
final String content = propfind.getResponseBodyAsString();
@@ -103,12 +102,11 @@ public class SlingWebDavServletTest extends RenderingTestBase {
}
}
- private String getHandlerUrl(String handlerName){
+ private String getHandlerUrl(String handlerName) {
return testDirUrl + "/" + handlerName;
}
- private String getHandlerIdentifier(String handlerName){
+ private String getHandlerIdentifier(String handlerName) {
return handlerName + "-";
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
index 77adde7..423629e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
@@ -1,36 +1,38 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import java.io.IOException;
-
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Some tests about static content */
public class StaticContentTest extends HttpTestBase {
-
+
public void testWebInfForbidden() throws IOException {
// if DefaultSlingServlet handled this we'd get an SC_FORBIDDEN, but it looks
// like the servlet container blocks it already
assertHttpStatus(HTTP_BASE_URL + "/WEB-INF/web.xml", HttpServletResponse.SC_NOT_FOUND);
}
-
+
public void testMetaInfForbidden() throws IOException {
// if DefaultSlingServlet handled this we'd get an SC_FORBIDDEN, but it looks
// like the servlet container blocks it already
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
index 120f840..efba023 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
@@ -1,25 +1,26 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-
/** Test the streaming of static files uploaded to the repository */
public class StreamServletTest extends RenderingTestBase {
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -27,9 +28,9 @@ public class StreamServletTest extends RenderingTestBase {
displayUrl = HTTP_BASE_URL + scriptPath;
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
}
-
+
private void runTest(String filename, String expectedContentType, String expectedContent) throws Exception {
- final String toDelete = uploadTestScript(filename,filename);
+ final String toDelete = uploadTestScript(filename, filename);
try {
final String url = displayUrl + "/" + filename;
final String content = getContent(url, expectedContentType);
@@ -38,7 +39,7 @@ public class StreamServletTest extends RenderingTestBase {
testClient.delete(toDelete);
}
}
-
+
public void testPlainTextFile() throws Exception {
runTest("testfile.txt", CONTENT_TYPE_PLAIN, "This is just some text in an ASCII file.");
}
@@ -46,11 +47,11 @@ public class StreamServletTest extends RenderingTestBase {
public void testHtmlFile() throws Exception {
runTest("testfile.html", CONTENT_TYPE_HTML, "This is <em>testfile.html</em>");
}
-
+
public void testJavascriptFile() throws Exception {
runTest("testfile.js", CONTENT_TYPE_JS, "// This is testfile.js");
}
-
+
public void testJsonFile() throws Exception {
runTest("testfile.json", CONTENT_TYPE_JSON, "This is testfile.json");
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
index d46f2d7..544f2ac 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTestBase;
-
/** Test the SLING-129 {@link org.apache.sling.api.resource.SyntheticResource}, by requesting
* non-existent Nodes..
*/
@@ -32,67 +31,67 @@ public class SyntheticResourceTest extends HttpTestBase {
* and check that we get the specified status for every URL
* @throws IOException
*/
- private void assertDeepGetStatus(String basePath, int nLevels, int expectedStatus, String urlSuffix) throws IOException {
+ private void assertDeepGetStatus(String basePath, int nLevels, int expectedStatus, String urlSuffix)
+ throws IOException {
String path = basePath;
- for(int level=1; level <= nLevels; level++) {
+ for (int level = 1; level <= nLevels; level++) {
final String url = HTTP_BASE_URL + path + urlSuffix;
- assertHttpStatus(url, expectedStatus,"Unexpected status at URL=" + url);
- basePath += "/level_" + level + "_" + (int)(Math.random() * Integer.MAX_VALUE);
+ assertHttpStatus(url, expectedStatus, "Unexpected status at URL=" + url);
+ basePath += "/level_" + level + "_" + (int) (Math.random() * Integer.MAX_VALUE);
}
}
public void TODO_FAILS_testSearchSyntheticResource() throws IOException {
// build a very random deep URL under /search and
// verify that we get a 200 every time
- assertDeepGetStatus("/search",10,200,"");
+ assertDeepGetStatus("/search", 10, 200, "");
}
public void TODO_FAILS_testSearchSyntheticResourceHtml() throws IOException {
// build a very random deep URL under /search and
// verify that we get a 200 every time
- assertDeepGetStatus("/search",10,200,".html");
- assertDeepGetStatus("/search",10,200,".a4.print.html");
+ assertDeepGetStatus("/search", 10, 200, ".html");
+ assertDeepGetStatus("/search", 10, 200, ".a4.print.html");
}
public void TODO_FAILS_testSearchSyntheticResourceJson() throws IOException {
// build a very random deep URL under /search and
// verify that we get a 200 every time
- assertDeepGetStatus("/search",10,200,".json");
- assertDeepGetStatus("/search",10,200,".a4.print.json");
+ assertDeepGetStatus("/search", 10, 200, ".json");
+ assertDeepGetStatus("/search", 10, 200, ".a4.print.json");
}
public void TODO_FAILS_testSearchSyntheticResourceTxt() throws IOException {
// build a very random deep URL under /search and
// verify that we get a 200 every time
- assertDeepGetStatus("/search",10,200,".txt");
- assertDeepGetStatus("/search",10,200,".a4.print.txt");
+ assertDeepGetStatus("/search", 10, 200, ".txt");
+ assertDeepGetStatus("/search", 10, 200, ".a4.print.txt");
}
public void testNoSyntheticResourceTest() throws IOException {
// walk down a random path, verify that we
// get 404s all the time
- final String basePath = "/" + getClass().getSimpleName() + "_" + System.currentTimeMillis() + "/" + (int)(Math.random() * Integer.MAX_VALUE);
- assertDeepGetStatus(basePath,10,404,"");
+ final String basePath = "/" + getClass().getSimpleName() + "_" + System.currentTimeMillis() + "/"
+ + (int) (Math.random() * Integer.MAX_VALUE);
+ assertDeepGetStatus(basePath, 10, 404, "");
}
public void TODO_FAILS_testSyntheticResourceWithJstTemplate() throws IOException {
final String synthResourceUrl = HTTP_BASE_URL + "/search/something.SyntheticResourceTest.html";
{
final String content = getContent(synthResourceUrl, CONTENT_TYPE_HTML);
- assertFalse("Content must not include JST marker before test",content.contains("JST template"));
+ assertFalse("Content must not include JST marker before test", content.contains("JST template"));
}
- //final String scriptPath = "/apps/" + SyntheticResource.DEFAULT_RESOURCE_TYPE + "/SyntheticResourceTest";
+ // final String scriptPath = "/apps/" + SyntheticResource.DEFAULT_RESOURCE_TYPE + "/SyntheticResourceTest";
final String scriptPath = "TODO";
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
- final String toDelete = uploadTestScript(scriptPath,"rendering-test.jst","html.jst");
+ final String toDelete = uploadTestScript(scriptPath, "rendering-test.jst", "html.jst");
try {
final String content = getContent(synthResourceUrl, CONTENT_TYPE_HTML);
- assertTrue("Content includes JST marker: " + content,content.contains("JST template"));
+ assertTrue("Content includes JST marker: " + content, content.contains("JST template"));
} finally {
testClient.delete(toDelete);
}
}
-
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
index f490e4c..e6a1488 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
@@ -1,47 +1,47 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.sling.commons.testing.integration.HttpTestBase;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
/**
* Test uploading files using the Sling post servlet (SLING-168)
*/
public class UploadFileTest extends HttpTestBase {
-
- private static final String UPLOAD_CONTENT = "This file is used by UploadFileTest.java.\n" +
- "\n" +
- "It must contain http://www.apache.org/licenses/LICENSE-2.0 for tests.\n" +
- "\n" +
- "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Fusce semper ipsum et lorem. In hac habitasse \n" +
- "platea dictumst. Donec dictum tincidunt purus. Aenean quis nunc. Aliquam rhoncus. Proin sed risus. \n" +
- "Maecenas porta arcu in nisi. Pellentesque quis sapien quis lectus vehicula aliquet. Cras ornare elit \n" +
- "eget massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed \n" +
- "ut justo. Integer porttitor quam. Aliquam aliquet. Nulla interdum arcu vitae nibh. Morbi dapibus odio \n" +
- "a sem. Integer dictum. Praesent vel eros nec ipsum venenatis malesuada. Vestibulum rutrum mi ac ligula. \n" +
- "Ut nisl ligula, vehicula dignissim, accumsan quis, faucibus sed, sapien. Quisque purus tellus, euismod \n" +
- "id, auctor quis, rutrum non, augue.\n";
+ private static final String UPLOAD_CONTENT = "This file is used by UploadFileTest.java.\n" + "\n"
+ + "It must contain http://www.apache.org/licenses/LICENSE-2.0 for tests.\n"
+ + "\n"
+ + "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Fusce semper ipsum et lorem. In hac habitasse \n"
+ + "platea dictumst. Donec dictum tincidunt purus. Aenean quis nunc. Aliquam rhoncus. Proin sed risus. \n"
+ + "Maecenas porta arcu in nisi. Pellentesque quis sapien quis lectus vehicula aliquet. Cras ornare elit \n"
+ + "eget massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed \n"
+ + "ut justo. Integer porttitor quam. Aliquam aliquet. Nulla interdum arcu vitae nibh. Morbi dapibus odio \n"
+ + "a sem. Integer dictum. Praesent vel eros nec ipsum venenatis malesuada. Vestibulum rutrum mi ac ligula. \n"
+ + "Ut nisl ligula, vehicula dignissim, accumsan quis, faucibus sed, sapien. Quisque purus tellus, euismod \n"
+ + "id, auctor quis, rutrum non, augue.\n";
public void testDistinctResource() throws IOException {
String folderPath = "/UploadFileTest_1_" + System.currentTimeMillis();
@@ -51,7 +51,7 @@ public class UploadFileTest extends HttpTestBase {
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, null);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
@@ -63,7 +63,7 @@ public class UploadFileTest extends HttpTestBase {
String urlOfFileNode = urlOfNewNode + "/file";
final GetMethod get = new GetMethod(urlOfFileNode);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfFileNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfFileNode + " must be accessible after createNode", 200, status);
/*
We should check the data, but nt:resources are not handled yet
@@ -79,10 +79,8 @@ public class UploadFileTest extends HttpTestBase {
// just check for some strings
assertTrue("checking primary type", json.contains("\"jcr:primaryType\":\"nt:resource\""));
assertTrue("checking mime type", json.contains("\"jcr:mimeType\":\"text/plain\""));
-
}
-
public void testDistinctResourceWithType() throws IOException {
String folderPath = "/UploadFileTest_1_" + System.currentTimeMillis();
final String url = HTTP_BASE_URL + folderPath;
@@ -91,7 +89,7 @@ public class UploadFileTest extends HttpTestBase {
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, null);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
@@ -103,7 +101,7 @@ public class UploadFileTest extends HttpTestBase {
String urlOfFileNode = urlOfNewNode + "/file";
final GetMethod get = new GetMethod(urlOfFileNode);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfFileNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfFileNode + " must be accessible after createNode", 200, status);
/*
We should check the data, but nt:resources are not handled yet
@@ -127,7 +125,6 @@ public class UploadFileTest extends HttpTestBase {
testClient.mkdirs(WEBDAV_BASE_URL, folderPath);
final String url = HTTP_BASE_URL + folderPath;
-
// upload local file
File localFile = getTestFile();
testClient.uploadToFileNode(url, localFile, "./file", null);
@@ -150,7 +147,7 @@ public class UploadFileTest extends HttpTestBase {
String webdavUrl = WEBDAV_BASE_URL + folderPath + "/file";
final GetMethod get = new GetMethod(webdavUrl);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfFileNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfFileNode + " must be accessible after createNode", 200, status);
// compare data with local file (just length)
final byte[] data = get.getResponseBody();
@@ -162,7 +159,6 @@ public class UploadFileTest extends HttpTestBase {
assertTrue("checking primary type", json.contains("\"jcr:primaryType\":\"nt:file\""));
}
-
public void testMultiFileUpload() throws IOException {
String folderPath = "/UploadFileTest_1_" + System.currentTimeMillis();
final String url = HTTP_BASE_URL + folderPath;
@@ -171,41 +167,32 @@ public class UploadFileTest extends HttpTestBase {
String urlOfNewNode = null;
try {
urlOfNewNode = testClient.createNode(url, null);
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
fail("createNode failed: " + ioe);
}
// upload local file
File tempFile = getTestFile();
- File [] localFiles = new File[] {
- tempFile,
- tempFile,
- tempFile
- };
- String [] fieldNames = new String [] {
- "./file1.txt",
- "./file2.txt",
- "./*"
- };
+ File[] localFiles = new File[] {tempFile, tempFile, tempFile};
+ String[] fieldNames = new String[] {"./file1.txt", "./file2.txt", "./*"};
testClient.uploadToFileNodes(urlOfNewNode, localFiles, fieldNames, null);
// get and check URL of created file1
String urlOfFileNode = urlOfNewNode + "/file1.txt";
- checkUploadedFileState(urlOfFileNode);
+ checkUploadedFileState(urlOfFileNode);
// get and check URL of created file2
String urlOfFileNode2 = urlOfNewNode + "/file2.txt";
- checkUploadedFileState(urlOfFileNode2);
+ checkUploadedFileState(urlOfFileNode2);
// get and check URL of created file3
String urlOfFileNode3 = urlOfNewNode + "/file-to-upload.txt";
- checkUploadedFileState(urlOfFileNode3);
+ checkUploadedFileState(urlOfFileNode3);
}
- private void checkUploadedFileState(String urlOfFileNode) throws IOException,
- HttpException {
- final GetMethod get = new GetMethod(urlOfFileNode);
+ private void checkUploadedFileState(String urlOfFileNode) throws IOException, HttpException {
+ final GetMethod get = new GetMethod(urlOfFileNode);
final int status = httpClient.executeMethod(get);
- assertEquals(urlOfFileNode + " must be accessible after createNode",200,status);
+ assertEquals(urlOfFileNode + " must be accessible after createNode", 200, status);
/*
We should check the data, but nt:resources are not handled yet
@@ -225,20 +212,19 @@ public class UploadFileTest extends HttpTestBase {
// just check for some strings
assertTrue("checking primary type", content_json.contains("\"jcr:primaryType\":\"nt:resource\""));
assertTrue("checking mime type", content_json.contains("\"jcr:mimeType\":\"text/plain\""));
- }
-
- /**
- * @return
- * @throws IOException
- */
- private File getTestFile() throws IOException {
- File tempFile = new File("target/file-to-upload.txt");
- if ( !tempFile.exists() || tempFile.length() == 0 ) {
- FileWriter out = new FileWriter(tempFile);
- out.write(UPLOAD_CONTENT); // we do rather than from a resource since surefire has fun with classloaders.
- out.close();
}
- return tempFile;
- }
-}
\ No newline at end of file
+ /**
+ * @return
+ * @throws IOException
+ */
+ private File getTestFile() throws IOException {
+ File tempFile = new File("target/file-to-upload.txt");
+ if (!tempFile.exists() || tempFile.length() == 0) {
+ FileWriter out = new FileWriter(tempFile);
+ out.write(UPLOAD_CONTENT); // we do rather than from a resource since surefire has fun with classloaders.
+ out.close();
+ }
+ return tempFile;
+ }
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
index 3e68c6c..f03dedf 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -28,53 +30,50 @@ public class ValueFromTest extends HttpTestBase {
private String postUrl;
private String testText;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
// set test values
testText = "This is a test " + System.currentTimeMillis();
-
+
// create the test node, under a path that's specific to this class to allow collisions
- postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
- final Map<String,String> props = new HashMap<String,String>();
+ postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String, String> props = new HashMap<String, String>();
props.put("text", testText);
}
-
+
public void testWithoutValueFrom() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("./text", testText);
final String jsonUrl = testClient.createNode(postUrl, props) + ".json";
final String json = getContent(jsonUrl, CONTENT_TYPE_JSON);
- assertJavascript(testText, json, "out.println(data.text)");
-
+ assertJavascript(testText, json, "out.println(data.text)");
}
-
+
public void testWithValueFrom() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("./text@ValueFrom", "fulltext");
props.put("fulltext", testText);
final String jsonUrl = testClient.createNode(postUrl, props) + ".json";
final String json = getContent(jsonUrl, CONTENT_TYPE_JSON);
- assertJavascript("string", json, "out.println(typeof data.text)");
- assertJavascript(testText, json, "out.println(data.text)");
- assertJavascript("undefined", json, "out.println(typeof data.fulltext)");
+ assertJavascript("string", json, "out.println(typeof data.text)");
+ assertJavascript(testText, json, "out.println(data.text)");
+ assertJavascript("undefined", json, "out.println(typeof data.fulltext)");
}
-
+
public void testWithValueFromAndMissingField() throws IOException {
- final Map<String,String> props = new HashMap<String,String>();
+ final Map<String, String> props = new HashMap<String, String>();
props.put("./jcr:created", "");
props.put("./text@ValueFrom", "fulltext");
// no fulltext field on purpose, field must be ignored
-
+
final String jsonUrl = testClient.createNode(postUrl, props) + ".json";
final String json = getContent(jsonUrl, CONTENT_TYPE_JSON);
- assertJavascript("undefined", json, "out.println(typeof data.text)");
- assertJavascript("undefined", json, "out.println(typeof data['text@ValueFrom'])");
+ assertJavascript("undefined", json, "out.println(typeof data.text)");
+ assertJavascript("undefined", json, "out.println(typeof data['text@ValueFrom'])");
}
-
-
-
- }
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
index 6b16291..f84b8ba 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
@@ -1,29 +1,31 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.json.JsonException;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.json.JsonException;
-
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
@@ -48,8 +50,8 @@ public class VanityPathTest extends HttpTestBase {
// create the test node, under a path that's specific to this class to
// allow collisions
postUrl = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "_"
- + System.currentTimeMillis()
- + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
vanityPath = "/" + getClass().getSimpleName() + "_" + System.currentTimeMillis() + "/vanity";
vanityUrl = HTTP_BASE_URL + vanityPath;
@@ -171,9 +173,8 @@ public class VanityPathTest extends HttpTestBase {
resetMappingEventCount();
String pathWithExtension = removeHttpBase(createdNodeUrl) + ".ext";
- List<NameValuePair> moveParams = Arrays.asList(
- new NameValuePair(":dest", pathWithExtension),
- new NameValuePair(":operation", "move"));
+ List<NameValuePair> moveParams =
+ Arrays.asList(new NameValuePair(":dest", pathWithExtension), new NameValuePair(":operation", "move"));
assertPostStatus(createdNodeUrl, 201, moveParams, "Could not move created node from " + createdNodeUrl);
createdNodeUrl = createdNodeUrl + ".ext";
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java
index 5a86c6e..4a02e0b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java
@@ -1,28 +1,30 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-
import org.apache.commons.httpclient.HttpException;
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
@@ -32,17 +34,18 @@ public class VersionInfoServletTest extends HttpTestBase {
public static final String TEST_BASE_PATH = "/sling-tests";
- public static final String CONFIG_SERVLET = HTTP_BASE_URL + "/system/console/configMgr/org.apache.sling.servlets.get.impl.version.VersionInfoServlet";
+ public static final String CONFIG_SERVLET =
+ HTTP_BASE_URL + "/system/console/configMgr/org.apache.sling.servlets.get.impl.version.VersionInfoServlet";
private String postUrl;
- private Map<String,String> params;
+ private Map<String, String> params;
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
- params = new HashMap<String,String>();
+ params = new HashMap<String, String>();
params.put("jcr:mixinTypes", "mix:versionable");
}
@@ -64,15 +67,22 @@ public class VersionInfoServletTest extends HttpTestBase {
public void testStandardVersionsList() throws IOException, JsonException, InterruptedException {
createConfiguration("V");
waitUntilSlingIsStable();
- final JsonObject versions = JsonUtil.parseObject(getContent(createVersionableNode() + ".V.json", CONTENT_TYPE_JSON));
+ final JsonObject versions =
+ JsonUtil.parseObject(getContent(createVersionableNode() + ".V.json", CONTENT_TYPE_JSON));
assertTrue("Expecting versions subtree", versions.containsKey("versions"));
assertTrue("Expecting root version", versions.getJsonObject("versions").containsKey("jcr:rootVersion"));
assertTrue("Expecting version 1.0", versions.getJsonObject("versions").containsKey("1.0"));
final JsonObject oneZero = versions.getJsonObject("versions").getJsonObject("1.0");
- assertTrue("Expecting non-empty creation date", oneZero.getString("created").length() > 0);
- assertEquals("Expecting no successors", 0, oneZero.getJsonArray("successors").size());
- assertEquals("Expecting root version predecessor", "jcr:rootVersion", oneZero.getJsonArray("predecessors").getString(0));
+ assertTrue(
+ "Expecting non-empty creation date",
+ oneZero.getString("created").length() > 0);
+ assertEquals(
+ "Expecting no successors", 0, oneZero.getJsonArray("successors").size());
+ assertEquals(
+ "Expecting root version predecessor",
+ "jcr:rootVersion",
+ oneZero.getJsonArray("predecessors").getString(0));
assertEquals("Expecting no labels", 0, oneZero.getJsonArray("labels").size());
assertEquals("Expecting true baseVersion", true, oneZero.getBoolean("baseVersion"));
}
@@ -83,9 +93,12 @@ public class VersionInfoServletTest extends HttpTestBase {
createConfiguration("V");
waitForSlingStartup();
waitUntilSlingIsStable();
- final JsonObject versions = JsonUtil.parseObject(getContent(createVersionableNode() + ".V.harray.json", CONTENT_TYPE_JSON));
+ final JsonObject versions =
+ JsonUtil.parseObject(getContent(createVersionableNode() + ".V.harray.json", CONTENT_TYPE_JSON));
assertTrue("Expecting children array", versions.containsKey("__children__"));
- assertEquals("Expecting versions object", "versions",
+ assertEquals(
+ "Expecting versions object",
+ "versions",
versions.getJsonArray("__children__").getJsonObject(0).getString("__name__"));
}
@@ -104,11 +117,10 @@ public class VersionInfoServletTest extends HttpTestBase {
assertEquals(200, testClient.post(CONFIG_SERVLET, properties));
}
- private void waitUntilSlingIsStable() throws HttpException, IOException,
- InterruptedException {
+ private void waitUntilSlingIsStable() throws HttpException, IOException, InterruptedException {
for (int i = 0; i < 10; i++) {
Thread.sleep(1000);
- if (testClient.get(HTTP_BASE_URL + "/.json") == 200) {
+ if (testClient.get(HTTP_BASE_URL + "/.json") == 200) {
return;
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java
index 4fcdf0b..d91a866 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java
@@ -1,28 +1,30 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-
import org.apache.commons.httpclient.HttpException;
import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
@@ -32,17 +34,18 @@ public class VersionParameterTest extends HttpTestBase {
public static final String TEST_BASE_PATH = "/sling-tests";
- public static final String CONFIG_SERVLET = HTTP_BASE_URL + "/system/console/configMgr/org.apache.sling.servlets.get.impl.version.VersionInfoServlet";
+ public static final String CONFIG_SERVLET =
+ HTTP_BASE_URL + "/system/console/configMgr/org.apache.sling.servlets.get.impl.version.VersionInfoServlet";
private String postUrl;
- private Map<String,String> params;
+ private Map<String, String> params;
@Override
protected void setUp() throws Exception {
super.setUp();
postUrl = HTTP_BASE_URL + TEST_BASE_PATH + "/" + System.currentTimeMillis();
- params = new HashMap<String,String>();
+ params = new HashMap<String, String>();
params.put("jcr:mixinTypes", "mix:versionable");
}
@@ -72,17 +75,16 @@ public class VersionParameterTest extends HttpTestBase {
assertEquals("v2", getProp(location + ";v='1.1'.json"));
}
- private void waitUntilSlingIsStable() throws HttpException, IOException,
- InterruptedException {
+ private void waitUntilSlingIsStable() throws HttpException, IOException, InterruptedException {
for (int i = 0; i < 10; i++) {
Thread.sleep(1000);
- if (testClient.get(HTTP_BASE_URL + "/.json") == 200) {
+ if (testClient.get(HTTP_BASE_URL + "/.json") == 200) {
return;
}
}
fail("Sling instance fails to respond with status 200");
}
-
+
private String getProp(String url) throws JsonException, IOException {
final JsonObject content = JsonUtil.parseObject(getContent(url, CONTENT_TYPE_JSON));
return content.getString("prop");
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
index f91d23d..0f5b0fd 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.util.UUID;
@@ -31,27 +28,31 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/** Clarify the behavior of a double slash in a Sling WebDAV URL */
public class WebDavDoubleSlashTest {
private final HttpTest H = new HttpTest();
String testPath;
String toDelete;
-
+
@Before
public void setup() throws Exception {
H.setUp();
testPath = "/test/" + getClass().getSimpleName() + "/" + UUID.randomUUID();
toDelete = H.getTestClient().createNode(HttpTest.HTTP_BASE_URL + testPath, null);
}
-
+
@After
public void cleanup() throws Exception {
H.tearDown();
H.getTestClient().delete(toDelete);
}
-
+
/** Do a PROPFIND on /dav, adding worskpace name after that as required by the Jackrabbit WebDAV modules */
- private void assertPropfindStatus(final int expecetdStatus, final String workspace, final String path) throws IOException {
+ private void assertPropfindStatus(final int expecetdStatus, final String workspace, final String path)
+ throws IOException {
final String webdavRoot = "/dav";
final String url = HttpTest.HTTP_BASE_URL + webdavRoot + "/" + workspace + path;
final HttpAnyMethod propfind = new HttpAnyMethod("PROPFIND", url);
@@ -59,11 +60,8 @@ public class WebDavDoubleSlashTest {
if (expecetdStatus != status) {
// print the response body in case of a test failure to help debugging
- fail(
- "Status code " + expecetdStatus + " expected, got " + status + ".\n" +
- "Response body:\n" +
- propfind.getResponseBodyAsString()
- );
+ fail("Status code " + expecetdStatus + " expected, got " + status + ".\n" + "Response body:\n"
+ + propfind.getResponseBodyAsString());
} else {
// never fails, but there will be no assertion otherwise
assertEquals("Status code", expecetdStatus, status);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
index 7eadda9..296e604 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
@@ -18,22 +18,23 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import junitx.framework.Assert;
-import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.junit.Test;
-
import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-public class WebdavDeleteTest extends HttpTestBase{
+import junitx.framework.Assert;
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+import org.junit.Test;
+
+public class WebdavDeleteTest extends HttpTestBase {
private final String testDir = "/sling-test/" + getClass().getSimpleName() + System.currentTimeMillis();
private final String testDirUrl = HTTP_BASE_URL + testDir;
- private final String DEFAULT_HANDLER = "default-delete-handler";
- private final String HANDLER_1 = "test-delete-handler-1";
- private final String HANDLER_2 = "test-delete-handler-2";
+ private final String DEFAULT_HANDLER = "default-delete-handler";
+ private final String HANDLER_1 = "test-delete-handler-1";
+ private final String HANDLER_2 = "test-delete-handler-2";
private final String HANDLER_1_BKP = "backed-up-by-" + HANDLER_1;
private final String HANDLER_2_BKP = "backed-up-by-" + HANDLER_2;
@@ -63,16 +64,22 @@ public class WebdavDeleteTest extends HttpTestBase{
testClient.delete(HTTP_BASE_URL + testDir + "/" + HANDLER_2);
testClient.delete(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER);
- Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1));
- Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2));
- Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER));
+ Assert.assertEquals(
+ HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1));
+ Assert.assertEquals(
+ HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2));
+ Assert.assertEquals(
+ HttpServletResponse.SC_NOT_FOUND, testClient.get(HTTP_BASE_URL + testDir + "/" + DEFAULT_HANDLER));
- Assert.assertEquals(HttpServletResponse.SC_OK, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1 + HANDLER_1_BKP + ".json"));
- Assert.assertEquals(HttpServletResponse.SC_OK, testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2 + HANDLER_2_BKP + ".json"));
+ Assert.assertEquals(
+ HttpServletResponse.SC_OK,
+ testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_1 + HANDLER_1_BKP + ".json"));
+ Assert.assertEquals(
+ HttpServletResponse.SC_OK,
+ testClient.get(HTTP_BASE_URL + testDir + "/" + HANDLER_2 + HANDLER_2_BKP + ".json"));
} catch (IOException e) {
Assert.fail(e);
}
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java
index 8488836..75d9e48 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -23,7 +25,7 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Test WebDAV upload of various file types */
public class WebdavOptionsTest extends HttpTestBase {
-
+
public static final String WWW_Authenticate = "WWW-Authenticate";
/** OPTIONS request at given path must return a WWW-Authenticate header */
@@ -35,11 +37,11 @@ public class WebdavOptionsTest extends HttpTestBase {
final Header h = opt.getResponseHeader(WWW_Authenticate);
assertNotNull("Expecting " + WWW_Authenticate + " header in response at " + path, h);
}
-
+
public void testAuthenticateHeaderOnRoot() throws Exception {
doTestOnPath("/");
}
-
+
public void testAuthenticateHeaderOnDavPath() throws Exception {
doTestOnPath("/dav/default");
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
index 4017874..6eeb26e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -26,7 +28,7 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Test WebDAV upload of various file types */
public class WebdavUploadTest extends HttpTestBase {
-
+
private final String testDir = "/sling-test/" + getClass().getSimpleName() + System.currentTimeMillis();
private final String testDirUrl = WEBDAV_BASE_URL + testDir;
@@ -42,15 +44,15 @@ public class WebdavUploadTest extends HttpTestBase {
testClient.delete(testDirUrl);
}
- protected byte [] readStream(InputStream is) throws IOException {
- if(is == null) {
+ protected byte[] readStream(InputStream is) throws IOException {
+ if (is == null) {
fail("Null InputStream");
}
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try {
- final byte [] buffer = new byte[4096];
+ final byte[] buffer = new byte[4096];
int n = 0;
- while( (n = is.read(buffer, 0, buffer.length)) > 0) {
+ while ((n = is.read(buffer, 0, buffer.length)) > 0) {
bos.write(buffer, 0, n);
}
} finally {
@@ -60,53 +62,52 @@ public class WebdavUploadTest extends HttpTestBase {
}
return bos.toByteArray();
}
-
+
protected void compareData(String slingDataUrl, String localResourcePath) throws IOException {
-
+
// Get Sling content as a binary stream
final GetMethod m = new GetMethod(slingDataUrl);
final int httpStatus = httpClient.executeMethod(m);
assertEquals("GET " + slingDataUrl + " must return status 200", 200, httpStatus);
- final byte [] local = readStream(getClass().getResourceAsStream(localResourcePath));
- final byte [] remote = readStream(m.getResponseBodyAsStream());
-
+ final byte[] local = readStream(getClass().getResourceAsStream(localResourcePath));
+ final byte[] remote = readStream(m.getResponseBodyAsStream());
+
assertEquals("Local and remote files have the same length", local.length, remote.length);
-
- for(int i=0 ; i < local.length; i++) {
+
+ for (int i = 0; i < local.length; i++) {
assertEquals("Content must match at index " + i, local[i], remote[i]);
}
}
-
+
protected void uploadAndCheck(String localResourcePath) throws IOException {
final InputStream data = getClass().getResourceAsStream(localResourcePath);
- if(data==null) {
+ if (data == null) {
fail("Local resource not found: " + localResourcePath);
}
-
+
try {
final String url = testDirUrl + "/" + new File(localResourcePath).getName();
- testClient.upload(url, data);
+ testClient.upload(url, data);
compareData(url, localResourcePath);
} finally {
- if(data!=null) {
+ if (data != null) {
data.close();
}
}
-
}
-
+
public void testTextUpload() throws IOException {
uploadAndCheck("/integration-test/testfile.txt");
}
-
+
public void testXmlUpload() throws IOException {
uploadAndCheck("/integration-test/testfile.xml");
}
-
+
public void testZipUpload() throws IOException {
uploadAndCheck("/integration-test/testfile.zip");
}
-
+
public void testPngUpload() throws IOException {
uploadAndCheck("/integration-test/sling-logo.png");
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
index 269c891..fceb64f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest;
@@ -23,6 +25,7 @@ import org.junit.Test;
public class WriteableResourcesProxyTest {
@Test
public void runWriteableResourcesTest() throws Exception {
- new ServerSideTestClient().assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest", 1);
+ new ServerSideTestClient()
+ .assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest", 1);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
index fee4070..0205aa8 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
@@ -1,32 +1,30 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.auth;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
@@ -43,6 +41,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test of the response code from an authentication request depending on various
* request parameters and headers including j_validate, Ajax detection, and
@@ -59,7 +61,7 @@ public class AuthenticationResponseCodeTest {
public void setup() throws Exception {
H.setUp();
}
-
+
@After
public void cleanup() throws Exception {
H.tearDown();
@@ -71,14 +73,14 @@ public class AuthenticationResponseCodeTest {
params.add(new NameValuePair("j_username", "admin"));
params.add(new NameValuePair("j_password", "admin"));
params.add(new NameValuePair("j_validate", "true"));
- HttpMethod post = H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK,
- params, null);
+ HttpMethod post = H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK, params, null);
assertTrue(post.getResponseBodyAsString().length() == 0);
List<NameValuePair> params2 = new ArrayList<NameValuePair>();
params2.add(new NameValuePair("j_validate", "true"));
- HttpMethod post2 = H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK,
- params2, null);
+ HttpMethod post2 = H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK, params2, null);
assertTrue(post2.getResponseBodyAsString().length() == 0);
}
@@ -86,8 +88,8 @@ public class AuthenticationResponseCodeTest {
public void testValidatingCorrectHttpBasicCredentials() throws Exception {
List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new NameValuePair("j_validate", "true"));
- HttpMethod post = H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK,
- params, null);
+ HttpMethod post = H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_OK, params, null);
assertTrue(post.getResponseBodyAsString().length() == 0);
HttpMethod get = H.assertHttpStatus(HttpTest.HTTP_BASE_URL + "/?j_validate=true", HttpServletResponse.SC_OK);
@@ -100,8 +102,8 @@ public class AuthenticationResponseCodeTest {
params.add(new NameValuePair("j_username", "garbage"));
params.add(new NameValuePair("j_password", "garbage"));
params.add(new NameValuePair("j_validate", "true"));
- HttpMethod post = H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check",
- HttpServletResponse.SC_FORBIDDEN, params, null);
+ HttpMethod post = H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_FORBIDDEN, params, null);
assertNotNull(post.getResponseHeader("X-Reason"));
}
@@ -113,8 +115,8 @@ public class AuthenticationResponseCodeTest {
List<Header> headers = new ArrayList<Header>();
headers.add(new Header("Cookie", "sling.formauth=garbage"));
- HttpMethod post = assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check",
- HttpServletResponse.SC_FORBIDDEN, params, headers, null);
+ HttpMethod post = assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_FORBIDDEN, params, headers, null);
assertXReason(post);
}
@@ -124,17 +126,18 @@ public class AuthenticationResponseCodeTest {
// assume http and webdav are on the same host + port
URL url = new URL(HttpTest.HTTP_BASE_URL);
Credentials defaultcreds = new UsernamePasswordCredentials("garbage", "garbage");
- H.getHttpClient().getState()
+ H.getHttpClient()
+ .getState()
.setCredentials(new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM), defaultcreds);
List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new NameValuePair("j_validate", "true"));
- HttpMethod post = H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check",
- HttpServletResponse.SC_FORBIDDEN, params, null);
+ HttpMethod post = H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_FORBIDDEN, params, null);
assertXReason(post);
- HttpMethod get = H.assertHttpStatus(HttpTest.HTTP_BASE_URL + "/?j_validate=true",
- HttpServletResponse.SC_FORBIDDEN);
+ HttpMethod get =
+ H.assertHttpStatus(HttpTest.HTTP_BASE_URL + "/?j_validate=true", HttpServletResponse.SC_FORBIDDEN);
assertXReason(get);
}
@@ -144,7 +147,8 @@ public class AuthenticationResponseCodeTest {
// assume http and webdav are on the same host + port
URL url = new URL(HttpTest.HTTP_BASE_URL);
Credentials defaultcreds = new UsernamePasswordCredentials("garbage", "garbage");
- H.getHttpClient().getState()
+ H.getHttpClient()
+ .getState()
.setCredentials(new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM), defaultcreds);
final String requestUrl = HttpTest.HTTP_BASE_URL + "/junk?param1=1";
@@ -168,7 +172,9 @@ public class AuthenticationResponseCodeTest {
HttpMethod post = assertPostStatus(requestUrl, HttpServletResponse.SC_FORBIDDEN, params, headers, null);
assertNotNull(post.getResponseHeader("X-Reason"));
- assertEquals("Username and Password do not match", post.getResponseHeader("X-Reason").getValue());
+ assertEquals(
+ "Username and Password do not match",
+ post.getResponseHeader("X-Reason").getValue());
}
@Test
@@ -181,10 +187,12 @@ public class AuthenticationResponseCodeTest {
headers.add(new Header("X-Requested-With", "XMLHttpRequest"));
headers.add(new Header("User-Agent", "Mozilla/5.0 Sling Integration Test"));
- HttpMethod post = assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check",
- HttpServletResponse.SC_FORBIDDEN, params, headers, null);
+ HttpMethod post = assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_FORBIDDEN, params, headers, null);
assertNotNull(post.getResponseHeader("X-Reason"));
- assertEquals("Username and Password do not match", post.getResponseHeader("X-Reason").getValue());
+ assertEquals(
+ "Username and Password do not match",
+ post.getResponseHeader("X-Reason").getValue());
}
@Test
@@ -193,8 +201,8 @@ public class AuthenticationResponseCodeTest {
params.add(new NameValuePair("j_username", "garbage"));
params.add(new NameValuePair("j_password", "garbage"));
- H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_UNAUTHORIZED, params,
- null);
+ H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_UNAUTHORIZED, params, null);
}
@Test
@@ -206,13 +214,22 @@ public class AuthenticationResponseCodeTest {
List<Header> headers = new ArrayList<Header>();
headers.add(new Header("User-Agent", "Mozilla/5.0 Sling Integration Test"));
- assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_MOVED_TEMPORARILY, params, headers,
+ assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check",
+ HttpServletResponse.SC_MOVED_TEMPORARILY,
+ params,
+ headers,
null);
}
// TODO - move this method into commons.testing
- protected HttpMethod assertPostStatus(String url, int expectedStatusCode, List<NameValuePair> postParams,
- List<Header> headers, String assertMessage) throws IOException {
+ protected HttpMethod assertPostStatus(
+ String url,
+ int expectedStatusCode,
+ List<NameValuePair> postParams,
+ List<Header> headers,
+ String assertMessage)
+ throws IOException {
final PostMethod post = new PostMethod(url);
post.setFollowRedirects(false);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java
index 13c6a3e..423a42e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java
@@ -1,18 +1,20 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.crud;
@@ -36,13 +38,13 @@ public class CrudTest extends RenderingTestBase {
this.testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
// create the test node, under a path that's specific to this class to allow collisions
- final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis()
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
final NameValuePairList list = new NameValuePairList();
list.add("sling:resourceType", slingResourceType);
this.displayUrl = testClient.createNode(url, list, null, true);
-
}
@Override
@@ -70,6 +72,5 @@ public class CrudTest extends RenderingTestBase {
} finally {
testClient.delete(testScriptPath);
}
-
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
index 4781203..28e01fe 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest.indexing;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -37,10 +34,14 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
/**
* The <tt>FullTextIndexingTest</tt> verifies that a PDF file which is uploaded will have its contents indexed and
* available for full-text searches, in several different paths.
- *
+ *
*/
@RunWith(Parameterized.class)
public class FullTextIndexingTest {
@@ -51,15 +52,15 @@ public class FullTextIndexingTest {
private final String fileName;
private final String expectedText;
- @Parameters(name="{index} - {0}")
+ @Parameters(name = "{index} - {0}")
public static Collection<Object[]> data() {
- final List<Object []> result = new ArrayList<Object []>();
- result.add(new Object[] { "lorem-ipsum.pdf", "Excepteur", "/tmp/test-" });
- result.add(new Object[] { "another.pdf", "some text that we will search for", "/var/test-" });
- result.add(new Object[] { "french.pdf", "un autre PDF pour le test fulltext", "/libs/test-" });
+ final List<Object[]> result = new ArrayList<Object[]>();
+ result.add(new Object[] {"lorem-ipsum.pdf", "Excepteur", "/tmp/test-"});
+ result.add(new Object[] {"another.pdf", "some text that we will search for", "/var/test-"});
+ result.add(new Object[] {"french.pdf", "un autre PDF pour le test fulltext", "/libs/test-"});
return result;
}
-
+
public FullTextIndexingTest(String filename, String expectedText, String uploadPathPrefix) {
this.fileName = filename;
this.expectedText = expectedText;
@@ -69,12 +70,14 @@ public class FullTextIndexingTest {
@Test
public void testUploadedPdfIsIndexed() throws Exception {
- final String queryUrl = HttpTest.WEBDAV_BASE_URL + "/testing/fullTextQuery?q=" + URLEncoder.encode(expectedText, "UTF-8");
-
+ final String queryUrl =
+ HttpTest.WEBDAV_BASE_URL + "/testing/fullTextQuery?q=" + URLEncoder.encode(expectedText, "UTF-8");
+
final Condition c = new Condition() {
public boolean isTrue() throws Exception {
- String result = H.getContent(queryUrl, HttpTest.CONTENT_TYPE_PLAIN).trim();
+ String result =
+ H.getContent(queryUrl, HttpTest.CONTENT_TYPE_PLAIN).trim();
return result.equals(uploadPath + "/" + fileName + "/" + JcrConstants.JCR_CONTENT);
}
@@ -82,16 +85,16 @@ public class FullTextIndexingTest {
return "A document containing '" + expectedText + "' is found under " + uploadPath;
}
};
-
+
assertFalse("Expecting search to return nothing before upload", c.isTrue());
-
+
String localPath = "/integration-test/indexing/" + fileName;
InputStream resourceToUpload = getClass().getResourceAsStream(localPath);
- if (resourceToUpload == null)
- throw new IllegalArgumentException("No resource to upload found at " + localPath);
+ if (resourceToUpload == null) throw new IllegalArgumentException("No resource to upload found at " + localPath);
H.getTestClient().mkdirs(HttpTest.WEBDAV_BASE_URL, uploadPath);
- final int status = H.getTestClient().upload(HttpTest.WEBDAV_BASE_URL + uploadPath + "/" + fileName, resourceToUpload);
+ final int status =
+ H.getTestClient().upload(HttpTest.WEBDAV_BASE_URL + uploadPath + "/" + fileName, resourceToUpload);
assertEquals("Upload status code", 201, status);
new RetryLoop(c, 15, 50);
@@ -108,4 +111,4 @@ public class FullTextIndexingTest {
H.getTestClient().delete(HttpTest.WEBDAV_BASE_URL + uploadPath);
H.tearDown();
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java
index f694b7f..1be602f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java
@@ -1,22 +1,26 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.installer;
-import static org.junit.Assert.fail;
+import javax.json.JsonException;
+import javax.json.JsonObject;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
@@ -24,10 +28,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.servlet.http.HttpServletResponse;
-
+import junit.framework.AssertionFailedError;
import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
import org.apache.sling.testing.tools.sling.TimeoutsProvider;
@@ -39,7 +40,7 @@ import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import junit.framework.AssertionFailedError;
+import static org.junit.Assert.fail;
/** Test the installation and update of several (optionally many)
* bundles via the JCR installer
@@ -54,11 +55,11 @@ public class InstallManyBundlesTest {
private static final String TEST_ID = UUID.randomUUID().toString();
- private static final String BASE_BSN = "org.apache.sling.testbundle."
- + InstallManyBundlesTest.class.getSimpleName()
- + "." + TEST_ID;
+ private static final String BASE_BSN =
+ "org.apache.sling.testbundle." + InstallManyBundlesTest.class.getSimpleName() + "." + TEST_ID;
- private static final String INSTALL_PATH = "/apps/" + InstallManyBundlesTest.class.getSimpleName() + "/" + TEST_ID + "/install";
+ private static final String INSTALL_PATH =
+ "/apps/" + InstallManyBundlesTest.class.getSimpleName() + "/" + TEST_ID + "/install";
private static HttpTest H = new HttpTest();
@@ -85,7 +86,8 @@ public class InstallManyBundlesTest {
.build();
}
- private void assertActiveBundle(String bsn, String expectedState, String expectedVersion) throws IOException, JsonException {
+ private void assertActiveBundle(String bsn, String expectedState, String expectedVersion)
+ throws IOException, JsonException {
final String consoleUrl = HttpTest.HTTP_BASE_URL + "/system/console/bundles/" + bsn + ".json";
String state = null;
@@ -93,20 +95,20 @@ public class InstallManyBundlesTest {
final long timeoutMsec = TimeoutsProvider.getInstance().getTimeout(WAIT_ACTIVE_TIMEOUT_MSEC);
final long endTime = System.currentTimeMillis() + timeoutMsec;
- while(System.currentTimeMillis() < endTime) {
+ while (System.currentTimeMillis() < endTime) {
try {
final String jsonStr = H.getContent(consoleUrl, HttpTest.CONTENT_TYPE_JSON);
final JsonObject json = JsonUtil.parseObject(jsonStr);
state = json.getJsonArray("data").getJsonObject(0).getString("state");
version = json.getJsonArray("data").getJsonObject(0).getString("version");
- if(expectedState.equalsIgnoreCase(state) && expectedVersion.equalsIgnoreCase(version)) {
+ if (expectedState.equalsIgnoreCase(state) && expectedVersion.equalsIgnoreCase(version)) {
return;
}
Thread.sleep(100);
- } catch(AssertionFailedError dontCare) {
+ } catch (AssertionFailedError dontCare) {
// Thrown by getContent - might happen before the
// bundle is installed
- } catch(InterruptedException ignore) {
+ } catch (InterruptedException ignore) {
}
}
@@ -121,23 +123,24 @@ public class InstallManyBundlesTest {
final long timeoutMsec = TimeoutsProvider.getInstance().getTimeout(WAIT_ACTIVE_TIMEOUT_MSEC);
final long endTime = System.currentTimeMillis() + timeoutMsec;
- while(System.currentTimeMillis() < endTime) {
+ while (System.currentTimeMillis() < endTime) {
try {
- H.getContent(consoleUrl, HttpTest.CONTENT_TYPE_DONTCARE, null, HttpServletResponse.SC_NOT_FOUND );
+ H.getContent(consoleUrl, HttpTest.CONTENT_TYPE_DONTCARE, null, HttpServletResponse.SC_NOT_FOUND);
return true;
- } catch(AssertionFailedError dontCare) {
+ } catch (AssertionFailedError dontCare) {
// Thrown by getContent - might happen if the bundle is still installed
}
try {
Thread.sleep(100);
- } catch(InterruptedException ignore) {
+ } catch (InterruptedException ignore) {
}
}
return false;
}
- private void installAndCheckBundle(String bsn, int filenameVariant, String version) throws IOException, JsonException {
+ private void installAndCheckBundle(String bsn, int filenameVariant, String version)
+ throws IOException, JsonException {
final String filename = bsn + "." + filenameVariant + ".jar";
final String url = HttpTest.HTTP_BASE_URL + INSTALL_PATH + "/" + filename;
H.getTestClient().upload(url, getBundleStream(bsn, version));
@@ -149,7 +152,7 @@ public class InstallManyBundlesTest {
final String bsn = BASE_BSN + "_upgradetest";
int i = 0;
try {
- for(i=0; i < HOW_MANY; i++) {
+ for (i = 0; i < HOW_MANY; i++) {
final String version = "42.0." + i;
installAndCheckBundle(bsn, i, version);
}
@@ -168,7 +171,7 @@ public class InstallManyBundlesTest {
int i = 0;
try {
final String version = "42.42.42";
- for(i=0; i < HOW_MANY; i++) {
+ for (i = 0; i < HOW_MANY; i++) {
final String bsn = BASE_BSN + "_manybundles_" + i;
bsns.add(bsn);
installAndCheckBundle(bsn, 0, version);
@@ -178,8 +181,8 @@ public class InstallManyBundlesTest {
log.info("installManyBundles exiting with i={}", i);
// we should wait until the OSGi installer has removed everything
H.getTestClient().delete(toDelete);
- while ( !bsns.isEmpty() ) {
- if ( waitNoBundles(bsns.get(0)) ) {
+ while (!bsns.isEmpty()) {
+ if (waitNoBundles(bsns.get(0))) {
bsns.remove(0);
} else {
final String bsn = bsns.remove(0);
@@ -188,4 +191,4 @@ public class InstallManyBundlesTest {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java
index dcb214d..92a9e77 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.installer;
-import static org.junit.Assert.fail;
-
import java.util.List;
import org.apache.sling.api.resource.LoginException;
@@ -30,6 +30,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
/** Installer test, converted to teleported tests from
* the previous installer-duplicate.jsp test script
*/
@@ -48,7 +50,7 @@ public class ServerSideInstallerTest {
public void noUntransformedResources() {
final InstallationState is = ip.getInstallationState();
final List<?> utr = is.getUntransformedResources();
- if(utr.size() > 0) {
+ if (utr.size() > 0) {
fail("Untransformed resources found: " + utr);
}
}
@@ -57,7 +59,7 @@ public class ServerSideInstallerTest {
public void noActiveResources() {
final InstallationState is = ip.getInstallationState();
final List<?> ar = is.getActiveResources();
- if(ar.size() > 0) {
+ if (ar.size() > 0) {
fail("Active resources found: " + ar);
}
}
@@ -74,14 +76,14 @@ public class ServerSideInstallerTest {
final InstallationState is = ip.getInstallationState();
String output = "";
final List<ResourceGroup> resources = is.getInstalledResources();
- for(final ResourceGroup group : resources) {
- if ( group.getResources().size() > 1 ) {
+ for (final ResourceGroup group : resources) {
+ if (group.getResources().size() > 1) {
boolean first = true;
- for(final Resource rsrc : group.getResources()) {
- if(ignore(rsrc.getEntityId())) {
+ for (final Resource rsrc : group.getResources()) {
+ if (ignore(rsrc.getEntityId())) {
continue;
}
- if ( first ) {
+ if (first) {
output += "Duplicate resources for '" + rsrc.getEntityId() + "' : ";
first = false;
} else {
@@ -89,14 +91,13 @@ public class ServerSideInstallerTest {
}
output += rsrc.getURL();
}
- if(!output.isEmpty()) {
+ if (!output.isEmpty()) {
output += "\n";
}
}
}
- if(output.length() > 0) {
+ if (output.length() > 0) {
fail(output);
}
-
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java
index 14e0691..772b656 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java
@@ -26,7 +26,7 @@ import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
public class SLING2082Test extends HttpTestBase {
-
+
private void runTest(HttpMethodBase m, int expectedStatus) throws Exception {
m.setFollowRedirects(false);
final int status = httpClient.executeMethod(m);
@@ -35,13 +35,14 @@ public class SLING2082Test extends HttpTestBase {
final String scriptTag = "<script>";
assertFalse("Content should not contain '" + scriptTag + "'", content.contains(scriptTag));
}
-
+
public void testPOST() throws Exception {
- final String path = "/" + getClass().getSimpleName() + "/" + Math.random() + ".html/%22%3e%3cscript%3ealert(29679)%3c/script%3e";
+ final String path = "/" + getClass().getSimpleName() + "/" + Math.random()
+ + ".html/%22%3e%3cscript%3ealert(29679)%3c/script%3e";
final PostMethod post = new PostMethod(HTTP_BASE_URL + path);
runTest(post, HttpServletResponse.SC_CREATED);
}
-
+
public void testOptingServletPost() throws Exception {
final String path = "/testing/HtmlResponseServlet";
final GetMethod post = new GetMethod(HTTP_BASE_URL + path);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java
index 38558d6..816b834 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java
@@ -22,19 +22,19 @@ import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.sling.commons.testing.integration.HttpTestBase;
public class SLING2085Test extends HttpTestBase {
-
+
public void testRecentRequestsEscape() throws Exception {
- final String basePath = "/" + getClass().getSimpleName() + "/" + Math.random();
+ final String basePath = "/" + getClass().getSimpleName() + "/" + Math.random();
final String path = basePath + ".html/%22%3e%3cscript%3ealert(29679)%3c/script%3e";
-
- // POST to create node
+
+ // POST to create node
{
final PostMethod post = new PostMethod(HTTP_BASE_URL + path);
post.setFollowRedirects(false);
final int status = httpClient.executeMethod(post);
assertEquals(201, status);
}
-
+
// And check that recent requests output does not contain <script>
{
final String content = getContent(HTTP_BASE_URL + "/system/console/requests?index=1", CONTENT_TYPE_HTML);
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
index 13a8097..8b4e1d0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
@@ -20,24 +20,25 @@ package org.apache.sling.launchpad.webapp.integrationtest.issues;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
/** Test the SLING-2094 JSP errorpage statement */
public class SLING2094Test extends RenderingTestBase {
- public final static String TEST_ROOT = "/apps/sling2094";
+ public static final String TEST_ROOT = "/apps/sling2094";
private String testNodePath;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
scriptPath = TEST_ROOT;
-
+
testClient.mkdirs(HTTP_BASE_URL, TEST_ROOT);
- for(String file : new String[] { "custom-error-page.jsp", "sling2094.jsp" }) {
+ for (String file : new String[] {"custom-error-page.jsp", "sling2094.jsp"}) {
uploadTestScript("issues/sling2094/" + file, file);
}
-
+
final Map<String, String> props = new HashMap<String, String>();
props.put(SLING_RESOURCE_TYPE, TEST_ROOT);
testNodePath = testClient.createNode(HTTP_BASE_URL + TEST_ROOT, props);
@@ -48,13 +49,13 @@ public class SLING2094Test extends RenderingTestBase {
super.tearDown();
testClient.delete(HTTP_BASE_URL + TEST_ROOT);
}
-
+
public void testWithoutError() throws Exception {
final String expected = "All good, no exception";
final String url = testNodePath + ".html";
assertContains(getContent(url, CONTENT_TYPE_HTML), expected);
}
-
+
public void testWithError() throws Exception {
final String expected = "witherror selector was specified";
final String url = testNodePath + ".witherror.html";
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java
index 6be44b8..91f9365 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java
@@ -1,18 +1,20 @@
/*
- * 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.
+ * 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.sling.launchpad.webapp.integrationtest.issues;
@@ -25,5 +27,4 @@ public class SLING2522Test extends HttpTestBase {
assertFalse("page contains wrong class", content.contains("something_which_shouldnt_appear"));
assertTrue("page doesn't contain correct class", content.contains("something_which_should_appear"));
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java
index 81a4f4e..742bc31 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java
@@ -27,20 +27,16 @@ public class SLING2617Test extends HttpTestBase {
private final String TEST_PATH = "/" + getClass().getSimpleName();
public void testDateBeanProperties() throws Exception {
- final String [] mustContain = {
- "New time (123456)",
- "All good!"
- };
+ final String[] mustContain = {"New time (123456)", "All good!"};
final TestNode tn = new TestNode(HTTP_BASE_URL + TEST_PATH, null);
String toDelete = null;
try {
toDelete = uploadTestScript(tn.scriptPath, "issues/sling2617/bean-set-get.jsp", "html.jsp");
- final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML,
- null, HttpServletResponse.SC_OK);
+ final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML, null, HttpServletResponse.SC_OK);
- for(String str : mustContain) {
+ for (String str : mustContain) {
assertTrue("Content must contain " + str + " (" + content + ")", content.contains(str));
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
index ab73b70..6f5e727 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
@@ -33,8 +33,7 @@ public class SLING457Test extends RenderingTestBase {
protected void setUp() throws Exception {
super.setUp();
- final String testRootPathBare = "/libs/" + getClass().getSimpleName() + "/"
- + System.currentTimeMillis();
+ final String testRootPathBare = "/libs/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
final String testRootPath = HTTP_BASE_URL + testRootPathBare;
// the root for our tests
@@ -64,7 +63,6 @@ public class SLING457Test extends RenderingTestBase {
uploadTestScript(rtA, "issues/sling457/a-foo.html.jsp", "foo.html.jsp");
uploadTestScript(rtB, "issues/sling457/b-b.jsp", "b.jsp");
-
}
@Override
@@ -76,14 +74,12 @@ public class SLING457Test extends RenderingTestBase {
public void testCallFooHtml() throws Exception {
String url = contentUrl + ".foo.html";
String content = getContent(url, CONTENT_TYPE_HTML);
- assertTrue("Expected 'foo.html.jsp' in content",
- content.indexOf("foo.html.jsp") >= 0);
+ assertTrue("Expected 'foo.html.jsp' in content", content.indexOf("foo.html.jsp") >= 0);
}
public void testCallHtml() throws Exception {
String url = contentUrl + ".html";
String content = getContent(url, CONTENT_TYPE_HTML);
- assertTrue("Expected 'foo.html.jsp' in content",
- content.indexOf("foo.html.jsp") >= 0);
+ assertTrue("Expected 'foo.html.jsp' in content", content.indexOf("foo.html.jsp") >= 0);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
index e558fc4..4d1e2cf 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
@@ -28,22 +28,22 @@ public class SLING760Test extends HttpTestBase {
/** Verify that all instances of our error message are escaped in response, which
* is generated by the default Sling error handler */
public void testEscapedErrorMessages() throws Exception {
- final String [] mustContain = { "<characters/>", "filtered & escaped" };
- final String [] mustNotContain = { "<characters/>", "filtered & escaped" };
+ final String[] mustContain = {"<characters/>", "filtered & escaped"};
+ final String[] mustNotContain = {"<characters/>", "filtered & escaped"};
final TestNode tn = new TestNode(HTTP_BASE_URL + TEST_PATH, null);
String toDelete = null;
try {
toDelete = uploadTestScript(tn.scriptPath, "issues/sling760/throw-with-markup.esp", "html.esp");
- final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML,
- null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ final String content = getContent(
+ tn.nodeUrl + ".html", CONTENT_TYPE_HTML, null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- for(String str : mustContain) {
+ for (String str : mustContain) {
assertTrue("Content must contain " + str + " (" + content + ")", content.contains(str));
}
- for(String str : mustNotContain) {
+ for (String str : mustNotContain) {
assertFalse("Content must NOT contain " + str + " (" + content + ")", content.contains(str));
}
} finally {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java
index 40694ac..2ed47c6 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest.jakarta;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
-
import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTestBase;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+
/**
* Verifies that Jakarta API usage on the server is working
*/
@@ -36,4 +36,4 @@ public class JsonTest extends HttpTestBase {
assertThat("JSON output", content, startsWith("{\"greeting"));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
index f7b8b75..e7cf704 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
@@ -24,16 +24,14 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/**
* The <tt>JaxbMarshallingTest</tt> verifies that a simple JAXB entity can be marshalled by a Sling servlet
- *
+ *
*/
public class JaxbMarshallingTest extends HttpTestBase {
-
public void testJaxbEntityIsMarshalled() throws IOException {
String content = getContent(HTTP_BASE_URL + "/bin/jaxb.xml", CONTENT_TYPE_XML);
assertTrue("Response did not start with an XML declaration:\n" + content, content.startsWith("<?xml"));
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java
index bd9ae28..ffddfac 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java
@@ -1,25 +1,26 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.login;
import java.net.URL;
import java.util.UUID;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
@@ -32,6 +33,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+
/** Verify that anonymous has read access via HTTP, but only
* under /content as per SLING-6130
*/
@@ -41,12 +45,12 @@ public class AnonymousAccessTest {
private final HttpTest H = new HttpTest();
private String displayUrl;
private String testText;
-
- @Parameterized.Parameters(name="{0}")
+
+ @Parameterized.Parameters(name = "{0}")
public static Object[] data() {
- final Object [] result = new Object[] {
- new Object[] { "/ANON_CAN_READ", true },
- new Object[] { "", false }
+ final Object[] result = new Object[] {
+ new Object[] {"/ANON_CAN_READ", true},
+ new Object[] {"", false}
};
return result;
}
@@ -59,13 +63,14 @@ public class AnonymousAccessTest {
this.anonymousAccessAllowed = anonymousAccessAllowed;
}
- @Before
+ @Before
public void setUp() throws Exception {
H.setUp();
-
+
// create test node under a unique path
final String id = UUID.randomUUID().toString();
- final String url = H.HTTP_BASE_URL + basePath + "/" + getClass().getSimpleName() + "/" + id + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final String url = H.HTTP_BASE_URL + basePath + "/" + getClass().getSimpleName() + "/" + id
+ + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
testText = "Test text " + id;
final NameValuePairList list = new NameValuePairList();
list.add("text", testText);
@@ -80,12 +85,12 @@ public class AnonymousAccessTest {
H.getTestClient().delete(displayUrl);
H.tearDown();
}
-
+
private void assertContent(String info) throws Exception {
final String content = H.getContent(displayUrl + ".txt", H.CONTENT_TYPE_PLAIN);
assertTrue(info, content.contains(testText));
}
-
+
@Test
public void testAnonymousContent() throws Exception {
// disable credentials -> anonymous session
@@ -93,14 +98,15 @@ public class AnonymousAccessTest {
final AuthScope scope = new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM);
H.getHttpClient().getParams().setAuthenticationPreemptive(false);
H.getHttpClient().getState().setCredentials(scope, null);
-
+
try {
- if(anonymousAccessAllowed) {
+ if (anonymousAccessAllowed) {
assertContent("Expecting content when testing under anonymous access subtree");
} else {
assertEquals(
- "Expecting status 404 when testing outside of anonymous access subtree",
- 404, H.getTestClient().get(displayUrl));
+ "Expecting status 404 when testing outside of anonymous access subtree",
+ 404,
+ H.getTestClient().get(displayUrl));
}
} finally {
// re-enable credentials -> admin session
@@ -109,7 +115,7 @@ public class AnonymousAccessTest {
H.getHttpClient().getState().setCredentials(scope, defaultcreds);
}
}
-
+
@Test
public void testAdminContent() throws Exception {
// HTTP test client has credentials by default
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java
index b716284..082f13e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java
@@ -1,25 +1,27 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.login;
-import java.net.URL;
-
import javax.servlet.http.HttpServletResponse;
+import java.net.URL;
+
import org.apache.commons.httpclient.Credentials;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
@@ -28,38 +30,37 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Verify that the sling:authRequestLogin parameter forces login */
public class AuthRequestLoginTest extends HttpTestBase {
- private final static String SESSION_INFO_PATH = "/system/sling/info.sessionInfo.json";
-
+ private static final String SESSION_INFO_PATH = "/system/sling/info.sessionInfo.json";
+
public void testForcedLogin() throws Exception {
- // disable credentials -> anonymous session
+ // disable credentials -> anonymous session
final URL url = new URL(HTTP_BASE_URL);
- final AuthScope scope = new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM);
- httpClient.getParams().setAuthenticationPreemptive(false);
+ final AuthScope scope = new AuthScope(url.getHost(), url.getPort(), AuthScope.ANY_REALM);
+ httpClient.getParams().setAuthenticationPreemptive(false);
httpClient.getState().setCredentials(scope, null);
- {
+ {
final String content = getContent(HTTP_BASE_URL + SESSION_INFO_PATH, CONTENT_TYPE_JSON);
assertJavascript("anonymous", content, "out.println(data.userID)");
- }
-
+ }
+
// root must return 20x, 30x or 40x
final GetMethod get = new GetMethod(HTTP_BASE_URL + "/");
final int status = httpClient.executeMethod(get);
final int family = status / 10;
- if(family < 20 || family > 40) {
+ if (family < 20 || family > 40) {
fail("Expected 20x, 30x or 40x status at / with no credentials, got " + status);
}
-
+
// root with sling:authRequestLogin=true must return 401
- assertHttpStatus(HTTP_BASE_URL + "/?sling:authRequestLogin=true", HttpServletResponse.SC_UNAUTHORIZED);
-
- // re-enable credentials -> admin session
+ assertHttpStatus(HTTP_BASE_URL + "/?sling:authRequestLogin=true", HttpServletResponse.SC_UNAUTHORIZED);
+
+ // re-enable credentials -> admin session
httpClient.getParams().setAuthenticationPreemptive(true);
Credentials defaultcreds = new UsernamePasswordCredentials("admin", "admin");
httpClient.getState().setCredentials(scope, defaultcreds);
- {
+ {
final String content = getContent(HTTP_BASE_URL + SESSION_INFO_PATH, CONTENT_TYPE_JSON);
assertJavascript("admin", content, "out.println(data.userID)");
- }
+ }
}
-
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
index cbceee5..b9daee0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
@@ -1,27 +1,29 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.login;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.NameValuePair;
@@ -32,33 +34,34 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
/** Test SLING-2165 Verify that redirect to the referring login form after login error works */
public class RedirectOnLoginErrorTest extends HttpTestBase {
- /** Execute a POST request and check status
+ /** Execute a POST request and check status
* @return the HttpMethod executed
* @throws IOException */
- private HttpMethod assertPostStatus(String url, int expectedStatusCode, List<NameValuePair> postParams,
- String assertMessage, String referer) throws IOException {
+ private HttpMethod assertPostStatus(
+ String url, int expectedStatusCode, List<NameValuePair> postParams, String assertMessage, String referer)
+ throws IOException {
final PostMethod post = new PostMethod(url);
post.setFollowRedirects(false);
post.setDoAuthentication(false);
- //set the referer to indicate where we came from
+ // set the referer to indicate where we came from
post.setRequestHeader("Referer", referer);
- //set Accept header to trick sling into treating the request as from a browser
+ // set Accept header to trick sling into treating the request as from a browser
post.setRequestHeader("User-Agent", "Mozilla/5.0 Sling Integration Test");
- if(postParams!=null) {
- final NameValuePair [] nvp = {};
+ if (postParams != null) {
+ final NameValuePair[] nvp = {};
post.setRequestBody(postParams.toArray(nvp));
}
- if(postParams!=null) {
- final NameValuePair [] nvp = {};
+ if (postParams != null) {
+ final NameValuePair[] nvp = {};
post.setRequestBody(postParams.toArray(nvp));
}
final int status = httpClient.executeMethod(post);
- if(assertMessage == null) {
+ if (assertMessage == null) {
assertEquals(expectedStatusCode, status);
} else {
assertEquals(assertMessage, expectedStatusCode, status);
@@ -73,22 +76,23 @@ public class RedirectOnLoginErrorTest extends HttpTestBase {
* @throws Exception
*/
public void testRedirectToLoginFormAfterLoginError() throws Exception {
- //login failure
+ // login failure
List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new NameValuePair("j_username", "___bogus___"));
params.add(new NameValuePair("j_password", "not_a_real_user"));
final String loginPageUrl = String.format("%s/system/sling/form/login", HTTP_BASE_URL);
- PostMethod post = (PostMethod)assertPostStatus(HTTP_BASE_URL + "/j_security_check",
- HttpServletResponse.SC_MOVED_TEMPORARILY,
- params,
- null,
- loginPageUrl);
+ PostMethod post = (PostMethod) assertPostStatus(
+ HTTP_BASE_URL + "/j_security_check",
+ HttpServletResponse.SC_MOVED_TEMPORARILY,
+ params,
+ null,
+ loginPageUrl);
final Header locationHeader = post.getResponseHeader("Location");
String location = locationHeader.getValue();
int queryStrStart = location.indexOf('?');
if (queryStrStart != -1) {
- location = location.substring(0, queryStrStart);
+ location = location.substring(0, queryStrStart);
}
assertEquals("Expected to remain on the form/login page", loginPageUrl, location);
}
@@ -106,7 +110,7 @@ public class RedirectOnLoginErrorTest extends HttpTestBase {
get.setDoAuthentication(false);
final int status = httpClient.executeMethod(get);
final int family = status / 10;
- if(family != 20 && family != 30) {
+ if (family != 20 && family != 30) {
fail("Expected 20x or 30x status, got " + status + " at " + loginPageUrl);
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java
index bc13998..7b78364 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java
@@ -1,28 +1,28 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.login;
-import static org.junit.Assert.assertEquals;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod;
@@ -31,44 +31,47 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/** Verify that redirect to resource after logout works */
public class RedirectOnLogoutTest {
-
+
private final HttpTest H = new HttpTest();
-
+
@Before
public void setup() throws Exception {
H.setUp();
}
-
+
@After
public void cleanup() throws Exception {
H.tearDown();
}
-
+
/**
* Test SLING-1847
* @throws Exception
*/
- @Test
+ @Test
public void testRedirectToResourceAfterLogout() throws Exception {
- //login
+ // login
List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new NameValuePair("j_username", "admin"));
params.add(new NameValuePair("j_password", "admin"));
- H.assertPostStatus(HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_MOVED_TEMPORARILY, params, null);
-
- //...and then...logout with a resource redirect
+ H.assertPostStatus(
+ HttpTest.HTTP_BASE_URL + "/j_security_check", HttpServletResponse.SC_MOVED_TEMPORARILY, params, null);
+
+ // ...and then...logout with a resource redirect
String locationAfterLogout = HttpTest.SERVLET_CONTEXT + "/system/sling/info.sessionInfo.json";
final GetMethod get = new GetMethod(HttpTest.HTTP_BASE_URL + "/system/sling/logout");
- NameValuePair [] logoutParams = new NameValuePair[1];
+ NameValuePair[] logoutParams = new NameValuePair[1];
logoutParams[0] = new NameValuePair("resource", locationAfterLogout);
get.setQueryString(logoutParams);
-
+
get.setFollowRedirects(false);
final int status = H.getHttpClient().executeMethod(get);
assertEquals("Expected redirect", HttpServletResponse.SC_MOVED_TEMPORARILY, status);
Header location = get.getResponseHeader("Location");
assertEquals(HttpTest.HTTP_BASE_URL + locationAfterLogout, location.getValue());
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.java
index e3827db..cb94a1c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.java
@@ -1,24 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.provisioning;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.io.InputStream;
@@ -29,20 +28,24 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-/** Verify that the provisioning model used to build this instance is available
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/** Verify that the provisioning model used to build this instance is available
* as a Launchpad resource.
*/
public class EmbeddedModelTest {
@Rule
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "Launchpad");
-
+
public static final String MODEL_RESOURCE_PATH = "/resources/provisioning/model.txt";
-
+
private String modelContent;
-
+
@Before
public void setup() throws IOException {
- final InputStream modelStream = teleporter.getService(LaunchpadContentProvider.class).getResourceAsStream(MODEL_RESOURCE_PATH);
+ final InputStream modelStream =
+ teleporter.getService(LaunchpadContentProvider.class).getResourceAsStream(MODEL_RESOURCE_PATH);
assertNotNull("Expecting embedded model resource at " + MODEL_RESOURCE_PATH, modelStream);
try {
modelContent = new String(IOUtils.toByteArray(modelStream));
@@ -50,12 +53,12 @@ public class EmbeddedModelTest {
modelStream.close();
}
}
-
+
@Test
public void testLaunchpadFeature() {
assertTrue(modelContent.contains("[feature name=:launchpad]"));
}
-
+
@Test
public void testBootFeature() {
assertTrue(modelContent.contains("[feature name=:boot]"));
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java
index 454d5db..2ddc051 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.repository;
-import static org.junit.Assert.assertTrue;
-
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -26,6 +26,8 @@ import org.apache.sling.junit.rules.TeleporterRule;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/** Verify that a path is created by repoinit statements
* from our provisioning model.
*/
@@ -40,8 +42,8 @@ public class RepoinitPathTest {
final Session s = repo.loginAdministrative(null);
try {
assertTrue(s.nodeExists("/repoinit/provisioningModelTest"));
- } finally {
+ } finally {
s.logout();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
index 51cb6a7..e72ca5f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.repository;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import org.apache.sling.commons.testing.integration.HttpTest;
@@ -27,32 +27,33 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
/** Verify that the SlingRepositoryInitializer provided by our test
* services bundle have run.
*/
public class RepositoryInitializersTest {
private final HttpTest H = new HttpTest();
-
+
@Before
public void setup() throws Exception {
H.setUp();
}
-
+
@After
public void cleanup() throws Exception {
H.tearDown();
}
-
+
@Test
public void checkSignalProperty() throws IOException {
- final String path =
- FirstRepositoryInitializer.SIGNAL_NODE_PATH
- + "/" + SecondRepositoryInitializer.class.getSimpleName()
+ final String path = FirstRepositoryInitializer.SIGNAL_NODE_PATH
+ + "/" + SecondRepositoryInitializer.class.getSimpleName()
+ ".txt";
-
+
final String url = HttpTest.HTTP_BASE_URL + path;
final String content = H.getContent(url, HttpTest.CONTENT_TYPE_PLAIN);
assertTrue("Expecting a numeric value at " + path + ", got " + content, Long.valueOf(content) > 0);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java
index 5e5c050..71bcb90 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java
@@ -1,48 +1,50 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.repository;
-import static org.junit.Assert.assertEquals;
-
import org.apache.sling.commons.testing.integration.HttpTest;
import org.apache.sling.launchpad.webapp.integrationtest.util.RepositoryTestUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/** Verify the repository name when running on Oak.
*/
public class RepositoryNameTest {
private final HttpTest H = new HttpTest();
-
+
@Before
public void setup() throws Exception {
H.setUp();
}
-
+
@After
public void cleanup() throws Exception {
H.tearDown();
}
-
+
@Test
public void checkOakName() throws Exception {
- RepositoryTestUtil.logDescriptors(H, "jcr.repository.name", "jcr.repository.version");
+ RepositoryTestUtil.logDescriptors(H, "jcr.repository.name", "jcr.repository.version");
assertEquals("Apache Jackrabbit Oak", RepositoryTestUtil.getDescriptor(H, "jcr.repository.name"));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
index 03e5e69..10471d7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
@@ -1,23 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.repository;
-import static org.junit.Assert.fail;
-
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -28,12 +28,14 @@ import org.apache.sling.junit.rules.TeleporterRule;
import org.junit.Rule;
import org.junit.Test;
+import static org.junit.Assert.fail;
+
/** Verify that required system users have been created */
public class SystemUsersTest {
@Rule
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "Launchpad");
-
+
private void assertSystemUser(String name) throws RepositoryException {
final SlingRepository repo = teleporter.getService(SlingRepository.class);
final Session s = repo.loginAdministrative(null);
@@ -41,24 +43,24 @@ public class SystemUsersTest {
final Credentials creds = new SimpleCredentials(name, new char[] {});
try {
s.impersonate(creds);
- } catch(RepositoryException rex) {
+ } catch (RepositoryException rex) {
fail("Impersonation as " + name + " failed: " + rex.toString());
}
- } finally {
+ } finally {
s.logout();
}
}
-
+
@Test
public void launchpadTestingUser() throws RepositoryException {
// This user is created by a RepositoryInitalizer in our
// test-services bundle
assertSystemUser("launchpad_testing");
}
-
+
@Test
public void provisioningModelUser() throws RepositoryException {
// This one is created from our provisioning model
assertSystemUser("provisioningModelUser");
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
index fb784a3..b0a9000 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
@@ -1,77 +1,60 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.resourceprovider;
import org.apache.sling.commons.testing.integration.HttpTestBase;
/**
- * Test the PlanetsResourceProvider that the test-services bundles provides */
+ * Test the PlanetsResourceProvider that the test-services bundles provides */
public class PlanetsResourceProviderTest extends HttpTestBase {
private static final String PROPSET_MSG = "Resources can each have different sets of properties";
- private void assertStrings(String url, String [] what) throws Exception {
+
+ private void assertStrings(String url, String[] what) throws Exception {
final String content = getContent(url, CONTENT_TYPE_JSON);
- for(String expected : what) {
- if(expected.startsWith("!")) {
+ for (String expected : what) {
+ if (expected.startsWith("!")) {
assertFalse("NOT expecting '" + expected + "' in " + url, content.contains(expected.substring(1)));
} else {
assertTrue("Expecting '" + expected + "' in " + url, content.contains(expected));
}
}
}
-
+
public void testRootResource() throws Exception {
assertStrings(
- HTTP_BASE_URL + "/planets.tidy.-1.json",
- new String [] {
- "earth",
- "moon",
- "Moon",
- PROPSET_MSG,
- "\"name\": \"Uranus\""
- });
+ HTTP_BASE_URL + "/planets.tidy.-1.json",
+ new String[] {"earth", "moon", "Moon", PROPSET_MSG, "\"name\": \"Uranus\""});
}
-
+
public void testEarthResource() throws Exception {
assertStrings(
- HTTP_BASE_URL + "/planets.tidy.-1.json",
- new String [] {
- "earth",
- "moon",
- "Moon",
- PROPSET_MSG,
- "\"name\": \"Uranus\"",
- "384"
- });
+ HTTP_BASE_URL + "/planets.tidy.-1.json",
+ new String[] {"earth", "moon", "Moon", PROPSET_MSG, "\"name\": \"Uranus\"", "384"});
}
-
+
public void testMoonResource() throws Exception {
assertStrings(
- HTTP_BASE_URL + "/planets/earth/moon.tidy.json",
- new String [] {
- "!earth",
- "!moon",
- "Moon",
- "!" + PROPSET_MSG,
- "!\"name\": \"Uranus\"",
- "384"
- });
+ HTTP_BASE_URL + "/planets/earth/moon.tidy.json",
+ new String[] {"!earth", "!moon", "Moon", "!" + PROPSET_MSG, "!\"name\": \"Uranus\"", "384"});
}
-
+
public void testMoonHtml() throws Exception {
final String content = getContent(HTTP_BASE_URL + "/planets/earth/moon.html", CONTENT_TYPE_HTML);
final String expect = "<title>Planet at /planets/earth/moon</title>";
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
index 9400569..f7e4af3 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
@@ -1,25 +1,27 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.resourceresolver;
-import java.util.UUID;
-
import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
+
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
@@ -40,7 +42,7 @@ import org.junit.Test;
public class ResourceResolverApiTest {
private ResourceResolver resResolver;
private final String no_resource_path = "/no_resource/at/this/location";
-
+
@Rule
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "Launchpad");
@@ -49,86 +51,76 @@ public class ResourceResolverApiTest {
final ResourceResolverFactory rrf = teleporter.getService(ResourceResolverFactory.class);
resResolver = rrf.getAdministrativeResourceResolver(null);
}
-
+
@After
public void cleanup() throws LoginException {
- if(resResolver != null) {
+ if (resResolver != null) {
resResolver.close();
}
}
-
+
@Test
public void testNullResourceMapsToRoot() {
// null resource is accessing /, which exists of course
final Resource res00 = resResolver.resolve((String) null);
Assert.assertNotNull(res00);
- Assert.assertEquals("Null path is expected to return root", "/",
- res00.getPath());
+ Assert.assertEquals("Null path is expected to return root", "/", res00.getPath());
}
-
+
@Test
public void testRelativePathsA() {
// relative paths are treated as if absolute
final String path01 = "relPath/relPath";
final Resource res01 = resResolver.resolve(path01);
Assert.assertNotNull(res01);
- Assert.assertEquals("Expecting absolute path for relative path", "/" + path01,
- res01.getPath());
- Assert.assertTrue("Resource must be NonExistingResource: " + res01.getClass().getName(),
+ Assert.assertEquals("Expecting absolute path for relative path", "/" + path01, res01.getPath());
+ Assert.assertTrue(
+ "Resource must be NonExistingResource: " + res01.getClass().getName(),
ResourceUtil.isNonExistingResource(res01));
-
}
-
+
@Test
public void testRelativePathsB() {
final Resource res02 = resResolver.resolve(no_resource_path);
Assert.assertNotNull(res02);
- Assert.assertEquals("Expecting absolute path for relative path",
- no_resource_path, res02.getPath());
- Assert.assertTrue("Resource must be NonExistingResource",
- ResourceUtil.isNonExistingResource(res02));
+ Assert.assertEquals("Expecting absolute path for relative path", no_resource_path, res02.getPath());
+ Assert.assertTrue("Resource must be NonExistingResource", ResourceUtil.isNonExistingResource(res02));
}
-
+
@SuppressWarnings("deprecation")
- @Test(expected=NullPointerException.class)
+ @Test(expected = NullPointerException.class)
public void testNullRequest() {
resResolver.resolve((HttpServletRequest) null);
}
-
+
@Test
public void testResolutionFailsA() {
final Resource res0 = resResolver.resolve(null, no_resource_path);
Assert.assertNotNull("Expecting resource if resolution fails", res0);
- Assert.assertTrue("Resource must be NonExistingResource",
- ResourceUtil.isNonExistingResource(res0));
- Assert.assertEquals("Path must be the original path", no_resource_path,
- res0.getPath());
+ Assert.assertTrue("Resource must be NonExistingResource", ResourceUtil.isNonExistingResource(res0));
+ Assert.assertEquals("Path must be the original path", no_resource_path, res0.getPath());
}
-
+
@Test
@SuppressWarnings("deprecation")
public void testResolutionFailsB() {
- final HttpServletRequest req1 = new FakeSlingHttpServletRequest(
- no_resource_path);
- final Resource res1 = resResolver.resolve(req1);
- Assert.assertNotNull("Expecting resource if resolution fails", res1);
- Assert.assertTrue("Resource must be NonExistingResource",
- ResourceUtil.isNonExistingResource(res1));
- Assert.assertEquals("Path must be the original path", no_resource_path,
- res1.getPath());
+ final HttpServletRequest req1 = new FakeSlingHttpServletRequest(no_resource_path);
+ final Resource res1 = resResolver.resolve(req1);
+ Assert.assertNotNull("Expecting resource if resolution fails", res1);
+ Assert.assertTrue("Resource must be NonExistingResource", ResourceUtil.isNonExistingResource(res1));
+ Assert.assertEquals("Path must be the original path", no_resource_path, res1.getPath());
}
-
+
@Test
@SuppressWarnings("deprecation")
public void testResolutionFailsC() {
final HttpServletRequest req2 = new FakeSlingHttpServletRequest(null);
final Resource res2 = resResolver.resolve(req2);
Assert.assertNotNull("Expecting resource if resolution fails", res2);
- Assert.assertFalse("Resource must not be NonExistingResource was ",
- ResourceUtil.isNonExistingResource(res2));
+ Assert.assertFalse("Resource must not be NonExistingResource was ", ResourceUtil.isNonExistingResource(res2));
Assert.assertEquals("Path must be the the root path", "/", res2.getPath());
}
-
+
@Test
public void testDelete() throws PersistenceException {
final String nodeName = "node-" + UUID.randomUUID();
@@ -139,4 +131,4 @@ public class ResourceResolverApiTest {
resResolver.commit();
Assert.assertNull(resResolver.getResource(nodePath));
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
index 7daf212..4f68f67 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
+++ b/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
@@ -1,29 +1,23 @@
/*
- * 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
+ * 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
+ * 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.
+ * 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.sling.launchpad.webapp.integrationtest.resourceresolver;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -32,6 +26,16 @@ import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import javax.servlet.http.HttpServletRequest;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.sling.api.resource.NonExistingResource;
import org.apache.sling.api.resource.Resource;
@@ -45,17 +49,18 @@ import org.apache.sling.launchpad.testservices.events.EventsCounter;
import org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
import org.apache.sling.launchpad.testservices.exported.MappingsFacade;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
... 12725 lines suppressed ...