You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:56:40 UTC
[sling-org-apache-sling-performance] 04/27: SLING-2593 -
Improvement for the Sling performance tools. Adding first part of the patch
provided from Christian Vazzolla: Created a new maven project that contains
only the sling performance tests and left the framework(tool) related part
in the base project as we would like to use the framework for performance
testing in other projects also. Thanks Christian!
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.performance.base-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-performance.git
commit b15d208210f4b4bcb4673d165c21f5399b0ba287
Author: Antonio Sanso <as...@apache.org>
AuthorDate: Sun Sep 23 09:49:08 2012 +0000
SLING-2593 - Improvement for the Sling performance tools. Adding first part of the patch provided from Christian Vazzolla: Created a new maven project that contains only the sling performance tests and left the framework(tool) related part in the base project as we would like to use the framework for performance testing in other projects also. Thanks Christian!
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/performance/base@1388992 13f79535-47bb-0310-9956-ffa450edef68
---
.../ResolveNonExistingWith10000AliasTest.java | 27 ----
.../ResolveNonExistingWith10000VanityPathTest.java | 27 ----
.../tests/ResolveNonExistingWith1000AliasTest.java | 27 ----
.../ResolveNonExistingWith1000VanityPathTest.java | 27 ----
.../ResolveNonExistingWith30000AliasTest.java | 27 ----
.../ResolveNonExistingWith30000VanityPathTest.java | 27 ----
.../tests/ResolveNonExistingWith5000AliasTest.java | 27 ----
.../ResolveNonExistingWith5000VanityPathTest.java | 27 ----
.../tests/ResolveNonExistingWithManyAliasTest.java | 124 -------------------
.../ResolveNonExistingWithManyVanityPathTest.java | 136 ---------------------
10 files changed, 476 deletions(-)
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
deleted file mode 100644
index 49f7fc4..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000AliasTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith10000AliasTest extends ResolveNonExistingWithManyAliasTest {
-
- public ResolveNonExistingWith10000AliasTest(TestHelper helper) {
- super(helper, 10000);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
deleted file mode 100644
index 998b5c3..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith10000VanityPathTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith10000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
-
- public ResolveNonExistingWith10000VanityPathTest(TestHelper helper) {
- super(helper, 100, 100);
- }
-
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
deleted file mode 100644
index 43fdfc9..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000AliasTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith1000AliasTest extends ResolveNonExistingWithManyAliasTest {
-
- public ResolveNonExistingWith1000AliasTest(TestHelper helper) {
- super(helper, 1000);
- }
-
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
deleted file mode 100644
index 7e2bcfb..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith1000VanityPathTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith1000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
-
- public ResolveNonExistingWith1000VanityPathTest(TestHelper helper) {
- super(helper, 100, 10);
- }
-
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
deleted file mode 100644
index cd1ed35..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000AliasTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith30000AliasTest extends ResolveNonExistingWithManyAliasTest {
-
- public ResolveNonExistingWith30000AliasTest(TestHelper helper) {
- super(helper, 30000);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
deleted file mode 100644
index b4b2a7d..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith30000VanityPathTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith30000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
-
- public ResolveNonExistingWith30000VanityPathTest(TestHelper helper) {
- super(helper, 300, 100);
- }
-
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
deleted file mode 100644
index 9771516..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000AliasTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith5000AliasTest extends ResolveNonExistingWithManyAliasTest {
-
- public ResolveNonExistingWith5000AliasTest(TestHelper helper) {
- super(helper, 5000);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
deleted file mode 100644
index 0b3f6fb..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWith5000VanityPathTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.performance.tests;
-
-import org.apache.sling.performance.TestHelper;
-
-public class ResolveNonExistingWith5000VanityPathTest extends ResolveNonExistingWithManyVanityPathTest {
-
- public ResolveNonExistingWith5000VanityPathTest(TestHelper helper) {
- super(helper, 100, 50);
- }
-
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
deleted file mode 100644
index f77ffb6..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyAliasTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.performance.tests;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import javax.jcr.Node;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jackrabbit.JcrConstants;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.performance.AbstractRepositoryTest;
-import org.apache.sling.performance.TestHelper;
-import org.apache.sling.performance.ResourceResolverTestRequest;
-
-import static org.junit.Assert.assertNotNull;
-
-class ResolveNonExistingWithManyAliasTest extends AbstractRepositoryTest {
-
- private static final String PN_SLING_ALIAS = "sling:alias";
-
- private final TestHelper helper;
-
- private Node mapRoot;
-
- private ResourceResolver resResolver;
-
- private Node rootNode;
-
- private String rootPath;
-
- private final int nodeCount;
-
- public ResolveNonExistingWithManyAliasTest(TestHelper helper, int nodeCount) {
- this.helper = helper;
- this.nodeCount = nodeCount;
- }
-
- @Override
- protected void afterSuite() throws Exception {
- if (helper != null) {
- helper.dispose();
- }
-
- if (rootNode != null) {
- rootNode.remove();
- }
- if (mapRoot != null) {
- mapRoot.remove();
- }
- session.save();
- }
-
- @Override
- protected void beforeSuite() throws Exception {
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/folder.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/resource.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/vanitypath.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/mapping.cnd"));
-
- // test data
- rootPath = "/test" + System.currentTimeMillis();
- rootNode = getSession().getRootNode().addNode(rootPath.substring(1), JcrConstants.NT_UNSTRUCTURED);
-
- // test mappings
- mapRoot = getSession().getRootNode().addNode("etc", "nt:folder");
- Node map = mapRoot.addNode("map", "sling:Mapping");
- Node http = map.addNode("http", "sling:Mapping");
- http.addNode("localhost.80", "sling:Mapping");
- Node https = map.addNode("https", "sling:Mapping");
- https.addNode("localhost.443", "sling:Mapping");
-
- // define a vanity path for the rootPath
- SecureRandom random = new SecureRandom();
- // creating <nodeCount> nodes
- for (int j = 0; j < nodeCount; j++) {
- Node content = rootNode.addNode("a" + j, JcrConstants.NT_UNSTRUCTURED);
- String alias = new BigInteger(130, random).toString(32);
- content.setProperty(PN_SLING_ALIAS, alias);
-
- if (j % 10 == 0) {
- session.save();
- }
- }
-
- session.save();
-
- helper.init(rootPath, session, getRepository());
-
- resResolver = helper.getResourceResolver();
-
- }
-
- @Override
- protected void runTest() throws Exception {
- String path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath) + "/" + "testNonExistingAlias"
- + ".print.html");
- HttpServletRequest request = new ResourceResolverTestRequest(path);
- Resource res = resResolver.resolve(request, path);
- assertNotNull(res);
- }
-}
diff --git a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java b/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
deleted file mode 100644
index 3dbc2b4..0000000
--- a/src/main/java/org/apache/sling/performance/tests/ResolveNonExistingWithManyVanityPathTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.performance.tests;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import javax.jcr.Node;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jackrabbit.JcrConstants;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.commons.testing.jcr.RepositoryUtil;
-import org.apache.sling.performance.AbstractRepositoryTest;
-import org.apache.sling.performance.TestHelper;
-import org.apache.sling.performance.ResourceResolverTestRequest;
-
-class ResolveNonExistingWithManyVanityPathTest extends AbstractRepositoryTest {
-
- private static final String NT_VANITY_PATH = "sling:VanityPath";
-
- private static final String PN_VANITY_PATH = "sling:vanityPath";
-
- private final TestHelper helper;
-
- private Node mapRoot;
-
- private ResourceResolver resResolver;
-
- private Node rootNode;
-
- private String rootPath;
-
- private final int nodeCount;
-
- private final int childNodeCount;
-
- public ResolveNonExistingWithManyVanityPathTest(TestHelper helper, int nodeCount, int childNodeCount) {
- this.helper = helper;
- this.nodeCount = nodeCount;
- this.childNodeCount = childNodeCount;
- }
-
- @Override
- protected void afterSuite() throws Exception {
- if (helper != null) {
- helper.dispose();
- }
-
- if (rootNode != null) {
- rootNode.remove();
- }
- if (mapRoot != null) {
- mapRoot.remove();
- }
- session.save();
- }
-
- @Override
- protected void beforeSuite() throws Exception {
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/folder.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/resource.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/vanitypath.cnd"));
- RepositoryUtil.registerNodeType(getSession(),
- this.getClass().getResourceAsStream("/SLING-INF/nodetypes/mapping.cnd"));
-
- // test data
- rootPath = "/test" + System.currentTimeMillis();
- rootNode = getSession().getRootNode().addNode(rootPath.substring(1), "nt:unstructured");
-
- // test mappings
- mapRoot = getSession().getRootNode().addNode("etc", JcrConstants.NT_FOLDER);
- Node map = mapRoot.addNode("map", "sling:Mapping");
- Node http = map.addNode("http", "sling:Mapping");
- http.addNode("localhost.80", "sling:Mapping");
- Node https = map.addNode("https", "sling:Mapping");
- https.addNode("localhost.443", "sling:Mapping");
-
- SecureRandom random = new SecureRandom();
-
- // creating <nodeCount> x <childNodeCount> nodes with vanity
- for (int j = 0; j < nodeCount; j++) {
- Node content = rootNode.addNode("a" + j, JcrConstants.NT_UNSTRUCTURED);
- String s = new BigInteger(130, random).toString(32);
- content.addMixin(NT_VANITY_PATH);
- content.setProperty(PN_VANITY_PATH, s);
- for (int k = 0; k < childNodeCount; k++) {
- Node content2 = content.addNode("b" + k, JcrConstants.NT_UNSTRUCTURED);
- String ss = new BigInteger(130, random).toString(32);
- content2.addMixin(NT_VANITY_PATH);
- content2.setProperty(PN_VANITY_PATH, ss);
- }
- if (j % 10 == 0) {
- session.save();
- }
- }
-
- session.save();
-
- helper.init(rootPath, session, getRepository());
-
- resResolver = helper.getResourceResolver();
-
- }
-
- @Override
- protected void runTest() throws Exception {
- String path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath) + "/" + "testNonExistingVanity"
- + ".print.html");
- HttpServletRequest request = new ResourceResolverTestRequest(path);
- Resource res = resResolver.resolve(request, path);
- assertNotNull(res);
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.