cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r426945 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core: .classpath src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java
Date Sun, 30 Jul 2006 21:28:38 GMT
Author: aadamchik
Date: Sun Jul 30 14:28:37 2006
New Revision: 426945

URL: http://svn.apache.org/viewvc?rev=426945&view=rev
Log:
fixing test case failures

Modified:
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/.classpath
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java
    incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/.classpath
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/.classpath?rev=426945&r1=426944&r2=426945&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/.classpath (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/.classpath Sun Jul 30 14:28:37 2006
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry excluding="**" output="src/main/resources" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**" output="src/test/resources" kind="src" path="src/test/resources"/>
+	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry output="target/test-classes" kind="lib" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java?rev=426945&r1=426944&r2=426945&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextRefetchTst.java
Sun Jul 30 14:28:37 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import org.apache.cayenne.CayenneRuntimeException;

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java?rev=426945&r1=426944&r2=426945&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/conf/ConfigLoaderTst.java
Sun Jul 30 14:28:37 2006
@@ -23,12 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cayenne.unit.CayenneTestCase;
+import junit.framework.TestCase;
 
 /**
  * @author Andrus Adamchik
  */
-public class ConfigLoaderTst extends CayenneTestCase {
+public class ConfigLoaderTst extends TestCase {
 
     public void testCase1() throws Exception {
         StringBuffer buf = new StringBuffer();
@@ -84,8 +84,7 @@
                 .append("<?xml version='1.0' encoding='utf-8'?>")
                 .append("\n<domains>")
                 .append("\n   <domain name='domain1'>")
-                .append(
-                        "\n        <map name='m1' location='testmap.map.xml'/>")
+                .append("\n        <map name='m1' location='testmap.map.xml'/>")
                 .append("\n        <node name='db1' datasource='node.xml'")
                 .append(
                         "\n              factory='org.apache.cayenne.conf.DriverDataSourceFactory'")
@@ -108,8 +107,7 @@
                 .append("<?xml version='1.0' encoding='utf-8'?>")
                 .append("\n<domains>")
                 .append("\n   <domain name='domain1'>")
-                .append(
-                        "\n        <map name='m1' location='testmap.map.xml'/>")
+                .append("\n        <map name='m1' location='testmap.map.xml'/>")
                 .append("\n        <node name='db1' datasource='node.xml'")
                 .append(
                         "\n              factory='org.apache.cayenne.conf.DriverDataSourceFactory'")
@@ -135,10 +133,8 @@
                 .append("\n   <domain name='domain1'>")
                 .append("\n   <map name='m1' location='testmap.map.xml'/>")
                 .append("\n   </domain>")
-                .append(
-                        "\n   <view name='v1' location='testview1.view.xml'/>")
-                .append(
-                        "\n   <view name='v2' location='testview2.view.xml'/>")
+                .append("\n   <view name='v1' location='testview1.view.xml'/>")
+                .append("\n   <view name='v2' location='testview2.view.xml'/>")
                 .append("\n </domains>");
 
         ConfigLoaderCase aCase = new ConfigLoaderCase();
@@ -186,12 +182,12 @@
         helper.loadDomains(new ByteArrayInputStream(buf.toString().getBytes()));
 
         assertEquals(2, nodes.size());
-        
+
         NodeLoadState s1 = (NodeLoadState) nodes.get(0);
         assertEquals("d1", s1.domainName);
         assertEquals("n1", s1.nodeName);
         assertEquals("org.apache.cayenne.conf.MockDataSourceFactory", s1.factory);
-        
+
         NodeLoadState s2 = (NodeLoadState) nodes.get(1);
         assertEquals("d2", s2.domainName);
         assertEquals("n2", s2.nodeName);



Mime
View raw message