You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2006/11/21 22:19:48 UTC
svn commit: r477929 - in /incubator/ftpserver/trunk/perftest: ./ src/
src/test/ src/test/org/ src/test/org/apache/ src/test/org/apache/ftpserver/
src/test/org/apache/ftpserver/perftest/
Author: ngn
Date: Tue Nov 21 14:19:47 2006
New Revision: 477929
URL: http://svn.apache.org/viewvc?view=rev&rev=477929
Log:
Adding project for performance tests. These do not fit into the regular unit tests as they might take a long time and sometimes manual intervention to complete. Also note that they open a lot of sockets and you might have to wait for TIME_WAIT sockets to timeout before you can repeat a test run.
Added:
incubator/ftpserver/trunk/perftest/ (with props)
incubator/ftpserver/trunk/perftest/LICENSE.txt (with props)
incubator/ftpserver/trunk/perftest/NOTICE
incubator/ftpserver/trunk/perftest/pom.xml (with props)
incubator/ftpserver/trunk/perftest/src/
incubator/ftpserver/trunk/perftest/src/test/
incubator/ftpserver/trunk/perftest/src/test/log4j.properties (with props)
incubator/ftpserver/trunk/perftest/src/test/org/
incubator/ftpserver/trunk/perftest/src/test/org/apache/
incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/
incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/
incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java (with props)
incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java (with props)
incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java (with props)
incubator/ftpserver/trunk/perftest/src/test/users.gen
Propchange: incubator/ftpserver/trunk/perftest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 21 14:19:47 2006
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+.settings
+.wtpmodules
Added: incubator/ftpserver/trunk/perftest/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/LICENSE.txt?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/LICENSE.txt (added)
+++ incubator/ftpserver/trunk/perftest/LICENSE.txt Tue Nov 21 14:19:47 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Propchange: incubator/ftpserver/trunk/perftest/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/NOTICE?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/NOTICE (added)
+++ incubator/ftpserver/trunk/perftest/NOTICE Tue Nov 21 14:19:47 2006
@@ -0,0 +1,6 @@
+Apache FtpServer
+Copyright 2004 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
\ No newline at end of file
Added: incubator/ftpserver/trunk/perftest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/pom.xml?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/pom.xml (added)
+++ incubator/ftpserver/trunk/perftest/pom.xml Tue Nov 21 14:19:47 2006
@@ -0,0 +1,111 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-parent</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-perftest</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-incubator-SNAPSHOT</version>
+ <name>Apache Incubator FtpServer Performance Tests</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ftpserver/trunk/perftest</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ftpserver/trunk/perftest</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest</url>
+ </scm>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+
+ </testResource>
+ </testResources>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftplet-api</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--Only used for testing -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/ftpserver/trunk/perftest/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/src/test/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/src/test/log4j.properties?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/src/test/log4j.properties (added)
+++ incubator/ftpserver/trunk/perftest/src/test/log4j.properties Tue Nov 21 14:19:47 2006
@@ -0,0 +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.
+
+log4j.rootLogger=warn, C
+log4j.appender.C=org.apache.log4j.ConsoleAppender
+log4j.appender.C.layout=org.apache.log4j.PatternLayout
+log4j.appender.C.layout.ConversionPattern=%m%n
+
Propchange: incubator/ftpserver/trunk/perftest/src/test/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java (added)
+++ incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java Tue Nov 21 14:19:47 2006
@@ -0,0 +1,113 @@
+/*
+ * 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.ftpserver.perftest;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+
+import org.apache.commons.net.ftp.FTPClient;
+
+public class BasicPerformanceTest extends PerformanceTestTemplate {
+
+ private static final File TEST_FILE = new File(ROOT_DIR, "test.txt");
+
+ private static final byte[] TEST_DATA = "TESTDATA".getBytes();
+
+ private static final int NUMBER_OF_CLIENTS = 9;
+ private static final int NUMBER_OF_REPEATS = 50;
+
+ public void testNoop() throws Exception {
+ startMeasureTime();
+
+ doClients(new ClientTask() {
+
+ public void doWithClient(FTPClient client) throws Exception {
+ client.connect("localhost", DEFAULT_PORT);
+ client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+
+ client.noop();
+
+ client.quit();
+ client.disconnect();
+ }
+ }, NUMBER_OF_CLIENTS, 50);
+
+ waitForTestRun();
+
+ endMeasureTime("NOOP", NUMBER_OF_CLIENTS, NUMBER_OF_REPEATS);
+ }
+
+ public void testRetrive() throws Exception {
+ writeDataToFile(TEST_FILE, TEST_DATA);
+
+ startMeasureTime();
+
+ doClients(new ClientTask() {
+
+ public void doWithClient(FTPClient client) throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ client.connect("localhost", DEFAULT_PORT);
+ client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+
+ client.retrieveFile(TEST_FILE.getName(), baos);
+
+ client.quit();
+ client.disconnect();
+
+ baos.close();
+ }
+ }, NUMBER_OF_CLIENTS, 50);
+
+ waitForTestRun();
+
+ endMeasureTime("RETR", NUMBER_OF_CLIENTS, NUMBER_OF_REPEATS);
+ }
+
+
+
+ public void testStore() throws Exception {
+ final ByteArrayInputStream bais = new ByteArrayInputStream(TEST_DATA);
+
+ startMeasureTime();
+
+ doClients(new ClientTask() {
+
+ public void doWithClient(FTPClient client) throws Exception {
+ client.connect("localhost", DEFAULT_PORT);
+ client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
+
+ client.storeFile(TEST_FILE.getName(), bais);
+
+ client.quit();
+ client.disconnect();
+
+ }
+ }, 9, 50);
+
+ waitForTestRun();
+
+ endMeasureTime("STOR", NUMBER_OF_CLIENTS, NUMBER_OF_REPEATS);
+
+ bais.close();
+ }
+
+}
Propchange: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/BasicPerformanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java (added)
+++ incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java Tue Nov 21 14:19:47 2006
@@ -0,0 +1,26 @@
+package org.apache.ftpserver.perftest;
+
+import org.apache.commons.net.ProtocolCommandEvent;
+import org.apache.commons.net.ProtocolCommandListener;
+import org.apache.log4j.Logger;
+
+public class FtpClientLogger implements ProtocolCommandListener {
+
+ private static final Logger log = Logger.getLogger(FtpClientLogger.class);
+
+ private String clientId;
+
+ public FtpClientLogger(String clientId) {
+ this.clientId = clientId;
+ }
+
+ public void protocolCommandSent(ProtocolCommandEvent event) {
+ log.debug(clientId + " > " + event.getMessage().trim());
+
+ }
+
+ public void protocolReplyReceived(ProtocolCommandEvent event) {
+ log.debug(clientId + " < " + event.getMessage().trim());
+ }
+
+}
Propchange: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/FtpClientLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java (added)
+++ incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java Tue Nov 21 14:19:47 2006
@@ -0,0 +1,246 @@
+/*
+ * 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.ftpserver.perftest;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.ftpserver.FtpConfigImpl;
+import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.config.PropertiesConfiguration;
+import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.util.IoUtils;
+
+public abstract class PerformanceTestTemplate extends TestCase {
+
+ public static class ClientRunner implements Runnable {
+
+ private FTPClient client;
+
+ private ClientTask task;
+
+ private int repeats;
+
+ public ClientRunner(FTPClient client, ClientTask task, int repeats) {
+ this.client = client;
+ this.task = task;
+ this.repeats = repeats;
+ }
+
+ public void run() {
+ for (int round = 0; round < repeats; round++) {
+ try {
+ task.doWithClient(client);
+ } catch (Exception e) {
+ // activeThreads.remove(Thread.currentThread());
+ // throw new RuntimeException(e);
+ e.printStackTrace();
+ }
+ }
+ activeThreads.remove(Thread.currentThread());
+ }
+ }
+
+ public static interface ClientTask {
+ public void doWithClient(FTPClient client) throws Exception;
+ }
+
+ public static final int DEFAULT_PORT = 12321;
+
+ protected static final String ADMIN_PASSWORD = "admin";
+
+ protected static final String ADMIN_USERNAME = "admin";
+
+ protected static final String ANONYMOUS_PASSWORD = "foo@bar.com";
+
+ protected static final String ANONYMOUS_USERNAME = "anonymous";
+
+ protected static final String TESTUSER2_USERNAME = "testuser2";
+
+ protected static Hashtable activeThreads = new Hashtable();
+
+ protected static final String TESTUSER1_USERNAME = "testuser1";
+
+ protected static final String TESTUSER_PASSWORD = "password";
+
+ protected FtpServer server;
+
+ protected int port = DEFAULT_PORT;
+
+ private ServerFtpConfig config;
+
+ private long startTime;
+
+ private static final File USERS_FILE = new File(getBaseDir(),
+ "src/test/users.gen");
+
+ private static final File TEST_TMP_DIR = new File("test-tmp");
+
+ protected static final File ROOT_DIR = new File(TEST_TMP_DIR, "ftproot");
+
+ public static File getBaseDir() {
+ // check Maven system prop first and use if set
+ String basedir = System.getProperty("basedir");
+ if (basedir != null) {
+ return new File(basedir);
+ } else {
+ return new File(".");
+ }
+ }
+
+ protected Properties createConfig() {
+ return createDefaultConfig();
+ }
+
+ protected Properties createDefaultConfig() {
+ assertTrue(USERS_FILE.getAbsolutePath() + " must exist", USERS_FILE
+ .exists());
+
+ Properties configProps = new Properties();
+ configProps.setProperty("config.socket-factory.port", Integer
+ .toString(port));
+ configProps.setProperty("config.user-manager.class",
+ "org.apache.ftpserver.usermanager.PropertiesUserManager");
+ configProps.setProperty("config.user-manager.admin", "admin");
+ configProps.setProperty("config.user-manager.prop-password-encrypt",
+ "false");
+ configProps.setProperty("config.user-manager.prop-file", USERS_FILE
+ .getAbsolutePath());
+ configProps.setProperty("config.create-default-user", "false");
+
+ return configProps;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ initDirs();
+
+ initServer();
+ }
+
+ /**
+ * @throws IOException
+ */
+ protected void initDirs() throws IOException {
+ cleanTmpDirs();
+
+ TEST_TMP_DIR.mkdirs();
+ ROOT_DIR.mkdirs();
+ }
+
+ /**
+ * @throws IOException
+ * @throws Exception
+ */
+ protected void initServer() throws IOException, Exception {
+ config = new FtpConfigImpl(new PropertiesConfiguration(createConfig()));
+ server = new FtpServer(config);
+
+ server.start();
+ Thread.sleep(200);
+ }
+
+ protected void cleanTmpDirs() throws IOException {
+ if (TEST_TMP_DIR.exists()) {
+ IoUtils.delete(TEST_TMP_DIR);
+ }
+ }
+
+ /**
+ * Ugly but working way of knowing when the test is complete
+ */
+ protected void waitForTestRun() throws InterruptedException {
+ while (true) {
+ Thread.sleep(20);
+
+ if (activeThreads.size() == 0) {
+ break;
+ }
+ }
+ }
+
+ protected void doClients(ClientTask task, int noOfClients, int repeats) {
+ for (int i = 0; i < noOfClients; i++) {
+ FTPClient client = new FTPClient();
+
+ String clientId = "client" + i;
+ client.addProtocolCommandListener(new FtpClientLogger(clientId));
+
+ Thread clientThread = new Thread(new ClientRunner(client, task,
+ repeats), clientId);
+ activeThreads.put(clientThread, client);
+ clientThread.start();
+ }
+ }
+
+ protected void writeDataToFile(File file, byte[] data) throws IOException {
+ FileOutputStream fos = null;
+
+ try {
+ fos = new FileOutputStream(file);
+
+ fos.write(data);
+ } finally {
+ IoUtils.close(fos);
+ }
+ }
+
+ protected void endMeasureTime(String testName, int numberOfClients,
+ int numberOfRepeats) {
+ StringBuffer msg = new StringBuffer();
+ msg.append(testName).append(" took ")
+ .append(new Date().getTime() - startTime)
+ .append(" ms to complete. No of clients: ")
+ .append(numberOfClients)
+ .append(", number of repeats: ")
+ .append(numberOfRepeats);
+
+ System.out.println(msg.toString());
+ }
+
+ protected void startMeasureTime() {
+ startTime = new Date().getTime();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ if (server != null) {
+ server.stop();
+ }
+
+ cleanTmpDirs();
+ }
+
+}
Propchange: incubator/ftpserver/trunk/perftest/src/test/org/apache/ftpserver/perftest/PerformanceTestTemplate.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ftpserver/trunk/perftest/src/test/users.gen
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/perftest/src/test/users.gen?view=auto&rev=477929
==============================================================================
--- incubator/ftpserver/trunk/perftest/src/test/users.gen (added)
+++ incubator/ftpserver/trunk/perftest/src/test/users.gen Tue Nov 21 14:19:47 2006
@@ -0,0 +1,46 @@
+# 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.
+
+FtpServer.user.admin.maxloginnumber=0
+FtpServer.user.admin.downloadrate=0
+FtpServer.user.admin.enableflag=true
+FtpServer.user.admin.homedirectory=./test-tmp/ftproot
+FtpServer.user.admin.maxloginperip=0
+FtpServer.user.admin.idletime=0
+FtpServer.user.admin.userpassword=admin
+FtpServer.user.admin.writepermission=true
+FtpServer.user.admin.uploadrate=0
+
+FtpServer.user.anonymous.enableflag=true
+FtpServer.user.anonymous.maxloginnumber=20
+FtpServer.user.anonymous.writepermission=false
+FtpServer.user.anonymous.downloadrate=4800
+FtpServer.user.anonymous.uploadrate=4800
+FtpServer.user.anonymous.idletime=300
+FtpServer.user.anonymous.userpassword=
+FtpServer.user.anonymous.homedirectory=./test-tmp/ftproot
+FtpServer.user.anonymous.maxloginperip=2
+
+FtpServer.user.testuser1.homedirectory=./test-tmp/ftproot
+FtpServer.user.testuser1.userpassword=password
+FtpServer.user.testuser1.maxloginnumber=3
+FtpServer.user.testuser1.writepermission=true
+
+FtpServer.user.testuser2.homedirectory=./test-tmp/ftproot
+FtpServer.user.testuser2.userpassword=password
+FtpServer.user.testuser2.maxloginperip=2
+FtpServer.user.testuser2.writepermission=true