felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1623433 - in /felix/trunk/eventadmin/impl: ./ src/test/java/org/apache/felix/eventadmin/ittests/ src/test/java/org/apache/felix/eventadmin/perftests/
Date Mon, 08 Sep 2014 17:12:58 GMT
Author: cziegeler
Date: Mon Sep  8 17:12:58 2014
New Revision: 1623433

URL: http://svn.apache.org/r1623433
Log:
FELIX-4630: Adding PerformanceTestIT to measure difference between send and post events

Added:
    felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/
    felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/PerformanceTestIT.java
      - copied, changed from r1622446, felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/ittests/PerformanceTestIT.java
Removed:
    felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/ittests/PerformanceTestIT.java
Modified:
    felix/trunk/eventadmin/impl/pom.xml

Modified: felix/trunk/eventadmin/impl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/pom.xml?rev=1623433&r1=1623432&r2=1623433&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/pom.xml (original)
+++ felix/trunk/eventadmin/impl/pom.xml Mon Sep  8 17:12:58 2014
@@ -44,6 +44,8 @@
         <bundle.file.name>
             ${bundle.build.name}/${project.build.finalName}.jar
         </bundle.file.name>
+        <!-- This is a placeholder to enable perf tests with the perftest profile -->
+        <additional.ittests>NONE</additional.ittests>
     </properties>
 
     <dependencies>
@@ -192,30 +194,42 @@
                     </instructions>
                 </configuration>
             </plugin>
-                  <!-- integration tests run with pax-exam -->
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>2.12</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemProperties>
-                                <property>
-                                    <name>project.bundle.file</name>
-                                    <value>${bundle.file.name}</value>
-                                </property>
-                            </systemProperties>
-                            <includes>
-                                <include>**/*IT.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
+          <!-- integration tests run with pax-exam -->
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.12</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>project.bundle.file</name>
+                            <value>${bundle.file.name}</value>
+                        </property>
+                    </systemProperties>
+                    <includes>
+                        <include>**/ittests/*IT.java</include>
+                        <include>${additional.ittests}</include>
+                    </includes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>perftest</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <additional.ittests>**/perftests/*IT.java</additional.ittests>
+            </properties>
+        </profile>
+    </profiles>
 </project>

Copied: felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/PerformanceTestIT.java
(from r1622446, felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/ittests/PerformanceTestIT.java)
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/PerformanceTestIT.java?p2=felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/PerformanceTestIT.java&p1=felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/ittests/PerformanceTestIT.java&r1=1622446&r2=1623433&rev=1623433&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/ittests/PerformanceTestIT.java
(original)
+++ felix/trunk/eventadmin/impl/src/test/java/org/apache/felix/eventadmin/perftests/PerformanceTestIT.java
Mon Sep  8 17:12:58 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.felix.eventadmin.ittests;
+package org.apache.felix.eventadmin.perftests;
 
 import org.junit.After;
 import org.junit.Test;



Mime
View raw message