[jboss-svn-commits] JBoss Common SVN: r2777 - in common-core/trunk: src/test/java/org/jboss/test/util/test/graph and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 31 09:11:31 EDT 2008
Author: adrian at jboss.org
Date: 2008-03-31 09:11:30 -0400 (Mon, 31 Mar 2008)
New Revision: 2777
Modified:
common-core/trunk/.classpath
common-core/trunk/.project
common-core/trunk/pom.xml
common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ClassLoaderSourceTestBase.java
common-core/trunk/src/test/java/org/jboss/test/util/test/threadpool/BasicThreadPoolTCCLTestCase.java
Log:
Fixup the common message and remove circular dependencies
Modified: common-core/trunk/.classpath
===================================================================
--- common-core/trunk/.classpath 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/.classpath 2008-03-31 13:11:30 UTC (rev 2777)
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/eclipse-test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="src" path="/common-logging-spi"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="/M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common-logging-spi"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA.jar" sourcepath="/M2_REPO/jboss/jboss-test/1.0.3.GA/jboss-test-1.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="output" path="target/eclipse-classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: common-core/trunk/.project
===================================================================
--- common-core/trunk/.project 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/.project 2008-03-31 13:11:30 UTC (rev 2777)
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>common-core</name>
- <comment>A set of commonly used classed classes</comment>
- <projects>
- <project>jboss-logging-spi</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<projectDescription>
+ <name>jboss-common-core</name>
+ <comment>JBoss Common Core Utility classes</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: common-core/trunk/pom.xml
===================================================================
--- common-core/trunk/pom.xml 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/pom.xml 2008-03-31 13:11:30 UTC (rev 2777)
@@ -73,51 +73,16 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.4.GA</version>
+ <version>2.0.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.0.3.GA</version>
- <scope>test</scope>
- <exclusions>
- <!-- Cyclical dependency, 27/03/2008
- jboss:jboss-test->jboss:jboss-logging-log4j->jboss:jboss-common-core
-
- +- jboss:jboss-test:jar:1.0.3.GA:test
- | +- org.apache.ant:ant-junit:jar:1.7.0:test
- | | \- org.apache.ant:ant:jar:1.7.0:test
- | | \- org.apache.ant:ant-launcher:jar:1.7.0:test
- | +- apache-xerces:xml-apis:jar:2.7.1:test
- | +- apache-httpclient:commons-httpclient:jar:2.0.2:test
- | +- oswego-concurrent:concurrent:jar:1.3.4:test
- | +- jboss:jboss-logging-spi:jar:2.0.2.GA:test
- | +- jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:tes
- | +- jboss:jboss-logging-log4j:jar:2.0.2.GA:test
- | | +- jboss:jboss-common-core:jar:2.0.2.GA:test
- | | | \- apache-slide:webdavlib:jar:2.0:test
- | | \- apache-log4j:log4j:jar:1.2.8:test
- | \- log4j:log4j:jar:1.2.14:test
- -->
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/graph/GraphTestCase.java 2008-03-31 13:11:30 UTC (rev 2777)
@@ -24,7 +24,8 @@
import java.util.ArrayList;
import java.util.Comparator;
-import org.jboss.test.BaseTestCase;
+import junit.framework.TestCase;
+
import org.jboss.util.graph.Graph;
import org.jboss.util.graph.Edge;
import org.jboss.util.graph.Vertex;
@@ -36,7 +37,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 1.1 $
*/
-public class GraphTestCase extends BaseTestCase
+public class GraphTestCase extends TestCase
{
Vertex<String> a = new Vertex<String>("A", "x.ear");
Vertex b = new Vertex("B");
@@ -70,7 +71,7 @@
{
public void visit(Graph g, Vertex v)
{
- log.debug("visit "+v.getName());
+ System.out.println("visit "+v.getName());
order.add(v);
}
public void visit(Graph g, Vertex v, Edge e)
@@ -84,7 +85,7 @@
for(int n = 0; n < order.size(); n ++)
{
Vertex v = (Vertex) order.get(n);
- log.debug(v);
+ System.out.println(v);
assertTrue(v.getName()+" is visited", v.visited());
}
String[] names = {"A", "B", "C", "H", "G", "I", "E", "F"};
@@ -109,7 +110,7 @@
{
public void visit(Graph g, Vertex v)
{
- log.debug("visit "+v.getName());
+ System.out.println("visit "+v.getName());
order.add(v);
}
public void visit(Graph g, Vertex v, Edge e)
@@ -123,7 +124,7 @@
for(int n = 0; n < order.size(); n ++)
{
Vertex v = (Vertex) order.get(n);
- log.debug(v);
+ System.out.println(v);
assertTrue(v.getName()+" is visited", v.visited());
}
String[] names = {"A", "B", "F", "C", "G", "E", "I", "H"};
@@ -152,7 +153,7 @@
Edge[] cycleEdges = g.findCycles();
assertTrue("There is a cycle", cycleEdges.length == 1);
for(int n = 0; n < cycleEdges.length; n ++)
- log.debug(cycleEdges[n]);
+ System.out.println(cycleEdges[n]);
Edge e = cycleEdges[0];
Vertex vx = e.getFrom();
@@ -175,7 +176,7 @@
}
catch(IllegalArgumentException e)
{
- log.debug("Saw IAE as expected");
+ System.out.println("Saw IAE as expected");
}
assertTrue("Added e1", g.addVertex(e1));
assertTrue("Added E(ear, e1)", g.addEdge(ear, e1, 0));
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ClassLoaderSourceTestBase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ClassLoaderSourceTestBase.java 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/loading/ClassLoaderSourceTestBase.java 2008-03-31 13:11:30 UTC (rev 2777)
@@ -22,7 +22,7 @@
package org.jboss.test.util.test.loading;
-import org.jboss.test.BaseTestCase;
+import junit.framework.TestCase;
import org.jboss.util.loading.ClassLoaderSource;
/**
@@ -30,7 +30,7 @@
*
* @author Brian Stansberry
*/
-public abstract class ClassLoaderSourceTestBase extends BaseTestCase
+public abstract class ClassLoaderSourceTestBase extends TestCase
{
protected ClassLoader origCl;
Modified: common-core/trunk/src/test/java/org/jboss/test/util/test/threadpool/BasicThreadPoolTCCLTestCase.java
===================================================================
--- common-core/trunk/src/test/java/org/jboss/test/util/test/threadpool/BasicThreadPoolTCCLTestCase.java 2008-03-31 13:11:17 UTC (rev 2776)
+++ common-core/trunk/src/test/java/org/jboss/test/util/test/threadpool/BasicThreadPoolTCCLTestCase.java 2008-03-31 13:11:30 UTC (rev 2777)
@@ -22,7 +22,7 @@
package org.jboss.test.util.test.threadpool;
-import org.jboss.test.BaseTestCase;
+import junit.framework.TestCase;
import org.jboss.util.loading.ClassLoaderSource;
import org.jboss.util.threadpool.BasicThreadPool;
@@ -31,7 +31,7 @@
*
* @author Brian Stansberry
*/
-public class BasicThreadPoolTCCLTestCase extends BaseTestCase
+public class BasicThreadPoolTCCLTestCase extends TestCase
{
protected ClassLoader origCl;
More information about the jboss-svn-commits
mailing list