[Amdatu-commits] SVN r940 - in trunk/etc/performancetest/src/main/java/org/amdatu/test/performance: main runtest

[subversion]

Author: ivo...@gmail.com
Date: Mon Apr  4 12:00:03 2011
New Revision: 940

Log:
[AMDATU-332] Added support for auto deploying performance test bundles

Modified:
   
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
   
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
   
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java

Modified: 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
==============================================================================
--- 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
  (original)
+++ 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/main/Main.java
  Mon Apr  4 12:00:03 2011
@@ -160,9 +160,11 @@
                 File[] versions = new 
File(arguments.get(VERSIONDIR_ARG).toString()).listFiles();
                 for (File v1: versions) {
                     for (File v2: versions) {
-                        if (verify || 
!v1.getAbsolutePath().equals(v2.getAbsolutePath())) {
-                            tests.add(new String[]{v1.getAbsolutePath(), 
v2.getAbsolutePath()});
-                        } 
+                        if (!v1.getName().endsWith(".jar") && 
!v2.getName().endsWith(".jar")) {
+                            if (verify || 
!v1.getAbsolutePath().equals(v2.getAbsolutePath())) {
+                                tests.add(new String[]{v1.getAbsolutePath(), 
v2.getAbsolutePath()});
+                            } 
+                        }
                     }
                 }
 

Modified: 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
==============================================================================
--- 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
     (original)
+++ 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/AmdatuLauncher.java
     Mon Apr  4 12:00:03 2011
@@ -60,6 +60,7 @@
             if (m_context.noExamples) {
                 removeExamples();
             }
+            addTestBundles();
             setPortNumber();
         }
 
@@ -154,6 +155,18 @@
         felixConfig.delete();
         FileUtils.writeLines(felixConfig, newLines);
     }
+    
+    private void addTestBundles() throws IOException {
+        if (m_context.versionDir != null) {
+            File[] files = new File(m_context.versionDir).listFiles();
+            for (File file : files) {
+                if (file.getName().endsWith(".jar")) {
+                    // This is a test bundle, copy it to the deploy directory
+                    FileUtils.copyFile(file, new File(new File(m_tmpDir, 
"deploy"), file.getName()));
+                }
+            }
+        }
+    }
 
     private void setPortNumber() throws IOException {
         if (m_context.port != -1) {

Modified: 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
==============================================================================
--- 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
 (original)
+++ 
trunk/etc/performancetest/src/main/java/org/amdatu/test/performance/runtest/ApplicationContext.java
 Mon Apr  4 12:00:03 2011
@@ -31,6 +31,7 @@
     public int testLoops;
     public int port = 8080;
     public int sampleSize = -1;
+    public String versionDir = null;
 
     public final static String VERSION_X = "X";
     public final static String VERSION_Y = "Y";
@@ -58,6 +59,9 @@
         if (arguments.containsKey(Main.CLEAN_ARG)) {
             clean = true;
         }
+        if (arguments.containsKey(Main.VERSIONDIR_ARG)) {
+            versionDir = arguments.get(Main.VERSIONDIR_ARG).toString();
+        }
     }
     
     public void setContext(TestContext x, TestContext y) {
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits