geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r344192 - in /geronimo/gbuild/trunk: pom.xml src/test/java/org/apache/geronimo/gbuild/agent/CVS.java src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java src/test/java/org/apache/geronimo/gbuild/agent/MainTest.java
Date Mon, 14 Nov 2005 19:53:24 GMT
Author: dblevins
Date: Mon Nov 14 11:53:22 2005
New Revision: 344192

URL: http://svn.apache.org/viewcvs?rev=344192&view=rev
Log:
Test case involving queues now works.  Removed hard-coded paths in test case. No longer need
MainTest.

Removed:
    geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/MainTest.java
Modified:
    geronimo/gbuild/trunk/pom.xml
    geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java
    geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java

Modified: geronimo/gbuild/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/pom.xml?rev=344192&r1=344191&r2=344192&view=diff
==============================================================================
--- geronimo/gbuild/trunk/pom.xml (original)
+++ geronimo/gbuild/trunk/pom.xml Mon Nov 14 11:53:22 2005
@@ -44,6 +44,16 @@
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
+
+    <!-- need this till my activemq-core-3.2.pom patch is applied -->
+    <!-- http://jira.codehaus.org/browse/MEV-193 -->
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+
+
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
       <artifactId>continuum-api</artifactId>

Modified: geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java?rev=344192&r1=344191&r2=344192&view=diff
==============================================================================
--- geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java (original)
+++ geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/CVS.java Mon Nov
14 11:53:22 2005
@@ -17,10 +17,13 @@
 package org.apache.geronimo.gbuild.agent;
 
 import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 
+import junit.framework.Assert;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -45,7 +48,11 @@
     }
 
     public void init() throws IOException, CommandLineException {
-        MainTest.deleteAndCreateDirectory(cvsroot);
+        if (cvsroot.isDirectory()) {
+            FileUtils.deleteDirectory(cvsroot);
+        }
+
+        Assert.assertTrue("Could not make directory " + cvsroot, cvsroot.mkdirs());
 
         system(cvsroot, cmd, " -d " + cvsroot.getAbsolutePath() + " init");
     }

Modified: geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
URL: http://svn.apache.org/viewcvs/geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java?rev=344192&r1=344191&r2=344192&view=diff
==============================================================================
--- geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
(original)
+++ geronimo/gbuild/trunk/src/test/java/org/apache/geronimo/gbuild/agent/ContinuumBuildAgentTest.java
Mon Nov 14 11:53:22 2005
@@ -37,7 +37,7 @@
 
     protected void setUp() throws Exception {
 
-        File root = new File("/Users/dblevins/work/gbuild/trunk/target/it").getCanonicalFile();
+        File root = new File("target/it").getCanonicalFile();
         File cvsroot = new File(root, "cvs-root");
         File module = new File(root, "shell");
 
@@ -112,7 +112,7 @@
     }
 
     // need to throw in a Broker
-    public void _testBuildQueue() throws Exception {
+    public void testBuildQueue() throws Exception {
 
         Thread broker = new Thread(new TestBroker(new String[]{}));
         broker.setDaemon(true);



Mime
View raw message