jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r704169 - in /jackrabbit/sandbox/jackrabbit-test-harness: pom.xml src/ stress/ stress/pom.xml stress/src/ stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java stress/testng.xml testng.xml
Date Mon, 13 Oct 2008 17:22:23 GMT
Author: jukka
Date: Mon Oct 13 10:22:22 2008
New Revision: 704169

URL: http://svn.apache.org/viewvc?rev=704169&view=rev
Log:
test-harness: Put stress tests to a separate module

Added:
    jackrabbit/sandbox/jackrabbit-test-harness/stress/
    jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml   (contents, props changed)
      - copied, changed from r703987, jackrabbit/sandbox/jackrabbit-test-harness/pom.xml
    jackrabbit/sandbox/jackrabbit-test-harness/stress/src/   (props changed)
      - copied from r703987, jackrabbit/sandbox/jackrabbit-test-harness/src/
    jackrabbit/sandbox/jackrabbit-test-harness/stress/testng.xml   (props changed)
      - copied unchanged from r703987, jackrabbit/sandbox/jackrabbit-test-harness/testng.xml
Removed:
    jackrabbit/sandbox/jackrabbit-test-harness/src/
    jackrabbit/sandbox/jackrabbit-test-harness/testng.xml
Modified:
    jackrabbit/sandbox/jackrabbit-test-harness/pom.xml
    jackrabbit/sandbox/jackrabbit-test-harness/stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java

Modified: jackrabbit/sandbox/jackrabbit-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-test-harness/pom.xml?rev=704169&r1=704168&r2=704169&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-test-harness/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-test-harness/pom.xml Mon Oct 13 10:22:22 2008
@@ -23,10 +23,6 @@
                              http://maven.apache.org/maven-v4_0_0.xsd ">
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- =================================================================== -->
-  <!-- P R O J E C T  D E S C R I P T I O N                                -->
-  <!-- =================================================================== -->
-
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
@@ -38,54 +34,10 @@
   <name>Apache Jackrabbit Test Harness</name>
   <version>SNAPSHOT</version>
 
-  <dependencies>
-    <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <classifier>jdk15</classifier>
-      <version>5.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>1.5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.4</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <suiteXmlFiles>
-            <suiteXmlFile>testng.xml</suiteXmlFile>
-          </suiteXmlFiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <modules>
+    <module>compatibility</module>
+    <module>stress</module>
+  </modules>
 
 </project>
 

Copied: jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml (from r703987, jackrabbit/sandbox/jackrabbit-test-harness/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml?p2=jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml&p1=jackrabbit/sandbox/jackrabbit-test-harness/pom.xml&r1=703987&r2=704169&rev=704169&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-test-harness/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml Mon Oct 13 10:22:22 2008
@@ -23,19 +23,15 @@
                              http://maven.apache.org/maven-v4_0_0.xsd ">
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- =================================================================== -->
-  <!-- P R O J E C T  D E S C R I P T I O N                                -->
-  <!-- =================================================================== -->
-
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>4</version>
   </parent>
 
-  <groupId>org.apache.jackrabbit</groupId>
-  <artifactId>jackrabbit-test-harness</artifactId>
-  <name>Apache Jackrabbit Test Harness</name>
+  <groupId>org.apache.jackrabbit.harness</groupId>
+  <artifactId>test</artifactId>
+  <name>Jackrabbit Stress Tests</name>
   <version>SNAPSHOT</version>
 
   <dependencies>

Propchange: jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/sandbox/jackrabbit-test-harness/stress/pom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: jackrabbit/sandbox/jackrabbit-test-harness/stress/src/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: jackrabbit/sandbox/jackrabbit-test-harness/stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-test-harness/stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java?rev=704169&r1=703987&r2=704169&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-test-harness/stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-test-harness/stress/src/test/java/org/apache/jackrabbit/harness/ImportMemoryTest.java
Mon Oct 13 10:22:22 2008
@@ -105,11 +105,11 @@
         thread = new Thread() {
             public void run() {
                 Runtime runtime = Runtime.getRuntime();
-                long start = runtime.totalMemory() - runtime.freeMemory();
                 while (running) {
                     try {
+                        runtime.gc();
                         long currentUsedMemory =
-                            runtime.totalMemory() - runtime.freeMemory() - start;
+                            runtime.totalMemory() - runtime.freeMemory();
                         System.out.println("Current: " + currentUsedMemory);
                         if (maxUsedMemory < currentUsedMemory) {
                             maxUsedMemory = currentUsedMemory;
@@ -146,6 +146,7 @@
 
         System.out.println("Saving...");
         session.save();
+        System.out.println("Max used memory: " + maxUsedMemory);
     }
 
     private void exportTopLevelNode() throws Exception {
@@ -159,7 +160,7 @@
 
     private void exportSecondLevelNode(int index) throws Exception {
         startNode("folder" + index, "nt:folder");
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 10; i++) {
             exportThirdLevelNode(i);
         }
         endNode();

Propchange: jackrabbit/sandbox/jackrabbit-test-harness/stress/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/sandbox/jackrabbit-test-harness/stress/testng.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message