You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/05/03 05:32:30 UTC
svn commit: r940356 - in /cayenne/main/trunk:
build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/
framework/cayenne-jdk1.5-unpublished/src/test/java/org/a...
Author: aadamchik
Date: Mon May 3 03:32:29 2010
New Revision: 940356
URL: http://svn.apache.org/viewvc?rev=940356&view=rev
Log:
CAY-1414 Remove org.apache.cayenne.conf package
* continuing cleanup
* continuing switching unit tests to the DI approach, including some general refactoring of tests
Added:
cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/AssertExtras.java
- copied, changed from r940355, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne-domain.xml
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ClasspathResourceFinderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigurationTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/EmptyConfiguration.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfigLoaderDelegate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfiguration.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory1.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/BasicCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/lightweight-cayenne.xml
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataRowStore.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/OrderingTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/ZipUtilTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map1.map.xml
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map2.map.xml
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
Copied: cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/AssertExtras.java (from r940355, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory1.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/AssertExtras.java?p2=cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/AssertExtras.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory1.java&r1=940355&r2=940356&rev=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockDataSourceFactory1.java (original)
+++ cayenne/main/trunk/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/AssertExtras.java Mon May 3 03:32:29 2010
@@ -16,17 +16,18 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
+package org.apache.cayenne.test;
-package org.apache.cayenne.conf;
+import java.math.BigDecimal;
-import javax.sql.DataSource;
+import junit.framework.Assert;
-public class MockDataSourceFactory1 implements DataSourceFactory {
+public class AssertExtras {
- public void initializeWithParentConfiguration(Configuration conf) {
- }
-
- public DataSource getDataSource(String location) throws Exception {
- return null;
+ public static void assertEquals(BigDecimal d1, Object d2, double delta) {
+ Assert.assertNotNull(d2);
+ Assert.assertTrue("d2: " + d2.getClass().getName(), d2 instanceof BigDecimal);
+ BigDecimal d3 = d1.subtract((BigDecimal) d2);
+ Assert.assertTrue(Math.abs(d3.doubleValue()) < delta);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java Mon May 3 03:32:29 2010
@@ -34,8 +34,11 @@ import java.util.zip.ZipOutputStream;
/**
* Utility class to perform zip/unzip operations on files and directories.
- *
+ *
+ * @deprecated since 3.1. This class is unused and will be removed in the future
+ * versions..
*/
+@Deprecated
public class ZipUtil {
/**
@@ -46,12 +49,12 @@ public class ZipUtil {
}
/**
- * Unpacks a zip file to the target directory.
- *
- * @param zipFile
- * @param destDir
- * @throws IOException
- */
+ * Unpacks a zip file to the target directory.
+ *
+ * @param zipFile
+ * @param destDir
+ * @throws IOException
+ */
public static void unzip(File zipFile, File destDir) throws IOException {
ZipFile zip = new ZipFile(zipFile);
@@ -61,73 +64,68 @@ public class ZipUtil {
while (en.hasMoreElements()) {
ZipEntry entry = en.nextElement();
- File file =
- (destDir != null)
+ File file = (destDir != null)
? new File(destDir, entry.getName())
: new File(entry.getName());
if (entry.isDirectory()) {
if (!file.mkdirs()) {
- throw new IOException(
- "Error creating directory: " + file);
+ throw new IOException("Error creating directory: " + file);
}
- } else {
+ }
+ else {
File parent = file.getParentFile();
if (parent != null && !parent.exists()) {
if (!parent.mkdirs()) {
- throw new IOException(
- "Error creating directory: " + parent);
+ throw new IOException("Error creating directory: " + parent);
}
}
InputStream in = zip.getInputStream(entry);
try {
- OutputStream out =
- new BufferedOutputStream(
- new FileOutputStream(file),
- bufSize);
+ OutputStream out = new BufferedOutputStream(new FileOutputStream(
+ file), bufSize);
try {
Util.copyPipe(in, out, bufSize);
- } finally {
+ }
+ finally {
out.close();
}
- } finally {
+ }
+ finally {
in.close();
}
}
}
- } finally {
+ }
+ finally {
zip.close();
}
}
/**
- * Recursively zips a set of root entries into a zipfile, compressing the
- * contents.
- *
- * @param zipFile target zip file.
- * @param parentDir a directory containing source files to zip.
- * @param sources an array of files and/or directories to zip.
- * @param pathSeparator path separator for zip entries.
- *
- * @throws IOException
- */
+ * Recursively zips a set of root entries into a zipfile, compressing the contents.
+ *
+ * @param zipFile target zip file.
+ * @param parentDir a directory containing source files to zip.
+ * @param sources an array of files and/or directories to zip.
+ * @param pathSeparator path separator for zip entries.
+ * @throws IOException
+ */
public static void zip(
- File zipFile,
- File parentDir,
- File[] sources,
- char pathSeparator)
- throws IOException {
-
+ File zipFile,
+ File parentDir,
+ File[] sources,
+ char pathSeparator) throws IOException {
+
String stripPath = (parentDir != null) ? parentDir.getPath() : "";
if (stripPath.length() > 0 && !stripPath.endsWith(File.separator)) {
stripPath += File.separator;
}
- ZipOutputStream out =
- new ZipOutputStream(new FileOutputStream(zipFile));
+ ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zipFile));
out.setMethod(ZipOutputStream.DEFLATED);
try {
@@ -145,21 +143,20 @@ public class ZipUtil {
zipFile(out, stripPath, source, pathSeparator);
}
}
- } finally {
+ }
+ finally {
out.close();
}
}
/**
- * Uses code fragments from Jakarta-Ant, Copyright: Apache Software
- * Foundation.
+ * Uses code fragments from Jakarta-Ant, Copyright: Apache Software Foundation.
*/
private static void zipDirectory(
- ZipOutputStream out,
- String stripPath,
- File dir,
- char pathSeparator)
- throws IOException {
+ ZipOutputStream out,
+ String stripPath,
+ File dir,
+ char pathSeparator) throws IOException {
String[] entries = dir.list();
@@ -180,23 +177,21 @@ public class ZipUtil {
}
/**
- * Uses code fragments from Jakarta-Ant, Copyright: Apache Software
- * Foundation.
+ * Uses code fragments from Jakarta-Ant, Copyright: Apache Software Foundation.
*/
private static void zipFile(
- ZipOutputStream out,
- String stripPath,
- File file,
- char pathSeparator)
- throws IOException {
- ZipEntry ze =
- new ZipEntry(processPath(file.getPath(), stripPath, pathSeparator));
+ ZipOutputStream out,
+ String stripPath,
+ File file,
+ char pathSeparator) throws IOException {
+ ZipEntry ze = new ZipEntry(processPath(file.getPath(), stripPath, pathSeparator));
ze.setTime(file.lastModified());
out.putNextEntry(ze);
byte[] buffer = new byte[8 * 1024];
- BufferedInputStream in =
- new BufferedInputStream(new FileInputStream(file), buffer.length);
+ BufferedInputStream in = new BufferedInputStream(
+ new FileInputStream(file),
+ buffer.length);
try {
int count = 0;
@@ -205,25 +200,22 @@ public class ZipUtil {
out.write(buffer, 0, count);
}
}
- } finally {
+ }
+ finally {
in.close();
}
}
- private static String processPath(
- String path,
- String stripPath,
- char pathSeparator) {
+ private static String processPath(String path, String stripPath, char pathSeparator) {
if (!path.startsWith(stripPath)) {
- throw new IllegalArgumentException(
- "Invalid entry: "
+ throw new IllegalArgumentException("Invalid entry: "
+ path
+ "; expected to start with "
+ stripPath);
}
return path.substring(stripPath.length()).replace(
- File.separatorChar,
- pathSeparator);
+ File.separatorChar,
+ pathSeparator);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingTest.java Mon May 3 03:32:29 2010
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.art.Artist;
import org.apache.art.Gallery;
import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.test.AssertExtras;
import org.apache.cayenne.unit.CayenneCase;
public class DataContextEJBQLGroupByHavingTest extends CayenneCase {
@@ -49,11 +50,11 @@ public class DataContextEJBQLGroupByHavi
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
assertEquals(new Long(3), row0[1]);
Object[] row1 = (Object[]) data.get(1);
- assertEquals(new BigDecimal(2d), row1[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(2d), row1[0], 0.001d);
assertEquals(new Long(2l), row1[1]);
}
@@ -70,17 +71,17 @@ public class DataContextEJBQLGroupByHavi
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
assertEquals("PX", row0[1]);
assertEquals(new Long(1), row0[2]);
Object[] row1 = (Object[]) data.get(1);
- assertEquals(new BigDecimal(1), row1[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(1), row1[0], 0.001d);
assertEquals("PZ", row1[1]);
assertEquals(new Long(2), row1[2]);
Object[] row2 = (Object[]) data.get(2);
- assertEquals(new BigDecimal(2d), row2[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(2d), row2[0], 0.001d);
assertEquals("PY", row2[1]);
assertEquals(new Long(2), row2[2]);
}
@@ -138,7 +139,7 @@ public class DataContextEJBQLGroupByHavi
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- assertEquals(new BigDecimal(2d), row0[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(2d), row0[0], 0.001d);
assertEquals(new Long(2), row0[1]);
}
@@ -155,7 +156,7 @@ public class DataContextEJBQLGroupByHavi
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
assertEquals(new Long(3l), row0[1]);
}
@@ -172,10 +173,10 @@ public class DataContextEJBQLGroupByHavi
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
- assertEquals(new BigDecimal(1d), row0[0], 0.001d);
+ AssertExtras.assertEquals(new BigDecimal(1d), row0[0], 0.001d);
assertEquals(new Long(3l), row0[1]);
}
-
+
public void testGroupByJoinedRelatedEntities() throws Exception {
createTestData("testGroupByRelatedEntity");
EJBQLQuery query = new EJBQLQuery(
@@ -183,59 +184,60 @@ public class DataContextEJBQLGroupByHavi
List<Object[]> data = createDataContext().performQuery(query);
assertNotNull(data);
assertEquals(2, data.size());
-
- List<String> expectedArtists=new ArrayList<String>();
+
+ List<String> expectedArtists = new ArrayList<String>();
expectedArtists.add("AA1");
expectedArtists.add("AA2");
-
- Object[]row = data.get(0);
- String artistName = ((Artist)row[1]).getArtistName();
+
+ Object[] row = data.get(0);
+ String artistName = ((Artist) row[1]).getArtistName();
assertEquals(1L, row[0]);
- assertTrue("error artistName:"+artistName, expectedArtists.contains(artistName));
-
+ assertTrue("error artistName:" + artistName, expectedArtists.contains(artistName));
+
row = data.get(1);
- artistName = ((Artist)row[1]).getArtistName();
+ artistName = ((Artist) row[1]).getArtistName();
assertEquals(1L, row[0]);
- assertTrue("error artistName:"+artistName, expectedArtists.contains(artistName));
+ assertTrue("error artistName:" + artistName, expectedArtists.contains(artistName));
}
public void testGroupByJoinedEntities() throws Exception {
createTestData("testGroupByEntities");
EJBQLQuery query = new EJBQLQuery(
- "SELECT COUNT(p), p.toArtist, p.toGallery FROM Painting p " +
- "GROUP BY p.toGallery, p.toArtist ");
+ "SELECT COUNT(p), p.toArtist, p.toGallery FROM Painting p "
+ + "GROUP BY p.toGallery, p.toArtist ");
List<Object[]> data = createDataContext().performQuery(query);
assertNotNull(data);
assertEquals(2, data.size());
-
- HashSet<List> expectedResults=new HashSet<List>();
- expectedResults.add(Arrays.asList(1L, "AA2","gallery1"));
- expectedResults.add(Arrays.asList(1L, "AA1","gallery2"));
-
- for(Object[] row:data){
- assertFalse(expectedResults.add(Arrays.asList(
- row[0],
- row[1]==null?null:((Artist)row[1]).getArtistName(),
- row[2]==null?null:((Gallery)row[2]).getGalleryName())));
+
+ HashSet<List> expectedResults = new HashSet<List>();
+ expectedResults.add(Arrays.asList(1L, "AA2", "gallery1"));
+ expectedResults.add(Arrays.asList(1L, "AA1", "gallery2"));
+
+ for (Object[] row : data) {
+ assertFalse(expectedResults.add(Arrays.asList(row[0], row[1] == null
+ ? null
+ : ((Artist) row[1]).getArtistName(), row[2] == null
+ ? null
+ : ((Gallery) row[2]).getGalleryName())));
}
}
public void testGroupByJoinedEntityInCount() throws Exception {
createTestData("testGroupByEntities");
EJBQLQuery query = new EJBQLQuery(
- "SELECT COUNT(p.toArtist), p.paintingTitle FROM Painting p " +
- "GROUP BY p.paintingTitle " +
- "HAVING p.paintingTitle LIKE 'P1%'");
+ "SELECT COUNT(p.toArtist), p.paintingTitle FROM Painting p "
+ + "GROUP BY p.paintingTitle "
+ + "HAVING p.paintingTitle LIKE 'P1%'");
List<Object[]> data = createDataContext().performQuery(query);
assertNotNull(data);
assertEquals(3, data.size());
-
- HashSet<List> expectedResults=new HashSet<List>();
+
+ HashSet<List> expectedResults = new HashSet<List>();
expectedResults.add(Arrays.asList(1L, "P1"));
expectedResults.add(Arrays.asList(1L, "P111"));
expectedResults.add(Arrays.asList(1L, "P112"));
-
- for(Object[] row:data){
+
+ for (Object[] row : data) {
assertFalse(expectedResults.add(Arrays.asList(row[0], row[1])));
}
}
@@ -247,11 +249,11 @@ public class DataContextEJBQLGroupByHavi
+ " GROUP BY p.painting.toArtist.paintingArray";
EJBQLQuery query = new EJBQLQuery(ejbql);
List data = createDataContext().performQuery(query);
-
+
ejbql = "SELECT p.painting.toArtist FROM PaintingInfo p"
- + " GROUP BY p.painting.toArtist";
+ + " GROUP BY p.painting.toArtist";
query = new EJBQLQuery(ejbql);
createDataContext().performQuery(query);
}
-
+
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryTest.java Mon May 3 03:32:29 2010
@@ -36,6 +36,7 @@ import org.apache.cayenne.PersistenceSta
import org.apache.cayenne.map.LifecycleEvent;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
+import org.apache.cayenne.test.AssertExtras;
import org.apache.cayenne.unit.CayenneCase;
public class DataContextEJBQLQueryTest extends CayenneCase {
@@ -60,10 +61,7 @@ public class DataContextEJBQLQueryTest e
.getEntityResolver());
DataContextEJBQLQueryCallback listener = new DataContextEJBQLQueryCallback();
- testCallbacks.addDefaultListener(
- LifecycleEvent.POST_LOAD,
- listener,
- "postLoad");
+ testCallbacks.addDefaultListener(LifecycleEvent.POST_LOAD, listener, "postLoad");
context.getEntityResolver().setCallbackRegistry(testCallbacks);
@@ -72,9 +70,9 @@ public class DataContextEJBQLQueryTest e
EJBQLQuery query = new EJBQLQuery(ejbql);
List data = createDataContext().performQuery(query);
-
+
assertFalse(listener.postLoad);
-
+
assertEquals(1, data.size());
assertTrue(data.get(0) instanceof Object[]);
}
@@ -95,8 +93,8 @@ public class DataContextEJBQLQueryTest e
Object[] aggregates = (Object[]) data.get(0);
assertEquals(new Long(2), aggregates[0]);
assertEquals(new Long(2), aggregates[1]);
- assertEquals(new BigDecimal(5000d), aggregates[2], 0.01);
- assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
+ AssertExtras.assertEquals(new BigDecimal(5000d), aggregates[2], 0.01);
+ AssertExtras.assertEquals(new BigDecimal(8000d), aggregates[3], 0.01);
}
public void testSelectAggregateNull() throws Exception {
@@ -145,13 +143,13 @@ public class DataContextEJBQLQueryTest e
assertTrue(data.get(0) instanceof Object[]);
Object[] row0 = (Object[]) data.get(0);
assertEquals(2, row0.length);
- assertEquals(new BigDecimal(3000d), row0[0], 0.01);
+ AssertExtras.assertEquals(new BigDecimal(3000d), row0[0], 0.01);
assertEquals("AA1", row0[1]);
assertTrue(data.get(1) instanceof Object[]);
Object[] row1 = (Object[]) data.get(1);
assertEquals(2, row1.length);
- assertEquals(new BigDecimal(5000d), row1[0], 0.01);
+ AssertExtras.assertEquals(new BigDecimal(5000d), row1[0], 0.01);
assertEquals("AA2", row1[1]);
}
@@ -265,7 +263,7 @@ public class DataContextEJBQLQueryTest e
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereBetween() throws Exception {
@@ -279,7 +277,7 @@ public class DataContextEJBQLQueryTest e
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereNotBetween() throws Exception {
@@ -293,7 +291,7 @@ public class DataContextEJBQLQueryTest e
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
+ AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereGreater() throws Exception {
@@ -307,7 +305,7 @@ public class DataContextEJBQLQueryTest e
Painting p = (Painting) ps.get(0);
assertEquals("P2", p.getPaintingTitle());
- assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
+ AssertExtras.assertEquals(new BigDecimal(5000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereGreaterOrEqual() throws Exception {
@@ -331,7 +329,7 @@ public class DataContextEJBQLQueryTest e
Painting p = (Painting) ps.get(0);
assertEquals("P1", p.getPaintingTitle());
- assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
+ AssertExtras.assertEquals(new BigDecimal(3000d), p.getEstimatedPrice(), 0.01);
}
public void testSelectFromWhereLessOrEqual() throws Exception {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Mon May 3 03:32:29 2010
@@ -40,11 +40,6 @@ import org.apache.cayenne.query.SQLTempl
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneCase;
-/**
- * "Lightweight" test cases for DataContext. These tests do not require any additional
- * database setup.
- *
- */
public class DataContextExtrasTest extends CayenneCase {
public void testManualIdProcessingOnCommit() throws Exception {
@@ -175,10 +170,11 @@ public class DataContextExtrasTest exten
// setup mockup PK generator that will blow on PK request
// to emulate an exception
PkGenerator newGenerator = new JdbcPkGenerator(new JdbcAdapter()) {
- @Override
+
+ @Override
public Object generatePk(DataNode node, DbAttribute pk) throws Exception {
throw new CayenneRuntimeException("Intentional");
- }
+ }
};
PkGenerator oldGenerator = getNode().getAdapter().getPkGenerator();
@@ -317,10 +313,7 @@ public class DataContextExtrasTest exten
Painting p1 = (Painting) objects.get(0);
Artist oldArtist = p1.getToArtist();
- Artist newArtist = Cayenne.objectForPK(
- context,
- Artist.class,
- 33002);
+ Artist newArtist = Cayenne.objectForPK(context, Artist.class, 33002);
assertNotSame(oldArtist, newArtist);
@@ -346,10 +339,7 @@ public class DataContextExtrasTest exten
Painting p1 = (Painting) objects.get(0);
Artist oldArtist = p1.getToArtist();
- Artist newArtist = Cayenne.objectForPK(
- context,
- Artist.class,
- 33002);
+ Artist newArtist = Cayenne.objectForPK(context, Artist.class, 33002);
assertNotSame(oldArtist, newArtist);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeTest.java Mon May 3 03:32:29 2010
@@ -19,11 +19,12 @@
package org.apache.cayenne.access;
+import junit.framework.TestCase;
+
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.map.EntitySorter;
-import org.apache.cayenne.unit.BasicCase;
-public class DataNodeTest extends BasicCase {
+public class DataNodeTest extends TestCase {
public void testName() throws Exception {
String tstName = "tst_name";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataRowStore.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataRowStore.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataRowStore.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataRowStore.java Mon May 3 03:32:29 2010
@@ -28,7 +28,6 @@ import org.apache.cayenne.event.MockEven
/**
* A "lightweight" DataRowStore.
- *
*/
public class MockDataRowStore extends DataRowStore {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java Mon May 3 03:32:29 2010
@@ -19,11 +19,11 @@
package org.apache.cayenne.access.jdbc;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
/**
*/
-public class SQLStatementTest extends BasicCase {
+public class SQLStatementTest extends TestCase {
public void testConstructor() throws Exception {
ParameterBinding[] bindings = new ParameterBinding[0];
SQLStatement statement = new SQLStatement("abc", bindings);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java Mon May 3 03:32:29 2010
@@ -23,38 +23,32 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
-/**
- */
-public class SQLTemplateProcessorChainTest extends BasicCase {
+public class SQLTemplateProcessorChainTest extends TestCase {
public void testProcessTemplateNoChunks() throws Exception {
// whatever is inside the chain, it should render as empty if there
// is no chunks...
- SQLStatement compiled =
- new SQLTemplateProcessor().processTemplate(
+ SQLStatement compiled = new SQLTemplateProcessor().processTemplate(
"#chain(' AND ') #end",
Collections.EMPTY_MAP);
assertEquals("", compiled.getSql());
- compiled =
- new SQLTemplateProcessor().processTemplate(
+ compiled = new SQLTemplateProcessor().processTemplate(
"#chain(' AND ') garbage #end",
Collections.EMPTY_MAP);
assertEquals("", compiled.getSql());
- compiled =
- new SQLTemplateProcessor().processTemplate(
+ compiled = new SQLTemplateProcessor().processTemplate(
"#chain(' AND ' 'PREFIX') #end",
Collections.EMPTY_MAP);
assertEquals("", compiled.getSql());
- compiled =
- new SQLTemplateProcessor().processTemplate(
+ compiled = new SQLTemplateProcessor().processTemplate(
"#chain(' AND ' 'PREFIX') garbage #end",
Collections.EMPTY_MAP);
@@ -62,8 +56,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplateFullChain() throws Exception {
- String template =
- "#chain(' OR ')"
+ String template = "#chain(' OR ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
@@ -79,8 +72,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplateFullChainAndPrefix() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
@@ -96,8 +88,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplatePartialChainMiddle() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
@@ -112,8 +103,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplatePartialChainStart() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
@@ -128,8 +118,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplatePartialChainEnd() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
@@ -144,8 +133,7 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplateChainWithGarbage() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ " some other stuff"
+ "#chunk($c)$c#end"
@@ -160,28 +148,28 @@ public class SQLTemplateProcessorChainTe
}
public void testProcessTemplateChainUnconditionalChunks() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk()C1#end"
+ "#chunk()C2#end"
+ "#chunk()C3#end"
+ "#end";
- SQLStatement compiled =
- new SQLTemplateProcessor().processTemplate(template, Collections.EMPTY_MAP);
+ SQLStatement compiled = new SQLTemplateProcessor().processTemplate(
+ template,
+ Collections.EMPTY_MAP);
assertEquals("WHERE C1 OR C2 OR C3", compiled.getSql());
}
public void testProcessTemplateEmptyChain() throws Exception {
- String template =
- "#chain(' OR ' 'WHERE ')"
+ String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
+ "#chunk($b)$b#end"
+ "#chunk($c)$c#end"
+ "#end";
- SQLStatement compiled =
- new SQLTemplateProcessor().processTemplate(template, Collections.EMPTY_MAP);
+ SQLStatement compiled = new SQLTemplateProcessor().processTemplate(
+ template,
+ Collections.EMPTY_MAP);
assertEquals("", compiled.getSql());
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java Mon May 3 03:32:29 2010
@@ -21,11 +21,9 @@ package org.apache.cayenne.access.jdbc;
import java.util.Collections;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
-/**
- */
-public class SQLTemplateProcessorSelectTest extends BasicCase {
+public class SQLTemplateProcessorSelectTest extends TestCase {
public void testProcessTemplateUnchanged() throws Exception {
String sqlTemplate = "SELECT * FROM ME";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java Mon May 3 03:32:29 2010
@@ -25,14 +25,15 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.cayenne.CayenneDataObject;
import org.apache.cayenne.DataObject;
import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.unit.BasicCase;
/**
*/
-public class SQLTemplateProcessorTest extends BasicCase {
+public class SQLTemplateProcessorTest extends TestCase {
public void testProcessTemplateUnchanged1() throws Exception {
String sqlTemplate = "SELECT * FROM ME";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java Mon May 3 03:32:29 2010
@@ -19,21 +19,20 @@
package org.apache.cayenne.access.jdbc;
+import junit.framework.TestCase;
+
import org.apache.velocity.Template;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.ResourceManager;
-import org.apache.cayenne.unit.BasicCase;
-/**
- */
-public class SQLTemplateResourceManagerTest extends BasicCase {
+public class SQLTemplateResourceManagerTest extends TestCase {
+
public void testFetResource() throws Exception {
SQLTemplateResourceManager rm = new SQLTemplateResourceManager();
rm.initialize(new MockupRuntimeServices());
- Resource resource =
- rm.getResource(
+ Resource resource = rm.getResource(
"abc",
ResourceManager.RESOURCE_TEMPLATE,
RuntimeConstants.ENCODING_DEFAULT);
@@ -41,26 +40,20 @@ public class SQLTemplateResourceManagerT
assertTrue(resource instanceof Template);
// must be cached...
- assertSame(
- resource,
- rm.getResource(
+ assertSame(resource, rm.getResource(
"abc",
ResourceManager.RESOURCE_TEMPLATE,
RuntimeConstants.ENCODING_DEFAULT));
// new resource must be different
- assertNotSame(
- resource,
- rm.getResource(
+ assertNotSame(resource, rm.getResource(
"xyz",
ResourceManager.RESOURCE_TEMPLATE,
RuntimeConstants.ENCODING_DEFAULT));
// after clearing cache, resource must be refreshed
rm.clearCache();
- assertNotSame(
- resource,
- rm.getResource(
+ assertNotSame(resource, rm.getResource(
"abc",
ResourceManager.RESOURCE_TEMPLATE,
RuntimeConstants.ENCODING_DEFAULT));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java Mon May 3 03:32:29 2010
@@ -21,11 +21,11 @@ package org.apache.cayenne.map;
import java.sql.Types;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
/**
*/
-public class ObjEntitySingleTableInheritanceTest extends BasicCase {
+public class ObjEntitySingleTableInheritanceTest extends TestCase {
protected DataMap map;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java Mon May 3 03:32:29 2010
@@ -19,12 +19,13 @@
package org.apache.cayenne.map;
+import junit.framework.TestCase;
+
import org.apache.cayenne.query.Query;
-import org.apache.cayenne.unit.BasicCase;
/**
*/
-public class QueryLoaderTest extends BasicCase {
+public class QueryLoaderTest extends TestCase {
protected QueryLoader builder;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/OrderingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/OrderingTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/OrderingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/OrderingTest.java Mon May 3 03:32:29 2010
@@ -23,11 +23,12 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
import org.apache.art.Painting;
-import org.apache.cayenne.unit.BasicCase;
import org.apache.cayenne.unit.util.TestBean;
-public class OrderingTest extends BasicCase {
+public class OrderingTest extends TestCase {
public void testPathSpec1() throws Exception {
String pathSpec = "a.b.c";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java Mon May 3 03:32:29 2010
@@ -24,16 +24,18 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
-public class FilesystemResourceLocatorTest extends BasicCase {
+import org.apache.cayenne.unit.CayenneResources;
+
+public class FilesystemResourceLocatorTest extends TestCase {
public void testArrayConstructor() {
FilesystemResourceLocator l1 = new FilesystemResourceLocator();
assertEquals(1, l1.roots.length);
assertEquals(System.getProperty("user.dir"), l1.roots[0].getPath());
- File base = getTestDir();
+ File base = CayenneResources.getResources().getTestDir();
File f1 = new File(base, "f1");
File f2 = new File(new File(base, "f2"), "f3");
@@ -49,7 +51,7 @@ public class FilesystemResourceLocatorTe
assertEquals(1, l1.roots.length);
assertEquals(System.getProperty("user.dir"), l1.roots[0].getPath());
- File base = getTestDir();
+ File base = CayenneResources.getResources().getTestDir();
File f1 = new File(base, "f1");
File f2 = new File(new File(base, "f2"), "f3");
@@ -62,7 +64,7 @@ public class FilesystemResourceLocatorTe
public void testFindResources() throws Exception {
- File base = new File(getTestDir(), getClass().getName());
+ File base = new File(CayenneResources.getResources().getTestDir(), getClass().getName());
File root1 = new File(base, "r1");
File root2 = new File(base, "r2");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/AccessStack.java Mon May 3 03:32:29 2010
@@ -26,7 +26,6 @@ import org.apache.cayenne.access.UnitTes
/**
* DataDomain wrapper used for testing a specific Cayenne stack configuration.
- *
*/
public interface AccessStack {
@@ -34,7 +33,8 @@ public interface AccessStack {
UnitTestDomain getDataDomain();
- void createTestData(Class<?> testCase, String testName, Map parameters) throws Exception;
+ void createTestData(Class<?> testCase, String testName, Map parameters)
+ throws Exception;
void deleteTestData() throws Exception;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java Mon May 3 03:32:29 2010
@@ -23,6 +23,8 @@ import java.sql.Connection;
import java.util.Collections;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataNode;
@@ -40,7 +42,7 @@ import org.apache.cayenne.unit.util.SQLT
* Superclass of Cayenne test cases. Provides access to shared connection resources.
*
*/
-public abstract class CayenneCase extends BasicCase {
+public abstract class CayenneCase extends TestCase {
public static final String TEST_ACCESS_STACK = "TestStack";
public static final String MULTI_TIER_ACCESS_STACK = "MultiTierStack";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java Mon May 3 03:32:29 2010
@@ -18,12 +18,12 @@
****************************************************************/
package org.apache.cayenne.unit.jira;
-import java.io.InputStream;
-
import junit.framework.TestCase;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.conf.DefaultConfiguration;
+import org.apache.cayenne.configuration.server.CayenneServerModule;
+import org.apache.cayenne.di.DIBootstrap;
+import org.apache.cayenne.di.Injector;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
@@ -31,27 +31,10 @@ public class CAY_743Test extends TestCas
public void testLoad2MapsWithCrossMapInheritance() throws Exception {
- DefaultConfiguration config = new DefaultConfiguration() {
-
- @Override
- protected InputStream getDomainConfiguration() {
- return Thread
- .currentThread()
- .getContextClassLoader()
- .getResourceAsStream("cay743/cayenne.xml");
- }
-
- @Override
- protected InputStream getMapConfiguration(String location) {
- return Thread
- .currentThread()
- .getContextClassLoader()
- .getResourceAsStream("cay743/" + location);
- }
- };
- config.initialize();
+ Injector injector = DIBootstrap.createInjector(new CayenneServerModule(
+ "cay743/cayenne-domain.xml"));
- DataDomain domain = config.getDomain();
+ DataDomain domain = injector.getInstance(DataDomain.class);
assertEquals(2, domain.getDataMaps().size());
DataMap m1 = domain.getMap("map1");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/ZipUtilTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/ZipUtilTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/ZipUtilTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/util/ZipUtilTest.java Mon May 3 03:32:29 2010
@@ -17,26 +17,31 @@
* under the License.
****************************************************************/
-
package org.apache.cayenne.util;
import java.io.File;
import java.net.URL;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
+
+import org.apache.cayenne.unit.CayenneResources;
/**
+ * @deprecated since 3.1
*/
-public class ZipUtilTest extends BasicCase {
+@Deprecated
+public class ZipUtilTest extends TestCase {
public void testUnzip() throws Exception {
URL jarResource = Thread.currentThread().getContextClassLoader().getResource(
"jar-test.jar");
- File jarCopy = new File(getTestDir(), "jar-test.jar");
+ File jarCopy = new File(
+ CayenneResources.getResources().getTestDir(),
+ "jar-test.jar");
Util.copy(jarResource, jarCopy);
- File unjarDir = getTestDir();
+ File unjarDir = CayenneResources.getResources().getTestDir();
File unjarRootDir = new File(unjarDir, "jar-test");
File manifest = new File(unjarRootDir.getParentFile(), "META-INF"
+ File.separator
@@ -62,10 +67,12 @@ public class ZipUtilTest extends BasicCa
public void testZip() throws Exception {
URL jarResource = Thread.currentThread().getContextClassLoader().getResource(
"jar-test.jar");
- File jarCopy = new File(getTestDir(), "jar-test.jar");
+ File jarCopy = new File(
+ CayenneResources.getResources().getTestDir(),
+ "jar-test.jar");
Util.copy(jarResource, jarCopy);
- File unjarDir = getTestDir();
+ File unjarDir = CayenneResources.getResources().getTestDir();
File unjarRootDir = new File(unjarDir, "jar-test");
File newJarFile = new File(unjarDir, "new-jar.jar");
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne-domain.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne-domain.xml?rev=940356&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne-domain.xml (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/cayenne-domain.xml Mon May 3 03:32:29 2010
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="6">
+ <map name="map1"/>
+ <map name="map2"/>
+</domain>
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map1.map.xml?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map1.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map1.map.xml Mon May 3 03:32:29 2010
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map project-version="2.0">
+<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+ project-version="6">
<obj-entity name="Entity11">
</obj-entity>
<obj-entity name="Entity12" superEntityName="Entity22">
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map2.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map2.map.xml?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map2.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cay743/map2.map.xml Mon May 3 03:32:29 2010
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map project-version="2.0">
+<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+ project-version="6">
<obj-entity name="Entity21" superEntityName="Entity11">
</obj-entity>
<obj-entity name="Entity22">
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java Mon May 3 03:32:29 2010
@@ -149,11 +149,13 @@ public class OpenProjectAction extends P
}
else if (UpgradeType.INTERMEDIATE_UPGRADE_NEEDED == md.getUpgradeType()) {
JOptionPane
- .showMessageDialog(
- Application.getFrame(),
+ .showMessageDialog(Application.getFrame(),
+ // TODO: andrus 05/02/2010 - this message shows intermediate
+ // version of the project XML, not the Modeler code version that
+ // can be used for upgrade
"Can't upgrade project. Open the project in the Modeler v."
+ md.getIntermediateUpgradeVersion()
- + " to do an intermediate upgrade before doing upgrade to "
+ + " to do an intermediate upgrade before you can upgrade to v."
+ md.getSupportedVersion(),
"Can't Upgrade Project",
JOptionPane.OK_OPTION);
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java Mon May 3 03:32:29 2010
@@ -23,14 +23,18 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.regex.Pattern;
+import junit.framework.TestCase;
-import org.apache.cayenne.map.*;
-import org.apache.cayenne.unit.BasicCase;
+import org.apache.cayenne.map.CallbackDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.query.NamedQuery;
-public class ClassGenerationActionTest extends BasicCase {
+public class ClassGenerationActionTest extends TestCase {
protected ClassGenerationAction action;
protected Collection<StringWriter> writers;
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java?rev=940356&r1=940355&r2=940356&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java Mon May 3 03:32:29 2010
@@ -25,7 +25,8 @@ import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.net.URL;
-import org.apache.cayenne.unit.BasicCase;
+import junit.framework.TestCase;
+
import org.apache.cayenne.unit.CayenneResources;
import org.apache.cayenne.util.ResourceLocator;
import org.apache.cayenne.util.Util;
@@ -33,7 +34,7 @@ import org.apache.oro.text.perl.Perl5Uti
import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
-public class CayenneGeneratorTaskTest extends BasicCase {
+public class CayenneGeneratorTaskTest extends TestCase {
private static final Perl5Util regexUtil = new Perl5Util();
private static final Project project = new Project();