Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [350] maven/trunk/ogoglio-integration-test
|
From: <ian...@us...> - 2007-09-03 22:13:27
|
Revision: 350
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=350&view=rev
Author: iansmith
Date: 2007-09-03 15:13:29 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
more pom hacking
Modified Paths:
--------------
maven/trunk/ogoglio-integration-test/pom.xml
maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
Modified: maven/trunk/ogoglio-integration-test/pom.xml
===================================================================
--- maven/trunk/ogoglio-integration-test/pom.xml 2007-09-03 22:13:05 UTC (rev 349)
+++ maven/trunk/ogoglio-integration-test/pom.xml 2007-09-03 22:13:29 UTC (rev 350)
@@ -5,15 +5,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <profiles>
- <profile>
- <id>integration-test</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- </profiles>
-
<!-- About this project -->
<parent>
<groupId>com.ogoglio</groupId>
@@ -34,7 +25,8 @@
<include>basic-config.properties</include>
<include>bootstrap.properties</include>
</includes>
- </testResource>
+ </testResource>
+
<testResource>
<filtering>false</filtering>
<directory>src/test/resources</directory>
@@ -45,7 +37,32 @@
</testResource>
</testResources>
<plugins>
+ <!--only run tests at integration time -->
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>over the wire tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>
+ **/SpaceDuplicatorTest.java
+ </exclude>
+ </excludes>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip> <!--skip unit tests -->
+ </configuration>
+ </plugin>
+ <!--need to compile b/c POM packaging doesn't get it by def -->
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
@@ -58,6 +75,7 @@
</executions>
<configuration />
</plugin>
+ <!--need to do resources b/c POM packaging doesn't get them by def -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
@@ -69,31 +87,61 @@
</goals>
</execution>
</executions>
- <configuration />
+ <configuration/>
</plugin>
+ <!--lots of CARGO magic to bring server up, do deploys... -->
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ <configuration>
+ </configuration>
<executions>
<execution>
- <id>over the wire tests</id>
- <phase>integration-test</phase>
+ <!--bring up server in /tmp -->
+ <id>boot-server</id>
+ <phase>pre-integration-test</phase>
<goals>
- <goal>test</goal>
+ <goal>start</goal>
</goals>
<configuration>
- <excludes>
- <exclude>
- **/SpaceDuplicatorTest.java
- </exclude>
- </excludes>
- <skip>false</skip>
+ <wait>false</wait>
+
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${cargo.tomcat5x.home}</home>
+ <log>${basedir}/tomcat5x.log</log>
+ <output>${basedir}/tomcat5x.out</output>
+ </container>
+ <!-- tomcat configuration -->
+ <configuration>
+ <type>standalone</type>
+ <home>${ogoglio.tmp.tomcat5x}</home>
+ <properties>
+ <cargo.servlet.port>
+ 8080
+ </cargo.servlet.port>
+ <cargo.logging>
+ high
+ </cargo.logging>
+ </properties>
+ <!-- tricky: this gets put in *before* the server even boots -->
+ <deployables>
+ <deployable>
+ <groupId>com.ogoglio</groupId>
+ <artifactId>ogoglio-server</artifactId>
+ <type>war</type>
+ <properties>
+ <context>og</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
</configuration>
</execution>
</executions>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
+
</plugins>
</build>
Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-03 22:13:05 UTC (rev 349)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java 2007-09-03 22:13:29 UTC (rev 350)
@@ -315,6 +315,11 @@
}
private UserDocument[] verifyUserDocsBySize(WebAPIClient webClient1, long spaceID, int expectedLen, String expectedUsername) throws IOException {
+ try {
+ System.out.println("Sleeping in client test! *****");
+ Thread.sleep(2500);
+ } catch (Exception e) {}
+
UserDocument[] userDocs = webClient1.getUserDocuments(spaceID);
assertEquals(expectedLen, userDocs.length);
if (expectedUsername != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
