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 2014/11/02 08:22:12 UTC
[1/5] Apply JUnit4 instead of JUnit3 in cayenne-server
Repository: cayenne
Updated Branches:
refs/heads/master 5043aeb29 -> 4fb3e9e7e
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java
index 0bafe51..c1703be 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java
@@ -18,11 +18,6 @@
****************************************************************/
package org.apache.cayenne.remote.service;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
@@ -33,9 +28,18 @@ import org.apache.cayenne.query.Query;
import org.apache.cayenne.remote.QueryMessage;
import org.apache.cayenne.remote.RemoteSession;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
-public class BaseRemoteServiceTest extends TestCase {
+public class BaseRemoteServiceTest {
+ @Test
public void testConstructor() throws Exception {
Map<String, String> map = new HashMap<String, String>();
@@ -76,6 +80,7 @@ public class BaseRemoteServiceTest extends TestCase {
}
+ @Test
public void testProcessMessageExceptionSerializability() throws Throwable {
Map<String, String> map = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java
index f4cd1b2..e4b01fe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/service/DispatchHelperTest.java
@@ -19,17 +19,20 @@
package org.apache.cayenne.remote.service;
-import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.MockDataChannel;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.remote.BootstrapMessage;
import org.apache.cayenne.remote.ClientMessage;
+import org.junit.Test;
+
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
-public class DispatchHelperTest extends TestCase {
+public class DispatchHelperTest {
+ @Test
public void testBootstrapMessage() {
EntityResolver resolver = new EntityResolver();
MockDataChannel channel = new MockDataChannel(resolver);
@@ -38,6 +41,7 @@ public class DispatchHelperTest extends TestCase {
new BootstrapMessage()));
}
+ @Test
public void testUnknownMessage() {
try {
DispatchHelper.dispatch(new MockDataChannel(), mock(ClientMessage.class));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/resource/ClassLoaderResourceLocatorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/resource/ClassLoaderResourceLocatorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/resource/ClassLoaderResourceLocatorTest.java
index 3796695..6ef1800 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/resource/ClassLoaderResourceLocatorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/resource/ClassLoaderResourceLocatorTest.java
@@ -18,14 +18,18 @@
****************************************************************/
package org.apache.cayenne.resource;
-import java.util.Collection;
+import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
+import org.junit.Test;
-import junit.framework.TestCase;
+import java.util.Collection;
-import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
-public class ClassLoaderResourceLocatorTest extends TestCase {
+public class ClassLoaderResourceLocatorTest {
+ @Test
public void testFindResources() {
ClassLoaderResourceLocator locator = new ClassLoaderResourceLocator(new DefaultClassLoaderManager());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
index 69e11c1..bdbeaad 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/resource/FilesystemResourceLocatorTest.java
@@ -18,18 +18,21 @@
****************************************************************/
package org.apache.cayenne.resource;
+import org.apache.cayenne.test.file.FileUtil;
+import org.junit.Test;
+
import java.io.File;
import java.io.FileOutputStream;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.test.file.FileUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-public class FilesystemResourceLocatorTest extends TestCase {
+public class FilesystemResourceLocatorTest {
+ @Test
public void testArrayConstructor() {
FilesystemResourceLocator l1 = new FilesystemResourceLocator();
assertEquals(1, l1.roots.length);
@@ -45,6 +48,7 @@ public class FilesystemResourceLocatorTest extends TestCase {
assertEquals(new File(base, "f2"), l2.roots[1]);
}
+ @Test
public void testCollectionConstructor() {
FilesystemResourceLocator l1 = new FilesystemResourceLocator(Collections
.<File> emptyList());
@@ -62,6 +66,7 @@ public class FilesystemResourceLocatorTest extends TestCase {
assertEquals(new File(base, "f2"), l2.roots[1]);
}
+ @Test
public void testFindResources() throws Exception {
File base = new File(FileUtil.baseTestDirectory(), getClass().getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/resource/URLResourceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/resource/URLResourceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/resource/URLResourceTest.java
index 627dac9..388f2c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/resource/URLResourceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/resource/URLResourceTest.java
@@ -18,21 +18,24 @@
****************************************************************/
package org.apache.cayenne.resource;
-import java.net.URL;
+import org.junit.Test;
-import org.apache.cayenne.resource.Resource;
-import org.apache.cayenne.resource.URLResource;
+import java.net.URL;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
-public class URLResourceTest extends TestCase {
+public class URLResourceTest {
+ @Test
public void testURL() throws Exception {
URL url = new URL("http://cayenne.apache.org");
URLResource resource = new URLResource(url);
assertSame(url, resource.getURL());
}
+ @Test
public void testGetRelativeResource() throws Exception {
URL url = new URL("http://cayenne.apache.org");
URLResource resource = new URLResource(url);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java
index c9bf727..b5195e6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_10062004_ExpTest.java
@@ -19,14 +19,16 @@
package org.apache.cayenne.unit.jira;
-import junit.framework.TestCase;
-
import org.apache.cayenne.exp.Expression;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
/**
*/
-public class CAY_10062004_ExpTest extends TestCase {
+public class CAY_10062004_ExpTest {
+ @Test
public void testDeepCopy() throws Exception {
Expression parsed = Expression
@@ -37,6 +39,7 @@ public class CAY_10062004_ExpTest extends TestCase {
assertEquals(parsed.toString(), finalExpression.toString());
}
+ @Test
public void testAndExpOrExp() throws Exception {
Expression parsed = Expression
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
index f9b8e81..ffea9c6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
@@ -18,17 +18,20 @@
****************************************************************/
package org.apache.cayenne.unit.jira;
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
-public class CAY_743Test extends TestCase {
+public class CAY_743Test {
+ @Test
public void testLoad2MapsWithCrossMapInheritance() throws Exception {
Injector injector = DIBootstrap.createInjector(new ServerModule(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/Base64CodecTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/Base64CodecTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/Base64CodecTest.java
index aebb944..492652a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/Base64CodecTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/Base64CodecTest.java
@@ -19,22 +19,26 @@
package org.apache.cayenne.util;
+import org.junit.Test;
+
import java.util.Arrays;
import java.util.Random;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* <i>Just like Base64 codec, this test case is borrowed from Apache.</i>
*
*/
-public class Base64CodecTest extends TestCase {
+public class Base64CodecTest {
private Random _random = new Random();
/**
* Test the Base64 implementation
*/
+ @Test
public void testBase64() {
String content = "Hello World";
String encodedContent;
@@ -45,6 +49,7 @@ public class Base64CodecTest extends TestCase {
/**
* Tests conditional true branch for "marker0" test.
*/
+ @Test
public void testDecodePadMarkerIndex2() {
assertEquals("A", new String(Base64Codec.decodeBase64("QQ==".getBytes())));
}
@@ -52,22 +57,26 @@ public class Base64CodecTest extends TestCase {
/**
* Tests conditional branches for "marker1" test.
*/
+ @Test
public void testDecodePadMarkerIndex3() {
assertEquals("AA", new String(Base64Codec.decodeBase64("QUE=".getBytes())));
assertEquals("AAA", new String(Base64Codec.decodeBase64("QUFB".getBytes())));
}
+ @Test
public void testDecodePadOnly() {
assertTrue(Base64Codec.decodeBase64("====".getBytes()).length == 0);
assertEquals("", new String(Base64Codec.decodeBase64("====".getBytes())));
}
+ @Test
public void testDecodePadOnlyChunked() {
assertTrue(Base64Codec.decodeBase64("====\n".getBytes()).length == 0);
assertEquals("", new String(Base64Codec.decodeBase64("====\n".getBytes())));
}
// encode/decode random arrays from size 0 to size 11
+ @Test
public void testEncodeDecodeSmall() {
for (int i = 0; i < 12; i++) {
byte[] data = new byte[i];
@@ -83,6 +92,7 @@ public class Base64CodecTest extends TestCase {
}
// encode/decode a large random array
+ @Test
public void testEncodeDecodeRandom() {
for (int i = 1; i < 5; i++) {
byte[] data = new byte[this.getRandom().nextInt(10000) + 1];
@@ -97,6 +107,7 @@ public class Base64CodecTest extends TestCase {
/**
* Tests RFC 2045 section 2.1 CRLF definition.
*/
+ @Test
public void testRfc2045Section2Dot1CrLfDefinition() {
assertTrue(Arrays.equals(new byte[] {
13, 10
@@ -106,10 +117,12 @@ public class Base64CodecTest extends TestCase {
/**
* Tests RFC 2045 section 6.8 chuck size definition.
*/
+ @Test
public void testRfc2045Section6Dot8ChunkSizeDefinition() {
assertEquals(76, Base64Codec.CHUNK_SIZE);
}
+ @Test
public void testSingletons() {
assertEquals("AA==", new String(Base64Codec.encodeBase64(new byte[] {
(byte) 0
@@ -428,6 +441,7 @@ public class Base64CodecTest extends TestCase {
})));
}
+ @Test
public void testSingletonsChunked() {
assertEquals("AA==\r\n", new String(Base64Codec.encodeBase64Chunked(new byte[] {
(byte) 0
@@ -746,6 +760,7 @@ public class Base64CodecTest extends TestCase {
})));
}
+ @Test
public void testTriplets() {
assertEquals("AAAA", new String(Base64Codec.encodeBase64(new byte[] {
(byte) 0, (byte) 0, (byte) 0
@@ -941,6 +956,7 @@ public class Base64CodecTest extends TestCase {
})));
}
+ @Test
public void testTripletsChunked() {
assertEquals("AAAA\r\n", new String(Base64Codec.encodeBase64Chunked(new byte[] {
(byte) 0, (byte) 0, (byte) 0
@@ -1136,6 +1152,7 @@ public class Base64CodecTest extends TestCase {
})));
}
+ @Test
public void testKnownEncodings() {
assertEquals(
"VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wZWQgb3ZlciB0aGUgbGF6eSBkb2dzLg==",
@@ -1171,6 +1188,7 @@ public class Base64CodecTest extends TestCase {
new String(Base64Codec.encodeBase64("xyzzy!".getBytes())));
}
+ @Test
public void testKnownDecodings() {
assertEquals(
"The quick brown fox jumped over the lazy dogs.",
@@ -1200,6 +1218,7 @@ public class Base64CodecTest extends TestCase {
new String(Base64Codec.decodeBase64("eHl6enkh".getBytes())));
}
+ @Test
public void testIgnoringNonBase64InDecode() throws Exception {
assertEquals(
"The quick brown fox jumped over the lazy dogs.",
@@ -1209,6 +1228,7 @@ public class Base64CodecTest extends TestCase {
.getBytes())));
}
+ @Test
public void testDecodeWithWhitespace() throws Exception {
String orig = "I am a late night coder.";
@@ -1229,6 +1249,7 @@ public class Base64CodecTest extends TestCase {
assertTrue("Dest string doesn't equals the original", dest.equals(orig));
}
+ @Test
public void testDiscardWhitespace() throws Exception {
String orig = "I am a late night coder.";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
index be77718..fe12ca7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
@@ -19,14 +19,20 @@
package org.apache.cayenne.util;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
-public class GenericResponseTest extends TestCase {
+public class GenericResponseTest {
+ @Test
public void testCreation() throws Exception {
List list = new ArrayList();
list.add(new HashMap());
@@ -52,6 +58,7 @@ public class GenericResponseTest extends TestCase {
assertFalse(r.next());
}
+ @Test
public void testSerialization() throws Exception {
List list = new ArrayList();
list.add(new HashMap());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/IDUtilTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/IDUtilTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/IDUtilTest.java
index 72feb9b..a00ea41 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/IDUtilTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/IDUtilTest.java
@@ -20,14 +20,18 @@
package org.apache.cayenne.util;
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.types.ByteArrayTypeTest;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
/**
*/
-public class IDUtilTest extends TestCase {
+public class IDUtilTest {
+ @Test
public void testPseudoUniqueByteSequence1() throws Exception {
try {
IDUtil.pseudoUniqueByteSequence(10);
@@ -37,6 +41,7 @@ public class IDUtilTest extends TestCase {
}
}
+ @Test
public void testPseudoUniqueByteSequence2() throws Exception {
byte[] byte16 = IDUtil.pseudoUniqueByteSequence(16);
assertNotNull(byte16);
@@ -52,6 +57,7 @@ public class IDUtilTest extends TestCase {
}
}
+ @Test
public void testPseudoUniqueByteSequence3() throws Exception {
byte[] byte17 = IDUtil.pseudoUniqueByteSequence(17);
assertNotNull(byte17);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/IndexPropertyListTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/IndexPropertyListTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/IndexPropertyListTest.java
index 9e6d63d..803ac1f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/IndexPropertyListTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/IndexPropertyListTest.java
@@ -19,14 +19,18 @@
package org.apache.cayenne.util;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class IndexPropertyListTest extends TestCase {
+public class IndexPropertyListTest {
+ @Test
public void testSort() {
IndexedObject o1 = new IndexedObject(1);
@@ -55,6 +59,7 @@ public class IndexPropertyListTest extends TestCase {
assertEquals(o1, indexedUnsortedList.get(3));
}
+ @Test
public void testAppend() {
IndexedObject o1 = new IndexedObject(1);
IndexedObject o2 = new IndexedObject(2);
@@ -72,6 +77,7 @@ public class IndexPropertyListTest extends TestCase {
assertTrue(o4.getOrder() < o5.getOrder());
}
+ @Test
public void testInsert() {
IndexedObject o1 = new IndexedObject(1);
IndexedObject o2 = new IndexedObject(2);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/InvocationTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/InvocationTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/InvocationTest.java
index 016a520..e5f9d33 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/InvocationTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/InvocationTest.java
@@ -20,59 +20,71 @@
package org.apache.cayenne.util;
+import org.junit.Test;
+
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class InvocationTest extends TestCase {
- private String _methodName = "myListenerMethod";
+public class InvocationTest {
+
+ private String _methodName = "myListenerMethod";
+ @Test
public void testEqualsReflexive() throws NoSuchMethodException {
Invocation inv0 = new Invocation(this, _methodName);
- Assert.assertEquals(inv0, inv0);
+ assertEquals(inv0, inv0);
}
+ @Test
public void testEqualsSymmetric() throws NoSuchMethodException {
Invocation inv01 = new Invocation(this, _methodName);
Invocation inv02 = new Invocation(this, _methodName);
- Assert.assertEquals(inv01, inv02);
- Assert.assertEquals(inv02, inv01);
+ assertEquals(inv01, inv02);
+ assertEquals(inv02, inv01);
}
+ @Test
public void testEqualsTransitive() throws NoSuchMethodException {
Invocation inv01 = new Invocation(this, _methodName);
Invocation inv02 = new Invocation(this, _methodName);
Invocation inv03 = new Invocation(this, _methodName);
- Assert.assertEquals(inv01, inv02);
- Assert.assertEquals(inv02, inv03);
- Assert.assertEquals(inv01, inv03);
+ assertEquals(inv01, inv02);
+ assertEquals(inv02, inv03);
+ assertEquals(inv01, inv03);
}
+ @Test
public void testEqualsNull() throws NoSuchMethodException {
Invocation inv0 = new Invocation(this, _methodName);
- Assert.assertTrue(inv0.equals(null) == false);
+ assertTrue(inv0.equals(null) == false);
}
+ @Test
public void testEqualsDifferentMethods() throws NoSuchMethodException {
Invocation inv0 = new Invocation(this, _methodName);
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
- Assert.assertTrue(inv0.equals(inv1) == false);
+ assertTrue(inv0.equals(inv1) == false);
}
+ @Test
public void testEqualsNoVsOneArg() throws NoSuchMethodException {
Invocation inv0 = new Invocation(this, _methodName);
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
- Assert.assertTrue(inv0.equals(inv1) == false);
+ assertTrue(inv0.equals(inv1) == false);
}
+ @Test
public void testAddToSet() throws NoSuchMethodException {
HashSet set = new HashSet();
@@ -81,9 +93,10 @@ public class InvocationTest extends TestCase {
set.add(inv0);
set.add(inv0);
- Assert.assertEquals(1, set.size());
+ assertEquals(1, set.size());
}
+ @Test
public void testAddTwo() throws NoSuchMethodException {
Set set = new HashSet();
@@ -93,57 +106,63 @@ public class InvocationTest extends TestCase {
set.add(inv01);
set.add(inv02);
- Assert.assertEquals(1, set.size());
+ assertEquals(1, set.size());
}
+ @Test
public void testEmptyParamTypes() throws NoSuchMethodException {
try {
new Invocation(this, _methodName, new Class[]{});
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
// expected
}
}
+ @Test
public void testNullParamTypes0() throws NoSuchMethodException {
try {
new Invocation(this, _methodName, new Class[]{null});
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
// expected
}
}
+ @Test
public void testNullParamTypes1() throws NoSuchMethodException {
try {
new Invocation(this, _methodName, new Class[]{String.class, null});
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
// expected
}
}
+ @Test
public void testFireNoArgument() throws NoSuchMethodException {
Invocation inv0 = new Invocation(this, _methodName);
- Assert.assertTrue(inv0.fire());
+ assertTrue(inv0.fire());
}
+ @Test
public void testFireOneArgument() throws NoSuchMethodException {
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
- Assert.assertTrue(inv1.fire("foo"));
+ assertTrue(inv1.fire("foo"));
}
+ @Test
public void testFireWrongArgumentCount0() throws Exception {
Invocation inv0 = new Invocation(this, _methodName);
try {
inv0.fire("foo");
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
@@ -151,12 +170,13 @@ public class InvocationTest extends TestCase {
}
}
+ @Test
public void testFireWrongArgumentCount1() throws Exception {
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
try {
inv1.fire();
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
@@ -164,12 +184,13 @@ public class InvocationTest extends TestCase {
}
}
+ @Test
public void testFireWrongArgumentCount2() throws Exception {
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
try {
inv1.fire(new Object[]{"foo", "bar"});
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
@@ -177,12 +198,13 @@ public class InvocationTest extends TestCase {
}
}
+ @Test
public void testFireNullArgArray() throws Exception {
Invocation inv1 = new Invocation(this, _methodName, new Class[]{Object.class});
try {
inv1.fire(null);
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ex) {
@@ -190,6 +212,7 @@ public class InvocationTest extends TestCase {
}
}
+ @Test
public void testGarbageCollection() throws NoSuchMethodException {
// create an invocation with an listener that will be garbage collected
Invocation inv0 = new Invocation(new String(), "toString");
@@ -198,7 +221,7 @@ public class InvocationTest extends TestCase {
System.gc();
System.gc();
- Assert.assertFalse(inv0.fire());
+ assertFalse(inv0.fire());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/ListResponseTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/ListResponseTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/ListResponseTest.java
index 9f2c35b..1c35160 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/ListResponseTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/ListResponseTest.java
@@ -19,12 +19,19 @@
package org.apache.cayenne.util;
+import org.junit.Test;
+
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class ListResponseTest extends TestCase {
+public class ListResponseTest {
+ @Test
public void testCreation() throws Exception {
Object object = new Object();
@@ -47,6 +54,7 @@ public class ListResponseTest extends TestCase {
assertSame(currentList, r.firstList());
}
+ @Test
public void testSerialization() throws Exception {
ListResponse r = new ListResponse(new Integer(67));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/NameConverterTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/NameConverterTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/NameConverterTest.java
index bcb53d6..61b7e5f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/NameConverterTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/NameConverterTest.java
@@ -19,11 +19,14 @@
package org.apache.cayenne.util;
-import junit.framework.TestCase;
import org.apache.cayenne.map.naming.NameConverter;
+import org.junit.Test;
-public class NameConverterTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class NameConverterTest {
+
+ @Test
public void testUnderscoredToJava1() throws Exception {
String expected = "ClassNameIdentifier";
assertEquals(expected, NameConverter.underscoredToJava(
@@ -31,6 +34,7 @@ public class NameConverterTest extends TestCase {
true));
}
+ @Test
public void testUnderscoredToJava2() throws Exception {
String expected = "propNameIdentifier123";
assertEquals(expected, NameConverter.underscoredToJava(
@@ -38,62 +42,75 @@ public class NameConverterTest extends TestCase {
false));
}
+ @Test
public void testUnderscoredToJava3() throws Exception {
String expected = "lastName";
assertEquals(expected, NameConverter.underscoredToJava("lastName", false));
}
+ @Test
public void testUnderscoredToJava4() throws Exception {
String expected = "lastName";
assertEquals(expected, NameConverter.underscoredToJava("LastName", false));
}
+ @Test
public void testUnderscoredToJava5() throws Exception {
String expected = "LastName";
assertEquals(expected, NameConverter.underscoredToJava("LastName", true));
}
+ @Test
public void testUnderscoredToJavaSpecialChars() throws Exception {
assertEquals("ABCpoundXyz", NameConverter.underscoredToJava("ABC#_XYZ", true));
}
+ @Test
public void testJavaToUnderscored1() throws Exception {
String expected = "LAST_NAME";
assertEquals(expected, NameConverter.javaToUnderscored("LastName"));
}
+ @Test
public void testJavaToUnderscored2() throws Exception {
String expected = "A_CLASS";
assertEquals(expected, NameConverter.javaToUnderscored("aClass"));
}
+ @Test
public void testJavaToUnderscored3() throws Exception {
String expected = "VAR_A";
assertEquals(expected, NameConverter.javaToUnderscored("varA"));
}
+ @Test
public void testJavaToUnderscored4() throws Exception {
String expected = "LAST_NAME";
assertEquals(expected, NameConverter.javaToUnderscored("LAST_NAME"));
}
+ @Test
public void testJavaToUnderscored5() throws Exception {
String expected = "ABC_A";
assertEquals(expected, NameConverter.javaToUnderscored("abc_A"));
}
+ @Test
public void testJavaToUnderscored6() throws Exception {
String expected = "A123";
assertEquals(expected, NameConverter.javaToUnderscored("a123"));
}
+ @Test
public void testJavaToUnderscored7() throws Exception {
String expected = "AB_CDEF";
assertEquals(expected, NameConverter.javaToUnderscored("abCDEF"));
}
+ @Test
public void testJavaToUnderscored8() throws Exception {
String expected = "AB_CE";
assertEquals(expected, NameConverter.javaToUnderscored("abCe"));
}
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
index 6ff87ad..ca9080b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java
@@ -19,16 +19,21 @@
package org.apache.cayenne.util;
-import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
import org.apache.cayenne.testdo.mt.ClientMtTable2;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-public class PersistentObjectHolderTest extends TestCase {
+public class PersistentObjectHolderTest {
+ @Test
public void testSetInitialValue() {
ObjectContext context = mock(ObjectContext.class);
@@ -47,6 +52,7 @@ public class PersistentObjectHolderTest extends TestCase {
assertSame(o1, holder.value);
}
+ @Test
public void testInvalidate() {
ObjectContext context = mock(ObjectContext.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/RegexUtilTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/RegexUtilTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/RegexUtilTest.java
index f3620bd..3bb9a2e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/RegexUtilTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/RegexUtilTest.java
@@ -19,10 +19,15 @@
package org.apache.cayenne.util;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class RegexUtilTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+public class RegexUtilTest {
+
+ @Test
public void testSubstBackslashes() {
assertTrue(RegexUtil.BACKSLASH.matcher("\\").find());
assertTrue(RegexUtil.BACKSLASH.matcher("abc\\").find());
@@ -37,6 +42,7 @@ public class RegexUtilTest extends TestCase {
assertEquals("/ab/c", RegexUtil.substBackslashes("\\ab\\c"));
}
+ @Test
public void testGetPackagePath() {
assertTrue(RegexUtil.DOT.matcher(".").find());
assertTrue(RegexUtil.DOT.matcher("abc.aa.aa").find());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/UtilTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/UtilTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/UtilTest.java
index d4c3fb5..40e3d4b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/UtilTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/UtilTest.java
@@ -19,22 +19,30 @@
package org.apache.cayenne.util;
+import org.apache.cayenne.CayenneException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import java.io.File;
import java.io.FileWriter;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.CayenneException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class UtilTest extends TestCase {
+public class UtilTest {
private File fTmpFileInCurrentDir;
private String fTmpFileName;
private File fTmpFileCopy;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
fTmpFileName = "." + File.separator + System.currentTimeMillis() + ".tmp";
fTmpFileInCurrentDir = new File(fTmpFileName);
@@ -47,8 +55,8 @@ public class UtilTest extends TestCase {
fTmpFileCopy = new File(fTmpFileName + ".copy");
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
if (!fTmpFileInCurrentDir.delete())
throw new Exception("Error deleting temporary file: " + fTmpFileInCurrentDir);
@@ -57,6 +65,7 @@ public class UtilTest extends TestCase {
}
+ @Test
public void testGetJavaClass() throws Exception {
assertEquals(byte.class.getName(), Util.getJavaClass("byte").getName());
assertEquals(byte[].class.getName(), Util.getJavaClass("byte[]").getName());
@@ -68,6 +77,7 @@ public class UtilTest extends TestCase {
Util.getJavaClass(getClass().getName() + "[]").getName());
}
+ @Test
public void testToMap() {
Object[] keys = new Object[] {
"a", "b"
@@ -102,6 +112,7 @@ public class UtilTest extends TestCase {
}
}
+ @Test
public void testStripLineBreaks() {
// no breaks
@@ -121,6 +132,7 @@ public class UtilTest extends TestCase {
assertEquals("aCbCc", Util.stripLineBreaks("a\nb\nc", 'C'));
}
+ @Test
public void testCloneViaSerialization() throws Exception {
// need a special subclass of Object to make "clone" method public
MockSerializable o1 = new MockSerializable();
@@ -129,11 +141,13 @@ public class UtilTest extends TestCase {
assertTrue(o1 != o2);
}
+ @Test
public void testPackagePath1() throws Exception {
String expectedPath = "org/apache/cayenne/util";
assertEquals(expectedPath, Util.getPackagePath(UtilTest.class.getName()));
}
+ @Test
public void testPackagePath2() throws Exception {
// inner class
class TmpTest extends Object {
@@ -143,28 +157,34 @@ public class UtilTest extends TestCase {
assertEquals(expectedPath, Util.getPackagePath(TmpTest.class.getName()));
}
+ @Test
public void testPackagePath3() throws Exception {
assertEquals("", Util.getPackagePath("ClassWithNoPackage"));
}
+ @Test
public void testIsEmptyString1() throws Exception {
assertTrue(Util.isEmptyString(""));
}
+ @Test
public void testIsEmptyString2() throws Exception {
assertFalse(Util.isEmptyString(" "));
}
+ @Test
public void testIsEmptyString3() throws Exception {
assertTrue(Util.isEmptyString(null));
}
+ @Test
public void testBackslashFix() throws Exception {
String strBefore = "abcd\\12345\\";
String strAfter = "abcd/12345/";
assertEquals(strAfter, Util.substBackslashes(strBefore));
}
+ @Test
public void testNullSafeEquals() throws Exception {
// need a special subclass of Object to make "clone" method public
class CloneableObject implements Cloneable {
@@ -199,67 +219,80 @@ public class UtilTest extends TestCase {
assertTrue(Util.nullSafeEquals(null, null));
}
+ @Test
public void testExtractFileExtension1() throws Exception {
String fullName = "n.ext";
assertEquals("ext", Util.extractFileExtension(fullName));
}
+ @Test
public void testExtractFileExtension2() throws Exception {
String fullName = "n";
assertNull(Util.extractFileExtension(fullName));
}
+ @Test
public void testExtractFileExtension3() throws Exception {
String fullName = ".ext";
assertNull(Util.extractFileExtension(fullName));
}
+ @Test
public void testStripFileExtension1() throws Exception {
String fullName = "n.ext";
assertEquals("n", Util.stripFileExtension(fullName));
}
+ @Test
public void testStripFileExtension2() throws Exception {
String fullName = "n";
assertEquals("n", Util.stripFileExtension(fullName));
}
+ @Test
public void testStripFileExtension3() throws Exception {
String fullName = ".ext";
assertEquals(".ext", Util.stripFileExtension(fullName));
}
+ @Test
public void testEncodeXmlAttribute1() throws Exception {
String unencoded = "normalstring";
assertEquals(unencoded, Util.encodeXmlAttribute(unencoded));
}
+ @Test
public void testEncodeXmlAttribute2() throws Exception {
String unencoded = "<a>";
assertEquals("<a>", Util.encodeXmlAttribute(unencoded));
}
+ @Test
public void testEncodeXmlAttribute3() throws Exception {
String unencoded = "a&b";
assertEquals("a&b", Util.encodeXmlAttribute(unencoded));
}
+ @Test
public void testUnwindException1() throws Exception {
Throwable e = new Throwable();
assertSame(e, Util.unwindException(e));
}
+ @Test
public void testUnwindException2() throws Exception {
CayenneException e = new CayenneException();
assertSame(e, Util.unwindException(e));
}
+ @Test
public void testUnwindException3() throws Exception {
Throwable root = new Throwable();
CayenneException e = new CayenneException(root);
assertSame(root, Util.unwindException(e));
}
+ @Test
public void testPrettyTrim1() throws Exception {
// size is too short, must throw
try {
@@ -270,6 +303,7 @@ public class UtilTest extends TestCase {
}
}
+ @Test
public void testPrettyTrim2() throws Exception {
assertEquals("123", Util.prettyTrim("123", 6));
assertEquals("123456", Util.prettyTrim("123456", 6));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMapTest.java
index b6365ef..9b84b9f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMapTest.java
@@ -18,10 +18,14 @@
****************************************************************/
package org.apache.cayenne.util.concurrentlinkedhashmap;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class ConcurrentLinkedHashMapTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+public class ConcurrentLinkedHashMapTest {
+
+ @Test
public void testPutGet() {
ConcurrentLinkedHashMap<String, Object> m = new ConcurrentLinkedHashMap.Builder<String, Object>()
.maximumWeightedCapacity(10)
@@ -38,6 +42,7 @@ public class ConcurrentLinkedHashMapTest extends TestCase {
assertEquals(200, m.get("k2"));
}
+ @Test
public void testLRU() {
ConcurrentLinkedHashMap<String, Object> m = new ConcurrentLinkedHashMap.Builder<String, Object>()
.maximumWeightedCapacity(5)
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java b/cayenne-server/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java
index 9328f3c..91c40dd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java
@@ -19,10 +19,14 @@
package org.apache.cayenne.validation;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class BeanValidationFailureTest extends TestCase {
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+public class BeanValidationFailureTest {
+
+ @Test
public void testValidateJavaClassName() {
Object source = new Object();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationExceptionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationExceptionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationExceptionTest.java
index 45bb60e..f765bae 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationExceptionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationExceptionTest.java
@@ -18,11 +18,14 @@
****************************************************************/
package org.apache.cayenne.validation;
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
-public class ValidationExceptionTest extends TestCase {
+public class ValidationExceptionTest {
+
+ @Test
public void testValidationExceptionValidationResult() {
ValidationResult valResult = new ValidationResult();
String message = "Error message with a % literal (should be escaped)";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java b/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java
index 56d5161..dc266aa 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java
@@ -19,24 +19,29 @@
package org.apache.cayenne.validation;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ValidationResultTest extends TestCase {
+public class ValidationResultTest {
private ValidationResult res;
private Object obj1;
private Object obj2;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
obj1 = new Object();
obj2 = new Object();
}
+ @Test
public void testHasFailures() {
res = new ValidationResult();
res.addFailure(new BeanValidationFailure(obj1, "obj1 1", "mes obj1 1"));
@@ -45,6 +50,7 @@ public class ValidationResultTest extends TestCase {
assertFalse(res.hasFailures(obj2));
}
+ @Test
public void testGetFailures() {
res = new ValidationResult();
res.addFailure(new BeanValidationFailure(obj1, "obj1 1", "mes obj1 1"));
@@ -56,6 +62,7 @@ public class ValidationResultTest extends TestCase {
assertEquals(3, res.getFailures().size());
}
+ @Test
public void testEmpty() {
res = new ValidationResult();
assertFalse(res.hasFailures());
[2/5] Apply JUnit4 instead of JUnit3 in cayenne-server
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
index 687db53..a64b830 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
@@ -19,6 +19,14 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.query.AbstractQuery;
+import org.apache.cayenne.query.MockAbstractQuery;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
+import org.xml.sax.InputSource;
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.PrintWriter;
@@ -28,20 +36,20 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.MockAbstractQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.util.Util;
-import org.apache.cayenne.util.XMLEncoder;
-import org.xml.sax.InputSource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* DataMap unit tests.
*/
-public class DataMapTest extends TestCase {
+public class DataMapTest {
+ @Test
public void testSerializability() throws Exception {
DataMap m1 = new DataMap("abc");
DataMap d1 = (DataMap) Util.cloneViaSerialization(m1);
@@ -54,6 +62,7 @@ public class DataMapTest extends TestCase {
assertNotNull(d2.getObjEntity(oe1.getName()));
}
+ @Test
public void testInitWithProperties() {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(DataMap.CLIENT_SUPPORTED_PROPERTY, "true");
@@ -68,6 +77,7 @@ public class DataMapTest extends TestCase {
// TODO: test other defaults
}
+ @Test
public void testDefaultSchema() {
DataMap map = new DataMap();
String tstSchema = "tst_schema";
@@ -79,6 +89,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultSchema());
}
+ @Test
public void testDefaultClientPackage() {
DataMap map = new DataMap();
String tstPackage = "tst.pkg";
@@ -90,6 +101,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultClientPackage());
}
+ @Test
public void testDefaultClientSuperclass() {
DataMap map = new DataMap();
String tstSuperclass = "tst_superclass";
@@ -101,6 +113,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultClientSuperclass());
}
+ @Test
public void testDefaultPackage() {
DataMap map = new DataMap();
String tstPackage = "tst.pkg";
@@ -112,6 +125,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultPackage());
}
+ @Test
public void testDefaultSuperclass() {
DataMap map = new DataMap();
String tstSuperclass = "tst_superclass";
@@ -123,6 +137,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDefaultSuperclass());
}
+ @Test
public void testDefaultLockType() {
DataMap map = new DataMap();
assertEquals(ObjEntity.LOCK_TYPE_NONE, map.getDefaultLockType());
@@ -133,6 +148,7 @@ public class DataMapTest extends TestCase {
assertEquals(ObjEntity.LOCK_TYPE_NONE, map.getDefaultLockType());
}
+ @Test
public void testName() {
DataMap map = new DataMap();
String tstName = "tst_name";
@@ -140,6 +156,7 @@ public class DataMapTest extends TestCase {
assertEquals(tstName, map.getName());
}
+ @Test
public void testLocation() {
DataMap map = new DataMap();
String tstName = "tst_name";
@@ -148,6 +165,7 @@ public class DataMapTest extends TestCase {
assertEquals(tstName, map.getLocation());
}
+ @Test
public void testAddObjEntity() {
DataMap map = new DataMap();
ObjEntity e = new ObjEntity("b");
@@ -157,6 +175,7 @@ public class DataMapTest extends TestCase {
assertSame(map, e.getDataMap());
}
+ @Test
public void testAddEntityWithSameName() {
DataMap map = new DataMap();
@@ -175,6 +194,7 @@ public class DataMapTest extends TestCase {
}
}
+ @Test
public void testRemoveThenAddNullClassName() {
DataMap map = new DataMap();
// It should be possible to cleanly remove and then add the same entity
@@ -188,6 +208,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e);
}
+ @Test
public void testRemoveObjEntity() {
// make sure deleting an ObjEntity & other entity's relationships to it
// works & does not cause a ConcurrentModificationException
@@ -224,6 +245,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getObjEntity("2"));
}
+ @Test
public void testMultipleNullClassNames() {
// Now possible to have more than one objEntity with a null class name.
// This test proves it
@@ -236,6 +258,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e2);
}
+ @Test
public void testRemoveThenAddRealClassName() {
ObjEntity e = new ObjEntity("f");
e.setClassName("f");
@@ -247,6 +270,7 @@ public class DataMapTest extends TestCase {
map.addObjEntity(e);
}
+ @Test
public void testAddEmbeddable() {
Embeddable e = new Embeddable("XYZ");
@@ -257,6 +281,7 @@ public class DataMapTest extends TestCase {
assertTrue(map.getEmbeddables().contains(e));
}
+ @Test
public void testRemoveEmbeddable() {
Embeddable e = new Embeddable("XYZ");
@@ -270,6 +295,7 @@ public class DataMapTest extends TestCase {
assertFalse(map.getEmbeddables().contains(e));
}
+ @Test
public void testAddDbEntity() {
DbEntity e = new DbEntity("b");
@@ -279,6 +305,7 @@ public class DataMapTest extends TestCase {
assertSame(map, e.getDataMap());
}
+ @Test
public void testAddQuery() {
AbstractQuery q = new MockAbstractQuery("a");
DataMap map = new DataMap();
@@ -286,6 +313,7 @@ public class DataMapTest extends TestCase {
assertSame(q, map.getQuery("a"));
}
+ @Test
public void testRemoveQuery() {
AbstractQuery q = new MockAbstractQuery("a");
@@ -296,6 +324,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getQuery("a"));
}
+ @Test
public void testGetQueryMap() {
AbstractQuery q = new MockAbstractQuery("a");
DataMap map = new DataMap();
@@ -307,6 +336,7 @@ public class DataMapTest extends TestCase {
// make sure deleting a DbEntity & other entity's relationships to it
// works & does not cause a ConcurrentModificationException
+ @Test
public void testRemoveDbEntity() {
DataMap map = new DataMap();
@@ -348,6 +378,7 @@ public class DataMapTest extends TestCase {
assertNull(map.getDbEntity(e2.getName()));
}
+ @Test
public void testChildProcedures() throws Exception {
DataMap map = new DataMap();
checkProcedures(map, new String[0]);
@@ -379,6 +410,7 @@ public class DataMapTest extends TestCase {
}
}
+ @Test
public void testQuoteSqlIdentifiersEncodeAsXML() {
DataMap map = new DataMap("aaa");
map.setQuotingSQLIdentifiers(true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
index b5c0c5b..ac3f2c9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbAttributeTest.java
@@ -19,17 +19,24 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.dba.TypesMapping;
+import org.junit.Test;
+
import java.sql.Types;
import java.util.Collection;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.dba.TypesMapping;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class DbAttributeTest extends TestCase {
+public class DbAttributeTest {
+ @Test
public void testConstructor1() throws Exception {
DbAttribute a = new DbAttribute("abc");
assertEquals("abc", a.getName());
@@ -37,6 +44,7 @@ public class DbAttributeTest extends TestCase {
assertNull(a.getEntity());
}
+ @Test
public void testConstructor2() throws Exception {
int type = Types.INTEGER;
DbEntity dbe = new DbEntity("e");
@@ -46,6 +54,7 @@ public class DbAttributeTest extends TestCase {
assertSame(dbe, a.getEntity());
}
+ @Test
public void testPrimaryKeyEmpty() {
DbEntity dbe = new DbEntity("e");
assertNotNull(dbe.getPrimaryKeys());
@@ -56,6 +65,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(0, dbe.getPrimaryKeys().size());
}
+ @Test
public void testPrimaryKeyAdded() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -66,6 +76,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(1, pk.size());
}
+ @Test
public void testPrimaryKeyAttributeChanged() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -80,6 +91,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(1, pk.size());
}
+ @Test
public void testPrimaryKeyRemoved() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -94,6 +106,7 @@ public class DbAttributeTest extends TestCase {
assertNotNull(pk);
assertEquals(0, pk.size()); }
+ @Test
public void testAttributesCleared() {
DbEntity dbe = new DbEntity("e");
DbAttribute a = new DbAttribute("abc", Types.INTEGER, dbe);
@@ -109,6 +122,7 @@ public class DbAttributeTest extends TestCase {
assertEquals(0, pk.size());
}
+ @Test
public void testAutoIncrement() throws Exception {
DbAttribute attribute = new DbAttribute();
assertFalse(attribute.isGenerated());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
index 912f66d..7802646 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbJoinTest.java
@@ -19,12 +19,17 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class DbJoinTest extends TestCase {
+public class DbJoinTest {
+ @Test
public void testRelationship() throws Exception {
DbJoin join = new DbJoin(null);
assertNull(join.getRelationship());
@@ -34,6 +39,7 @@ public class DbJoinTest extends TestCase {
assertSame(relationship, join.getRelationship());
}
+ @Test
public void testToString() {
DbJoin join = new DbJoin();
join.setSourceName("X");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
index f2e451f..e92ac61 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DbKeyGeneratorTest.java
@@ -20,17 +20,23 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
/**
*/
-public class DbKeyGeneratorTest extends TestCase {
+public class DbKeyGeneratorTest {
+
+ @Test
public void testName() throws Exception {
DbKeyGenerator generator = new DbKeyGenerator();
generator.setGeneratorName("abc");
assertEquals("abc", generator.getGeneratorName());
}
+ @Test
public void testSize() throws Exception {
DbKeyGenerator generator = new DbKeyGenerator();
generator.setKeyCacheSize(new Integer(3));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
index fdb29b9..0512c0f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableAttributeTest.java
@@ -18,10 +18,14 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EmbeddableAttributeTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+public class EmbeddableAttributeTest {
+
+ @Test
public void testName() {
EmbeddableAttribute a1 = new EmbeddableAttribute();
assertNull(a1.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
index 66ac58d..8a6a41c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EmbeddableTest.java
@@ -18,10 +18,17 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EmbeddableTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+public class EmbeddableTest {
+
+ @Test
public void testClassName() {
Embeddable e1 = new Embeddable();
assertNull(e1.getClassName());
@@ -33,6 +40,7 @@ public class EmbeddableTest extends TestCase {
assertEquals("ABC", e2.getClassName());
}
+ @Test
public void testAddAttribute() {
Embeddable e1 = new Embeddable();
@@ -51,6 +59,7 @@ public class EmbeddableTest extends TestCase {
assertTrue(e1.getAttributes().contains(a2));
}
+ @Test
public void testRemoveAttribute() {
Embeddable e1 = new Embeddable();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
index f75ff47..4d6ab03 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityInheritanceTreeTest.java
@@ -18,15 +18,19 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.util.Collections;
-
import org.apache.cayenne.DataRow;
import org.apache.cayenne.exp.ExpressionFactory;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
-import junit.framework.TestCase;
-public class EntityInheritanceTreeTest extends TestCase {
+public class EntityInheritanceTreeTest {
+ @Test
public void testEntityMatchingRow_NoInheritance() {
DataMap dataMap = new DataMap("map");
@@ -54,6 +58,7 @@ public class EntityInheritanceTreeTest extends TestCase {
}
+ @Test
public void testEntityMatchingRow_SingleTableInheritance() {
DataMap dataMap = new DataMap("map");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
index 2bab75e..205f569 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
@@ -19,14 +19,6 @@
package org.apache.cayenne.map;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.CapsStrategy;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Ordering;
@@ -37,14 +29,27 @@ import org.apache.cayenne.testdo.embeddable.Embeddable1;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Gallery;
import org.apache.cayenne.util.XMLEncoder;
+import org.junit.Test;
import org.xml.sax.InputSource;
-public class MapLoaderLoadTest extends TestCase {
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class MapLoaderLoadTest {
private InputSource getMapXml(String mapName) {
return new InputSource(getClass().getClassLoader().getResourceAsStream(mapName));
}
+ @Test
public void testLoadEmbeddableMap() throws Exception {
MapLoader mapLoader = new MapLoader();
DataMap map = mapLoader.loadDataMap(getMapXml("embeddable.map.xml"));
@@ -83,6 +88,7 @@ public class MapLoaderLoadTest extends TestCase {
assertEquals(2, oea2.getAttributeOverrides().size());
}
+ @Test
public void testLoadTestMap() throws Exception {
MapLoader mapLoader = new MapLoader();
DataMap map = mapLoader.loadDataMap(getMapXml("tstmap.map.xml"));
@@ -114,6 +120,7 @@ public class MapLoaderLoadTest extends TestCase {
checkLoadedQueries(map);
}
+ @Test
public void testEncodeAsXML() throws FileNotFoundException {
// load map
MapLoader mapLoader = new MapLoader();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
index ad2d303..f6595c9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjAttributeTest.java
@@ -19,14 +19,17 @@
package org.apache.cayenne.map;
+import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
import java.sql.Types;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-import org.apache.cayenne.util.Util;
-
-public class ObjAttributeTest extends TestCase {
+public class ObjAttributeTest {
+ @Test
public void testDbAttribute() {
ObjAttribute attribute = new ObjAttribute("a1");
@@ -34,7 +37,8 @@ public class ObjAttributeTest extends TestCase {
attribute.setDbAttributePath(dbAttr.getName());
assertEquals(dbAttr.getName(), attribute.getDbAttributeName());
}
-
+
+ @Test
public void testDbAttributePath() {
ObjAttribute attribute = new ObjAttribute("a1");
attribute.setDbAttributePath("a");
@@ -46,6 +50,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals("b", attribute.getDbAttributeName());
}
+ @Test
public void testType() {
ObjAttribute attribute = new ObjAttribute("a1");
@@ -54,6 +59,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(type, attribute.getType());
}
+ @Test
public void testSerializability() throws Exception {
ObjAttribute a1 = new ObjAttribute("a1");
@@ -61,6 +67,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(a1.getName(), a2.getName());
}
+ @Test
public void testGetClientAttribute() {
ObjAttribute a1 = new ObjAttribute("a1");
a1.setType("x.y.z");
@@ -71,6 +78,7 @@ public class ObjAttributeTest extends TestCase {
assertEquals(a1.getType(), a2.getType());
}
+ @Test
public void testGetJavaClass() throws Exception {
ObjAttribute a1 = new ObjAttribute("test");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
index 28e9e54..bf8a6e8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjEntitySingleTableInheritanceTest.java
@@ -19,13 +19,19 @@
package org.apache.cayenne.map;
+import org.junit.Before;
+import org.junit.Test;
+
import java.sql.Types;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
/**
*/
-public class ObjEntitySingleTableInheritanceTest extends TestCase {
+public class ObjEntitySingleTableInheritanceTest {
protected DataMap map;
@@ -51,7 +57,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
protected ObjRelationship relationship2;
protected ObjRelationship relationship3;
- @Override
+ @Before
public void setUp() throws Exception {
map = new DataMap();
@@ -100,6 +106,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
map.addObjEntity(entity3);
}
+ @Test
public void testInheritedAttributes() throws Exception {
assertSame(attribute1, entity1.getAttribute("a1"));
assertNull(entity1.getAttribute("a2"));
@@ -114,6 +121,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertNotNull(entity1.getAttribute("a3"));
}
+ @Test
public void testInheritedRelationships() throws Exception {
assertSame(relationship1, entity1.getRelationship("r1"));
assertNull(entity1.getRelationship("r2"));
@@ -126,6 +134,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertSame(relationship3, entity1.getRelationship("r3"));
}
+ @Test
public void testAttributeForDbAttribute() throws Exception {
entity1.setSuperEntityName("e2");
entity2.setDbEntityName(dbEntity.getName());
@@ -140,6 +149,7 @@ public class ObjEntitySingleTableInheritanceTest extends TestCase {
assertNotNull(entity1.getAttributeForDbAttribute(dbAttribute2));
}
+ @Test
public void testRelationshipForDbRelationship() throws Exception {
entity1.setSuperEntityName("e2");
entity2.setDbEntityName(dbEntity.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
index 7fbd492..ae0de5a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ProcedureTest.java
@@ -19,18 +19,22 @@ package org.apache.cayenne.map;
* under the License.
****************************************************************/
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
/**
*/
-public class ProcedureTest extends TestCase {
+public class ProcedureTest {
protected Procedure procedure;
- @Override
+ @Before
public void setUp() throws Exception {
procedure = new Procedure();
}
+ @Test
public void testFullyQualifiedName() throws Exception {
String tstName = "tst_name";
String schemaName = "tst_schema_name";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
index 484c62a..829025d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
@@ -19,18 +19,20 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.Query;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
/**
*/
-public class QueryLoaderTest extends TestCase {
+public class QueryLoaderTest {
protected QueryLoader builder;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
builder = new QueryLoader() {
@Override
@@ -40,11 +42,13 @@ public class QueryLoaderTest extends TestCase {
};
}
+ @Test
public void testSetName() throws Exception {
builder.setName("aaa");
assertEquals("aaa", builder.name);
}
+ @Test
public void testSetRootInfoDbEntity() throws Exception {
DataMap map = new DataMap("map");
DbEntity entity = new DbEntity("DB1");
@@ -54,6 +58,7 @@ public class QueryLoaderTest extends TestCase {
assertSame(entity, builder.getRoot());
}
+ @Test
public void testSetRootObjEntity() throws Exception {
DataMap map = new DataMap("map");
ObjEntity entity = new ObjEntity("OBJ1");
@@ -63,6 +68,7 @@ public class QueryLoaderTest extends TestCase {
assertSame(entity, builder.getRoot());
}
+ @Test
public void testSetRootDataMap() throws Exception {
DataMap map = new DataMap("map");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
index 5f2a924..e6c75ba 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/RelationshipTest.java
@@ -19,10 +19,14 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class RelationshipTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+public class RelationshipTest {
+
+ @Test
public void testName() throws Exception {
Relationship rel = new MockRelationship();
@@ -31,6 +35,7 @@ public class RelationshipTest extends TestCase {
assertEquals(tstName, rel.getName());
}
+ @Test
public void testSourceEntity() {
Relationship rel = new MockRelationship();
Entity tstEntity = new MockEntity();
@@ -38,6 +43,7 @@ public class RelationshipTest extends TestCase {
assertSame(tstEntity, rel.getSourceEntity());
}
+ @Test
public void testTargetEntity() {
Relationship rel = new MockRelationship();
Entity tstEntity = new MockEntity();
@@ -46,6 +52,7 @@ public class RelationshipTest extends TestCase {
assertSame("abc", rel.getTargetEntityName());
}
+ @Test
public void testTargetEntityName() {
Relationship rel = new MockRelationship();
rel.setTargetEntityName("abc");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
index 57e8111..b05ab21 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
@@ -19,21 +19,27 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SQLTemplate;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class SQLTemplateBuilderTest extends TestCase {
+public class SQLTemplateBuilderTest {
+ @Test
public void testGetQueryType() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
assertTrue(builder.getQuery() instanceof SQLTemplate);
}
+ @Test
public void testGetQueryName() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.setName("xyz");
@@ -41,6 +47,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertEquals("xyz", builder.getQuery().getName());
}
+ @Test
public void testGetQueryRoot() throws Exception {
DataMap map = new DataMap();
ObjEntity entity = new ObjEntity("A");
@@ -54,6 +61,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertSame(entity, ((SQLTemplate) query).getRoot());
}
+ @Test
public void testGetQueryProperties() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
@@ -68,6 +76,7 @@ public class SQLTemplateBuilderTest extends TestCase {
// TODO: test other properties...
}
+ @Test
public void testGetQuerySql() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addSql("abc", null);
@@ -76,6 +85,7 @@ public class SQLTemplateBuilderTest extends TestCase {
assertEquals("abc", query.getDefaultTemplate());
}
+ @Test
public void testGetQueryAdapterSql() throws Exception {
SQLTemplateBuilder builder = new MockupRootQueryBuilder();
builder.addSql("abc", "adapter");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
index d1d48f6..fac8027 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
@@ -19,22 +19,27 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SelectQuery;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class SelectQueryBuilderTest extends TestCase {
+public class SelectQueryBuilderTest {
+ @Test
public void testGetQueryType() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
assertTrue(builder.getQuery() instanceof SelectQuery);
}
+ @Test
public void testGetQueryName() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.setName("xyz");
@@ -42,6 +47,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertEquals("xyz", builder.getQuery().getName());
}
+ @Test
public void testGetQueryRoot() throws Exception {
DataMap map = new DataMap();
ObjEntity entity = new ObjEntity("A");
@@ -54,6 +60,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertSame(entity, ((SelectQuery) builder.getQuery()).getRoot());
}
+ @Test
public void testGetQueryQualifier() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.setQualifier("abc = 5");
@@ -63,6 +70,7 @@ public class SelectQueryBuilderTest extends TestCase {
assertEquals(Expression.fromString("abc = 5"), query.getQualifier());
}
+ @Test
public void testGetQueryProperties() throws Exception {
SelectQueryBuilder builder = new MockupRootQueryBuilder();
builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
index 846333b..e881090 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
@@ -19,24 +19,32 @@
package org.apache.cayenne.map.event;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class MapEventTest extends TestCase {
+public class MapEventTest {
+ @Test
public void testNoNameChange() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName");
assertEquals("someName", event.getNewName());
assertFalse(event.isNameChange());
}
+ @Test
public void testNameChange() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName", "someOldName");
assertEquals("someName", event.getNewName());
assertTrue(event.isNameChange());
}
+ @Test
public void testOldName() throws Exception {
MapEvent event = new MapEventFixture(new Object(), "someName");
assertNull(event.getOldName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
index 423989c..133c176 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
@@ -18,13 +18,16 @@
****************************************************************/
package org.apache.cayenne.map.naming;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LegacyNameGeneratorTest {
-public class LegacyNameGeneratorTest extends TestCase {
+ @Test
public void testStrategy() throws Exception {
LegacyNameGenerator strategy = new LegacyNameGenerator();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
index 6053676..f804e5e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/AbstractQueryTest.java
@@ -20,13 +20,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.testdo.testmap.Artist;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
-public class AbstractQueryTest extends TestCase {
+public class AbstractQueryTest {
+ @Test
public void testSetRootEntityName() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
@@ -34,6 +38,7 @@ public class AbstractQueryTest extends TestCase {
assertSame("SomeEntity", query.getRoot());
}
+ @Test
public void testSetRootObjEntity() {
AbstractQuery query = new MockAbstractQuery();
@@ -43,6 +48,7 @@ public class AbstractQueryTest extends TestCase {
assertSame(e, query.getRoot());
}
+ @Test
public void testSetRootClass() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
@@ -50,6 +56,7 @@ public class AbstractQueryTest extends TestCase {
assertSame(Artist.class, query.getRoot());
}
+ @Test
public void testSetInvalidRoot() {
AbstractQuery query = new MockAbstractQuery();
assertNull(query.getRoot());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
index 47b67c6..0a2c295 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/NamedQueryTest.java
@@ -19,12 +19,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
-public class NamedQueryTest extends TestCase {
+public class NamedQueryTest {
+ @Test
public void testName() {
NamedQuery query = new NamedQuery("abc");
@@ -33,11 +38,13 @@ public class NamedQueryTest extends TestCase {
assertEquals("123", query.getName());
}
+ @Test
public void testQueryName() {
NamedQuery query = new NamedQuery("abc");
assertEquals("abc", query.getName());
}
+ @Test
public void testSerializability() throws Exception {
NamedQuery o = new NamedQuery("abc");
Object clone = Util.cloneViaSerialization(o);
@@ -53,6 +60,7 @@ public class NamedQueryTest extends TestCase {
* Proper 'equals' and 'hashCode' implementations are important when mapping
* results obtained in a QueryChain back to the query.
*/
+ @Test
public void testEquals() throws Exception {
NamedQuery q1 = new NamedQuery("abc", new String[] { "a", "b" }, new Object[] { "1", "2" });
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
index 9a5a2e5..072dd26 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectIdQueryTest.java
@@ -19,13 +19,19 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class ObjectIdQueryTest extends TestCase {
+public class ObjectIdQueryTest {
+ @Test
public void testConstructorObjectId() {
ObjectId oid = new ObjectId("MockDataObject", "a", "b");
@@ -34,6 +40,7 @@ public class ObjectIdQueryTest extends TestCase {
assertSame(oid, query.getObjectId());
}
+ @Test
public void testSerializability() throws Exception {
ObjectId oid = new ObjectId("test", "a", "b");
ObjectIdQuery query = new ObjectIdQuery(oid);
@@ -48,6 +55,7 @@ public class ObjectIdQueryTest extends TestCase {
* Proper 'equals' and 'hashCode' implementations are important when mapping
* results obtained in a QueryChain back to the query.
*/
+ @Test
public void testEquals() throws Exception {
ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1));
ObjectIdQuery q2 = new ObjectIdQuery(new ObjectId("abc", "a", 1));
@@ -64,6 +72,7 @@ public class ObjectIdQueryTest extends TestCase {
assertFalse(q1.hashCode() == q4.hashCode());
}
+ @Test
public void testMetadata() {
ObjectIdQuery q1 = new ObjectIdQuery(new ObjectId("abc", "a", 1), true, ObjectIdQuery.CACHE_REFRESH);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
index 6d4de03..cd2279c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/OrderingTest.java
@@ -19,17 +19,22 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.testdo.testmap.Painting;
+import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.testdo.testmap.Painting;
-import org.apache.cayenne.unit.util.TstBean;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class OrderingTest extends TestCase {
+public class OrderingTest {
+ @Test
public void testPathSpec1() throws Exception {
String pathSpec = "a.b.c";
Ordering ord = new Ordering();
@@ -39,12 +44,14 @@ public class OrderingTest extends TestCase {
assertEquals(pathSpec, ord.getSortSpec().getOperand(0));
}
+ @Test
public void testPathSpec3() throws Exception {
String pathSpec = "a.b.c";
Ordering ord = new Ordering(pathSpec, SortOrder.DESCENDING);
assertEquals(pathSpec, ord.getSortSpec().getOperand(0));
}
+ @Test
public void testAscending1() throws Exception {
Ordering ord = new Ordering();
ord.setAscending();
@@ -52,6 +59,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testAscending2() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.ASCENDING);
@@ -59,6 +67,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testAscending3() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.ASCENDING_INSENSITIVE);
@@ -66,6 +75,7 @@ public class OrderingTest extends TestCase {
assertFalse(ord.isDescending());
}
+ @Test
public void testDescending1() throws Exception {
Ordering ord = new Ordering();
ord.setDescending();
@@ -73,6 +83,7 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testDescending2() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.DESCENDING);
@@ -80,6 +91,7 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testDescending3() throws Exception {
Ordering ord = new Ordering();
ord.setSortOrder(SortOrder.DESCENDING_INSENSITIVE);
@@ -87,26 +99,31 @@ public class OrderingTest extends TestCase {
assertTrue(ord.isDescending());
}
+ @Test
public void testCaseInsensitive3() throws Exception {
Ordering ord = new Ordering("M", SortOrder.ASCENDING_INSENSITIVE);
assertTrue(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive4() throws Exception {
Ordering ord = new Ordering("N", SortOrder.ASCENDING);
assertFalse(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive5() throws Exception {
Ordering ord = new Ordering("M", SortOrder.DESCENDING_INSENSITIVE);
assertTrue(ord.isCaseInsensitive());
}
+ @Test
public void testCaseInsensitive6() throws Exception {
Ordering ord = new Ordering("N", SortOrder.DESCENDING);
assertFalse(ord.isCaseInsensitive());
}
+ @Test
public void testCompare3() throws Exception {
Painting p1 = new Painting();
p1.setEstimatedPrice(new BigDecimal(1000.00));
@@ -123,6 +140,7 @@ public class OrderingTest extends TestCase {
assertTrue(ordering.compare(p2, p3) == 0);
}
+ @Test
public void testCompare4() throws Exception {
// compare on non-persistent property
TstBean t1 = new TstBean(1000);
@@ -135,6 +153,7 @@ public class OrderingTest extends TestCase {
assertTrue(ordering.compare(t2, t3) == 0);
}
+ @Test
public void testOrderList2() throws Exception {
// compare on non-persistent property
List<TstBean> list = new ArrayList<TstBean>(3);
@@ -149,6 +168,7 @@ public class OrderingTest extends TestCase {
assertEquals(5, ((TstBean) list.get(2)).getInteger().intValue());
}
+ @Test
public void testOrderListWithMultipleOrderings2() throws Exception {
// compare on non-persistent property
List<TstBean> list = new ArrayList<TstBean>(6);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
index 014a7fb..76846c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/PrefetchTreeNodeTest.java
@@ -19,12 +19,19 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class PrefetchTreeNodeTest extends TestCase {
+public class PrefetchTreeNodeTest {
+ @Test
public void testAddPath() {
PrefetchTreeNode tree = new PrefetchTreeNode();
tree.addPath("abc");
@@ -54,6 +61,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", n4.getName());
}
+ @Test
public void testGetPath() {
PrefetchTreeNode tree = new PrefetchTreeNode();
tree.addPath("abc");
@@ -75,8 +83,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", n4.getPath());
}
-
-
+ @Test
public void testTreeSerialization() throws Exception {
PrefetchTreeNode n1 = new PrefetchTreeNode();
PrefetchTreeNode n2 = n1.addPath("abc");
@@ -91,6 +98,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("abc", nc2.getName());
}
+ @Test
public void testSubtreeSerialization() throws Exception {
PrefetchTreeNode n1 = new PrefetchTreeNode();
PrefetchTreeNode n2 = n1.addPath("abc");
@@ -108,6 +116,7 @@ public class PrefetchTreeNodeTest extends TestCase {
assertEquals("xyz", nc3.getName());
}
+ @Test
public void testCloneJointSubtree() throws Exception {
PrefetchTreeNode root = new PrefetchTreeNode(null, "root");
root.setPhantom(false);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
index 5dbd6cd..a61e89c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ProcedureQueryTest.java
@@ -19,18 +19,25 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.junit.Test;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ProcedureQueryTest extends TestCase {
+public class ProcedureQueryTest {
+ @Test
public void testCreateQuery() {
ProcedureQuery template = new ProcedureQuery();
Query clone = template.createQuery(Collections.EMPTY_MAP);
@@ -38,6 +45,7 @@ public class ProcedureQueryTest extends TestCase {
assertNotSame(template, clone);
}
+ @Test
public void testColumnNameCapitalization() {
ProcedureQuery q1 = new ProcedureQuery();
assertSame(CapsStrategy.DEFAULT, q1.getColumnNamesCapitalization());
@@ -45,6 +53,7 @@ public class ProcedureQueryTest extends TestCase {
assertEquals(CapsStrategy.UPPER, q1.getColumnNamesCapitalization());
}
+ @Test
public void testCreateQueryWithParameters() {
Map params = new HashMap();
params.put("a", "1");
@@ -56,6 +65,7 @@ public class ProcedureQueryTest extends TestCase {
assertEquals(params, clone.getParameters());
}
+ @Test
public void testResultEntityName() {
ProcedureQuery query = new ProcedureQuery();
assertNull(query.getResultEntityName());
@@ -64,6 +74,7 @@ public class ProcedureQueryTest extends TestCase {
assertSame("abc.AAAA", query.getResultEntityName());
}
+ @Test
public void testResultDescriptors() {
ProcedureQuery query = new ProcedureQuery();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
index 506bbdb..93a4452 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/RefreshQueryTest.java
@@ -18,16 +18,24 @@
****************************************************************/
package org.apache.cayenne.query;
+import org.apache.cayenne.MockPersistentObject;
+import org.apache.cayenne.Persistent;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Collection;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.MockPersistentObject;
-import org.apache.cayenne.Persistent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class RefreshQueryTest extends TestCase {
+public class RefreshQueryTest {
+ @Test
public void testRefreshAllConstructor() {
RefreshQuery q = new RefreshQuery();
@@ -37,6 +45,7 @@ public class RefreshQueryTest extends TestCase {
assertTrue(q.isRefreshAll());
}
+ @Test
public void testCollectionConstructor() {
Collection c = new ArrayList();
c.add(new Object());
@@ -49,6 +58,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testObjectConstructor() {
Persistent p = new MockPersistentObject();
@@ -61,6 +71,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testQueryConstructor() {
Query query = new MockQuery();
@@ -72,6 +83,7 @@ public class RefreshQueryTest extends TestCase {
assertFalse(q.isRefreshAll());
}
+ @Test
public void testGroupKeysConstructor() {
String[] groupKeys = new String[] { "a", "b" };
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
index 9b26761..8171dc6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/RelationshipQueryTest.java
@@ -19,13 +19,17 @@
package org.apache.cayenne.query;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
-public class RelationshipQueryTest extends TestCase {
+public class RelationshipQueryTest {
+ @Test
public void testConstructorObjectId() {
ObjectId oid = new ObjectId("MockDataObject", "a", "b");
@@ -34,6 +38,7 @@ public class RelationshipQueryTest extends TestCase {
assertSame("relX", query.getRelationshipName());
}
+ @Test
public void testSerializability() throws Exception {
ObjectId oid = new ObjectId("test", "a", "b");
RelationshipQuery query = new RelationshipQuery(oid, "relX");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
index 9b3185c..8bc4a17 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryBasicsTest.java
@@ -19,21 +19,28 @@
package org.apache.cayenne.query;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.exp.ExpressionParameter;
+import org.apache.cayenne.testdo.testmap.Artist;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
-import org.apache.cayenne.exp.ExpressionParameter;
-import org.apache.cayenne.testdo.testmap.Artist;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class SelectQueryBasicsTest extends TestCase {
+public class SelectQueryBasicsTest {
+ @Test
public void testAddPrefetch() {
SelectQuery q = new SelectQuery();
@@ -44,6 +51,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertNotNull(q.getPrefetchTree().getNode("a.b.c"));
}
+ @Test
public void testAddPrefetchDuplicates() {
SelectQuery q = new SelectQuery();
@@ -53,6 +61,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertEquals(1, q.getPrefetchTree().nonPhantomNodes().size());
}
+ @Test
public void testClearPrefetches() {
SelectQuery q = new SelectQuery();
@@ -64,12 +73,14 @@ public class SelectQueryBasicsTest extends TestCase {
assertNull(q.getPrefetchTree());
}
+ @Test
public void testPageSize() throws Exception {
SelectQuery q = new SelectQuery();
q.setPageSize(10);
assertEquals(10, q.getPageSize());
}
+ @Test
public void testAddOrdering1() throws Exception {
SelectQuery q = new SelectQuery();
@@ -79,6 +90,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertSame(ord, q.getOrderings().get(0));
}
+ @Test
public void testAddOrdering2() throws Exception {
SelectQuery<Object> q = new SelectQuery<Object>();
@@ -91,6 +103,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertEquals(false, ord.isAscending());
}
+ @Test
public void testDistinct() throws Exception {
SelectQuery q = new SelectQuery();
@@ -99,6 +112,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertTrue(q.isDistinct());
}
+ @Test
public void testQueryWithParams1() {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
@@ -110,6 +124,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertNull(q1.getQualifier());
}
+ @Test
public void testQueryWithParams2() throws Exception {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
@@ -130,6 +145,7 @@ public class SelectQueryBasicsTest extends TestCase {
assertTrue(q1.getQualifier() != q.getQualifier());
}
+ @Test
public void testQueryWithParamsSkipName() {
SelectQuery q = new SelectQuery();
q.setRoot(Artist.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
index fde0b02..9fadd70 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.reflect;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.cayenne.reflect.BaseProperty;
-
-import junit.framework.TestCase;
-
-public class BasePropertyTest extends TestCase {
+public class BasePropertyTest {
+ @Test
public void testGetName() {
ClassDescriptor owner = mock(ClassDescriptor.class);
Accessor accessor = mock(Accessor.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
index 1f23a67..9f62fb5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/BeanAccessorTest.java
@@ -19,12 +19,15 @@
package org.apache.cayenne.reflect;
-import org.apache.cayenne.reflect.BeanAccessor;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
-public class BeanAccessorTest extends TestCase {
+public class BeanAccessorTest {
+ @Test
public void testByteArrayProperty() {
BeanAccessor accessor = new BeanAccessor(
@@ -43,6 +46,7 @@ public class BeanAccessorTest extends TestCase {
assertSame(bytes, accessor.getValue(o1));
}
+ @Test
public void testStringProperty() {
BeanAccessor accessor = new BeanAccessor(
@@ -58,6 +62,7 @@ public class BeanAccessorTest extends TestCase {
assertSame("ABC", accessor.getValue(o1));
}
+ @Test
public void testIntProperty() {
BeanAccessor accessor = new BeanAccessor(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
index 3d2e09b..b267981 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnEntityTest.java
@@ -19,12 +19,15 @@
package org.apache.cayenne.reflect;
import org.apache.cayenne.map.MockCallingBackEntity;
-import org.apache.cayenne.reflect.CallbackOnEntity;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class CallbackOnEntityTest extends TestCase {
+public class CallbackOnEntityTest {
+ @Test
public void testPublicCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -38,6 +41,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testProtectedCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -51,6 +55,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testPrivateCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -64,6 +69,7 @@ public class CallbackOnEntityTest extends TestCase {
assertFalse(e.defaultCallbackInvoked);
}
+ @Test
public void testDefaultCallbackMethod() {
CallbackOnEntity callback = new CallbackOnEntity(
MockCallingBackEntity.class,
@@ -77,6 +83,7 @@ public class CallbackOnEntityTest extends TestCase {
assertTrue(e.defaultCallbackInvoked);
}
+ @Test
public void testStaticCallbackMethod() {
try {
new CallbackOnEntity(MockCallingBackEntity.class, "staticCallback");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
index 66a8483..12a46c1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/CallbackOnListenerTest.java
@@ -20,12 +20,14 @@ package org.apache.cayenne.reflect;
import org.apache.cayenne.access.MockCallingBackListener;
import org.apache.cayenne.map.MockCallingBackEntity;
-import org.apache.cayenne.reflect.CallbackOnListener;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
-public class CallbackOnListenerTest extends TestCase {
+public class CallbackOnListenerTest {
+ @Test
public void testPublicCallbackMethod() {
MockCallingBackListener listener = new MockCallingBackListener();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
index a83e655..ae99531 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/EnumConverterTest.java
@@ -18,14 +18,16 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.types.MockEnum2;
import org.apache.cayenne.access.types.MockEnum3;
import org.apache.cayenne.access.types.MockEnum4;
+import org.junit.Test;
+
+import static org.junit.Assert.assertSame;
-public class EnumConverterTest extends TestCase {
-
+public class EnumConverterTest {
+
+ @Test
public void testConvert() {
EnumConverter converter = new EnumConverter();
@@ -33,13 +35,15 @@ public class EnumConverterTest extends TestCase {
assertSame(MockEnum2.z, converter.convert("z", MockEnum2.class));
}
+ @Test
public void testConvertExtendedEnumeration() {
EnumConverter converter = new EnumConverter();
assertSame(MockEnum3.B, converter.convert(2, MockEnum3.class));
assertSame(MockEnum3.C, converter.convert(3, MockEnum3.class));
}
-
+
+ @Test
public void testConvertExtendedEnumerationWithNull() {
EnumConverter converter = new EnumConverter();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
index 9d276ba..eb6cb4a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/FieldAccessorTest.java
@@ -19,18 +19,21 @@
package org.apache.cayenne.reflect;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.reflect.FieldAccessor;
import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
-public class FieldAccessorTest extends TestCase {
+public class FieldAccessorTest {
+ @Test
public void testConstructor() {
FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
assertEquals("string", accessor.getName());
}
+ @Test
public void testGet() {
FieldAccessor accessor = new FieldAccessor(TstBean.class, "string", String.class);
@@ -39,6 +42,7 @@ public class FieldAccessorTest extends TestCase {
assertEquals("abc", accessor.getValue(object));
}
+ @Test
public void testSetValue() {
TstFields object = new TstFields();
@@ -67,6 +71,7 @@ public class FieldAccessorTest extends TestCase {
assertSame(strings, object.stringArrayField);
}
+ @Test
public void testSetValuePrimitive() {
TstFields object = new TstFields();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
index fc53cbc..9c1c1da 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
@@ -18,17 +18,20 @@
****************************************************************/
package org.apache.cayenne.reflect;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistentObject;
import org.apache.cayenne.map.EntityResolver;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class LifecycleCallbackEventHandlerTest extends TestCase {
+public class LifecycleCallbackEventHandlerTest {
+ @Test
public void testDefaultListeners() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -45,6 +48,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertTrue(l1.entities.contains(c1));
}
+ @Test
public void testDefaultListenersCallbackOrder() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -67,6 +71,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertTrue(t2.compareTo(t1) < 0);
}
+ @Test
public void testCallbackOnSuperclass() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -81,6 +86,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertEquals(1, subclass.callbacks.size());
}
+ @Test
public void testCallbackOnSuperclassWithSublcassOverrides() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
@@ -96,6 +102,7 @@ public class LifecycleCallbackEventHandlerTest extends TestCase {
assertEquals("c4Callback", subclass.callbacks.get(0));
}
+ @Test
public void testCallbackOrderInInheritanceHierarchy() {
LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
index b60d0c3..5123f80 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PersistentDescriptorTest.java
@@ -19,14 +19,18 @@
package org.apache.cayenne.reflect;
-import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.unit.util.TstBean;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
-public class PersistentDescriptorTest extends TestCase {
+public class PersistentDescriptorTest {
+ @Test
public void testConstructor() {
PersistentDescriptor d1 = new PersistentDescriptor();
assertNull(d1.getSuperclassDescriptor());
@@ -37,6 +41,7 @@ public class PersistentDescriptorTest extends TestCase {
assertSame(d1, d2.getSuperclassDescriptor());
}
+ @Test
public void testCopyObjectProperties() {
PersistentDescriptor d1 = new PersistentDescriptor();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
index 81c51a8..30761bb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
@@ -19,6 +19,11 @@
package org.apache.cayenne.reflect;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.types.MockEnum;
+import org.apache.cayenne.access.types.MockEnumHolder;
+import org.junit.Test;
+
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.ParseException;
@@ -29,14 +34,16 @@ import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.types.MockEnum;
-import org.apache.cayenne.access.types.MockEnumHolder;
-
-public class PropertyUtilsTest extends TestCase {
+public class PropertyUtilsTest {
+ @Test
public void testCreateAccessor() {
Accessor accessor = PropertyUtils.createAccessor(
@@ -54,6 +61,7 @@ public class PropertyUtilsTest extends TestCase {
assertSame(o1.getByteArrayField(), o2.getByteArrayField());
}
+ @Test
public void testCreateAccessorNested() {
Accessor accessor = PropertyUtils.createAccessor(
@@ -78,6 +86,7 @@ public class PropertyUtilsTest extends TestCase {
assertSame(b1, o2.getRelated().getByteArrayField());
}
+ @Test
public void testGetProperty() {
TstJavaBean o1 = createBean();
@@ -95,6 +104,7 @@ public class PropertyUtilsTest extends TestCase {
"booleanField"));
}
+ @Test
public void testSetProperty() {
TstJavaBean o1 = createBean();
TstJavaBean o2 = new TstJavaBean();
@@ -108,6 +118,7 @@ public class PropertyUtilsTest extends TestCase {
PropertyUtils.setProperty(o2, "booleanField", Boolean.valueOf(o1.isBooleanField()));
}
+ @Test
public void testGetPropertyMap() {
Map o1 = createMap();
@@ -123,6 +134,7 @@ public class PropertyUtilsTest extends TestCase {
.getProperty(o1, "booleanField"));
}
+ @Test
public void testSetPropertyMap() {
Map o1 = createMap();
Map o2 = new HashMap();
@@ -138,6 +150,7 @@ public class PropertyUtilsTest extends TestCase {
assertEquals(o1, o2);
}
+ @Test
public void testSetConverted() {
TstJavaBean o1 = new TstJavaBean();
@@ -168,11 +181,11 @@ public class PropertyUtilsTest extends TestCase {
// string to float primitive
PropertyUtils.setProperty(o1, "floatField", "4.5");
- assertEquals(4.5f, o1.getFloatField());
+ assertEquals(4.5f, o1.getFloatField(), 0);
// string to double primitive
PropertyUtils.setProperty(o1, "doubleField", "5.5");
- assertEquals(5.5, o1.getDoubleField());
+ assertEquals(5.5, o1.getDoubleField(), 0);
// string to boolean
PropertyUtils.setProperty(o1, "booleanField", "true");
@@ -205,6 +218,7 @@ public class PropertyUtilsTest extends TestCase {
assertEquals(new StringBuilder("abc").toString(), o1.getStringBuilderField().toString());
}
+ @Test
public void testSetConvertedWithCustomConverter() {
// save old converter for restore
Converter<Date> oldConverter = ConverterFactory.factory.getConverter(Date.class);
@@ -243,7 +257,8 @@ public class PropertyUtilsTest extends TestCase {
ConverterFactory.addConverter(Date.class, oldConverter);
}
}
-
+
+ @Test
public void testSetNull() {
TstJavaBean o1 = new TstJavaBean();
@@ -273,13 +288,14 @@ public class PropertyUtilsTest extends TestCase {
o1.setFloatField(4.5f);
PropertyUtils.setProperty(o1, "floatField", null);
- assertEquals(0.0f, o1.getFloatField());
+ assertEquals(0.0f, o1.getFloatField(), 0);
o1.setDoubleField(5.5f);
PropertyUtils.setProperty(o1, "doubleField", null);
- assertEquals(0.0, o1.getDoubleField());
+ assertEquals(0.0, o1.getDoubleField(), 0);
}
+ @Test
public void testSetConvertedEnum() {
MockEnumHolder o1 = new MockEnumHolder();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
index 783c96c..71aa2a8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
@@ -18,14 +18,17 @@
****************************************************************/
package org.apache.cayenne.reflect.generic;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class DataObjectAttributePropertyTest {
-public class DataObjectAttributePropertyTest extends TestCase {
-
+ @Test
public void testSerialization() throws Exception {
ObjEntity e1 = new ObjEntity("objEntityName");
ObjAttribute a1 = new ObjAttribute("aName", "aType", e1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
index 17d4337..869e110 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/RemoteSessionTest.java
@@ -19,24 +19,29 @@
package org.apache.cayenne.remote;
-import org.apache.cayenne.remote.RemoteSession;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class RemoteSessionTest extends TestCase {
+public class RemoteSessionTest {
+ @Test
public void testConstructor1() {
RemoteSession descriptor = new RemoteSession("abc");
assertEquals("abc", descriptor.getSessionId());
assertFalse(descriptor.isServerEventsEnabled());
}
+ @Test
public void testConstructor2() {
RemoteSession descriptor = new RemoteSession("abc", "factory", null);
assertEquals("abc", descriptor.getSessionId());
assertTrue(descriptor.isServerEventsEnabled());
}
+ @Test
public void testHashCode() {
RemoteSession d1 = new RemoteSession("1");
RemoteSession d2 = new RemoteSession("1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
index cc7d198..4cf0d0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/HessianConfigTest.java
@@ -19,20 +19,25 @@
package org.apache.cayenne.remote.hessian;
-import org.apache.cayenne.map.EntityResolver;
-
-import junit.framework.TestCase;
-
import com.caucho.hessian.io.AbstractSerializerFactory;
import com.caucho.hessian.io.SerializerFactory;
+import org.apache.cayenne.map.EntityResolver;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class HessianConfigTest extends TestCase {
+public class HessianConfigTest {
+ @Test
public void testLoadFactoryNoExtensions() {
SerializerFactory factory = HessianConfig.createFactory(null, null);
assertNotNull(factory);
}
+ @Test
public void testLoadFactoryNoInjection() throws Exception {
AbstractSerializerFactory factory = HessianConfig.loadFactory(
MockAbstractSerializerFactory.class.getName(),
@@ -42,6 +47,7 @@ public class HessianConfigTest extends TestCase {
assertNull(((MockAbstractSerializerFactory) factory).getEntityResolver());
}
+ @Test
public void testLoadFactoryInjection() throws Exception {
EntityResolver resolver = new EntityResolver();
AbstractSerializerFactory factory = HessianConfig.loadFactory(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
index d85efb8..f5d5b32 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
@@ -19,25 +19,25 @@
package org.apache.cayenne.remote.hessian.service;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import junit.framework.TestCase;
-
+import com.caucho.services.server.ServiceContext;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpSession;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.ObjectContextFactory;
import org.apache.cayenne.event.MockEventBridgeFactory;
+import org.junit.Test;
-import com.caucho.services.server.ServiceContext;
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpSession;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertSame;
-public class HessianServiceTest extends TestCase {
+public class HessianServiceTest {
+ @Test
public void testGetSession() throws Exception {
Map<String, String> map = new HashMap<String, String>();
[4/5] git commit: Apply JUnit4 instead of JUnit3 in cayenne-server
Posted by aa...@apache.org.
Apply JUnit4 instead of JUnit3 in cayenne-server
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f6640dd9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f6640dd9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f6640dd9
Branch: refs/heads/master
Commit: f6640dd9033330cb863fb425160492f4873c8319
Parents: e42c376
Author: Savva Kolbechev <s....@gmail.com>
Authored: Wed Oct 29 14:04:32 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Wed Oct 29 14:04:32 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/BaseContextTest.java | 22 +++--
.../apache/cayenne/CayenneExceptionTest.java | 15 +++-
.../cayenne/CayenneRuntimeExceptionTest.java | 21 ++++-
.../org/apache/cayenne/ConfigExceptionTest.java | 13 ++-
.../cayenne/ContextStateRecorderTest.java | 13 ++-
.../java/org/apache/cayenne/DataRowTest.java | 7 +-
.../cayenne/ObjectContextChangeLogTest.java | 13 ++-
.../apache/cayenne/ObjectIdRegressionTest.java | 7 +-
.../java/org/apache/cayenne/ObjectIdTest.java | 33 ++++++--
.../org/apache/cayenne/access/DbArcIdTest.java | 11 ++-
.../access/ManyToManyCandidateEntityTest.java | 15 +++-
.../cayenne/access/event/SnapshotEventTest.java | 7 +-
.../access/jdbc/ColumnDescriptorTest.java | 18 +++--
.../access/jdbc/JDBCResultIteratorTest.java | 28 ++++---
.../cayenne/access/jdbc/SQLStatementTest.java | 11 ++-
.../jdbc/SQLTemplateProcessorChainTest.java | 17 +++-
.../jdbc/SQLTemplateProcessorSelectTest.java | 12 ++-
.../access/jdbc/SQLTemplateProcessorTest.java | 26 ++++--
.../jdbc/SQLTemplateResourceManagerTest.java | 10 ++-
.../cayenne/access/types/BooleanTypeTest.java | 11 ++-
.../cayenne/access/types/ByteArrayTypeTest.java | 10 ++-
.../cayenne/access/types/CharTypeTest.java | 9 ++-
.../access/types/EnumTypeFactoryTest.java | 7 +-
.../cayenne/access/types/EnumTypeTest.java | 26 ++++--
.../access/types/ExtendedTypeMapEnumsTest.java | 15 +++-
.../access/types/ExtendedTypeMapTest.java | 16 +++-
.../cayenne/cache/EhCacheQueryCacheTest.java | 30 ++++---
.../cache/EhCacheQueryCache_WithConfigTest.java | 29 ++++---
.../apache/cayenne/cache/MapQueryCacheTest.java | 13 +--
.../apache/cayenne/cache/OSQueryCacheTest.java | 28 ++++---
.../configuration/CayenneRuntimeTest.java | 10 ++-
.../DefaultDataChannelDescriptorMergerTest.java | 17 +++-
.../DefaultRuntimePropertiesTest.java | 11 ++-
.../XMLDataChannelDescriptorLoaderTest.java | 27 ++++---
.../osgi/OsgiClassLoaderManagerTest.java | 8 +-
.../server/DBCPDataSourceFactoryTest.java | 23 +++---
.../server/DataContextFactoryTest.java | 17 ++--
.../server/DataDomainProviderTest.java | 21 +++--
.../DefaultDataSourceFactoryLoaderTest.java | 22 +++--
.../server/DefaultDbAdapterFactoryTest.java | 33 ++++----
.../configuration/web/CayenneFilterTest.java | 32 +++++---
.../web/ServletContextHandlerTest.java | 18 +++--
.../configuration/web/WebConfigurationTest.java | 28 +++++--
.../configuration/web/WebModuleTest.java | 7 +-
.../cayenne/configuration/web/WebUtilTest.java | 13 +--
.../apache/cayenne/conn/DataSourceInfoTest.java | 14 +++-
.../cayenne/conn/DriverDataSourceTest.java | 8 +-
.../cayenne/conn/PooledConnectionImplTest.java | 6 +-
.../cayenne/dba/DefaultQuotingStrategyTest.java | 9 ++-
.../dba/oracle/OracleUtilDateTypeTest.java | 8 +-
.../cayenne/ejbql/EJBQLExpressionTest.java | 11 ++-
.../cayenne/ejbql/EJBQLParserFactoryTest.java | 8 +-
.../cayenne/ejbql/parser/EJBQLPathTest.java | 7 +-
.../cayenne/event/DefaultEventManagerTest.java | 85 +++++++++++++-------
.../apache/cayenne/event/EventBridgeTest.java | 18 +++--
.../apache/cayenne/event/EventSubjectTest.java | 35 +++++---
.../cayenne/event/JGroupsBridgeFactoryTest.java | 7 +-
.../cayenne/event/XMPPBridgeFactoryTest.java | 8 +-
.../apache/cayenne/event/XMPPBridgeTest.java | 10 ++-
.../cayenne/exp/BooleanExpressionTest.java | 10 ++-
.../cayenne/exp/ExpressionEqualsTest.java | 9 ++-
.../cayenne/exp/ExpressionParameterTest.java | 7 +-
.../cayenne/exp/ExpressionTraversalTest.java | 12 ++-
.../org/apache/cayenne/exp/PropertyTest.java | 49 +++++++----
.../cayenne/exp/parser/ASTDbPathTest.java | 8 +-
.../exp/parser/ASTLikeIgnoreCaseTest.java | 9 ++-
.../apache/cayenne/exp/parser/ASTListTest.java | 15 ++--
.../cayenne/exp/parser/ASTObjPathTest.java | 8 +-
.../cayenne/exp/parser/EvaluatorTest.java | 24 ++++--
.../org/apache/cayenne/graph/GraphMapTest.java | 12 ++-
.../org/apache/cayenne/graph/NodeDiffTest.java | 9 ++-
.../cayenne/log/CommonsJdbcEventLoggerTest.java | 14 ++--
.../org/apache/cayenne/map/AttributeTest.java | 9 ++-
.../cayenne/map/CallbackDescriptorTest.java | 8 +-
.../org/apache/cayenne/map/CallbackMapTest.java | 7 +-
.../map/ClientObjectRelationshipTest.java | 9 ++-
.../cayenne/map/DataMapNamespaceTest.java | 20 +++--
.../org/apache/cayenne/map/DataMapTest.java | 50 +++++++++---
.../org/apache/cayenne/map/DbAttributeTest.java | 22 ++++-
.../java/org/apache/cayenne/map/DbJoinTest.java | 10 ++-
.../apache/cayenne/map/DbKeyGeneratorTest.java | 10 ++-
.../cayenne/map/EmbeddableAttributeTest.java | 8 +-
.../org/apache/cayenne/map/EmbeddableTest.java | 13 ++-
.../cayenne/map/EntityInheritanceTreeTest.java | 13 ++-
.../apache/cayenne/map/MapLoaderLoadTest.java | 25 +++---
.../apache/cayenne/map/ObjAttributeTest.java | 18 +++--
.../ObjEntitySingleTableInheritanceTest.java | 16 +++-
.../org/apache/cayenne/map/ProcedureTest.java | 10 ++-
.../org/apache/cayenne/map/QueryLoaderTest.java | 16 ++--
.../apache/cayenne/map/RelationshipTest.java | 11 ++-
.../cayenne/map/SQLTemplateBuilderTest.java | 16 +++-
.../cayenne/map/SelectQueryBuilderTest.java | 14 +++-
.../apache/cayenne/map/event/MapEventTest.java | 12 ++-
.../map/naming/LegacyNameGeneratorTest.java | 9 ++-
.../apache/cayenne/query/AbstractQueryTest.java | 13 ++-
.../apache/cayenne/query/NamedQueryTest.java | 14 +++-
.../apache/cayenne/query/ObjectIdQueryTest.java | 15 +++-
.../org/apache/cayenne/query/OrderingTest.java | 30 +++++--
.../cayenne/query/PrefetchTreeNodeTest.java | 19 +++--
.../cayenne/query/ProcedureQueryTest.java | 19 ++++-
.../apache/cayenne/query/RefreshQueryTest.java | 22 +++--
.../cayenne/query/RelationshipQueryTest.java | 11 ++-
.../cayenne/query/SelectQueryBasicsTest.java | 30 +++++--
.../cayenne/reflect/BasePropertyTest.java | 10 +--
.../cayenne/reflect/BeanAccessorTest.java | 11 ++-
.../cayenne/reflect/CallbackOnEntityTest.java | 13 ++-
.../cayenne/reflect/CallbackOnListenerTest.java | 8 +-
.../cayenne/reflect/EnumConverterTest.java | 14 ++--
.../cayenne/reflect/FieldAccessorTest.java | 13 ++-
.../LifecycleCallbackEventHandlerTest.java | 19 +++--
.../reflect/PersistentDescriptorTest.java | 13 ++-
.../cayenne/reflect/PropertyUtilsTest.java | 38 ++++++---
.../DataObjectAttributePropertyTest.java | 11 ++-
.../cayenne/remote/RemoteSessionTest.java | 11 ++-
.../remote/hessian/HessianConfigTest.java | 16 ++--
.../hessian/service/HessianServiceTest.java | 22 ++---
.../remote/service/BaseRemoteServiceTest.java | 17 ++--
.../remote/service/DispatchHelperTest.java | 12 ++-
.../ClassLoaderResourceLocatorTest.java | 12 ++-
.../resource/FilesystemResourceLocatorTest.java | 13 ++-
.../cayenne/resource/URLResourceTest.java | 13 +--
.../cayenne/unit/jira/CAY_10062004_ExpTest.java | 9 ++-
.../apache/cayenne/unit/jira/CAY_743Test.java | 9 ++-
.../apache/cayenne/util/Base64CodecTest.java | 25 +++++-
.../cayenne/util/GenericResponseTest.java | 11 ++-
.../org/apache/cayenne/util/IDUtilTest.java | 12 ++-
.../cayenne/util/IndexPropertyListTest.java | 10 ++-
.../org/apache/cayenne/util/InvocationTest.java | 73 +++++++++++------
.../apache/cayenne/util/ListResponseTest.java | 12 ++-
.../apache/cayenne/util/NameConverterTest.java | 21 ++++-
.../util/PersistentObjectHolderTest.java | 14 +++-
.../org/apache/cayenne/util/RegexUtilTest.java | 10 ++-
.../java/org/apache/cayenne/util/UtilTest.java | 50 ++++++++++--
.../ConcurrentLinkedHashMapTest.java | 9 ++-
.../validation/BeanValidationFailureTest.java | 8 +-
.../validation/ValidationExceptionTest.java | 7 +-
.../validation/ValidationResultTest.java | 17 ++--
137 files changed, 1623 insertions(+), 639 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/BaseContextTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/BaseContextTest.java b/cayenne-server/src/test/java/org/apache/cayenne/BaseContextTest.java
index 71bb1ce..f8582df 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/BaseContextTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/BaseContextTest.java
@@ -18,21 +18,27 @@
****************************************************************/
package org.apache.cayenne;
-import static org.mockito.Mockito.mock;
-
-import java.util.Map;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.CayenneRuntime;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
-public class BaseContextTest extends TestCase {
+public class BaseContextTest {
+ @Test
public void testUserPropertiesLazyInit() {
BaseContext context = new MockBaseContext();
assertNull(context.userProperties);
@@ -42,6 +48,7 @@ public class BaseContextTest extends TestCase {
assertSame(properties, context.getUserProperties());
}
+ @Test
public void testAttachToRuntimeIfNeeded() {
final DataChannel channel = mock(DataChannel.class);
@@ -77,6 +84,7 @@ public class BaseContextTest extends TestCase {
}
}
+ @Test
public void testAttachToRuntimeIfNeeded_NoStack() {
BaseContext context = new MockBaseContext();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
index 4d361bd..9fac950 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneExceptionTest.java
@@ -19,22 +19,30 @@
package org.apache.cayenne;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class CayenneExceptionTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+public class CayenneExceptionTest {
+
+ @Test
public void testConstructor1() throws Exception {
CayenneException ex = new CayenneException();
assertNull(ex.getCause());
assertTrue(ex.getMessage().startsWith(CayenneException.getExceptionLabel()));
}
+ @Test
public void testConstructor2() throws Exception {
CayenneException ex = new CayenneException("abc");
assertNull(ex.getCause());
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
+ @Test
public void testConstructor3() throws Exception {
Throwable cause = new Throwable();
CayenneException ex = new CayenneException(cause);
@@ -43,6 +51,7 @@ public class CayenneExceptionTest extends TestCase {
.getMessage());
}
+ @Test
public void testConstructor4() throws Exception {
Throwable cause = new Throwable();
CayenneException ex = new CayenneException("abc", cause);
@@ -50,11 +59,13 @@ public class CayenneExceptionTest extends TestCase {
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
+ @Test
public void testMessageFormatting1() throws Exception {
CayenneException ex = new CayenneException("x%sx%sx", "a", "b");
assertEquals("xaxbx", ex.getUnlabeledMessage());
}
+ @Test
public void testMessageFormatting2() throws Exception {
Throwable cause = new Throwable();
CayenneException ex = new CayenneException("x%sx%sx", cause, "a", "b");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
index 8ff262f..d9019c2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneRuntimeExceptionTest.java
@@ -19,27 +19,35 @@
package org.apache.cayenne;
+import org.junit.Test;
+
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class CayenneRuntimeExceptionTest extends TestCase {
+public class CayenneRuntimeExceptionTest {
+ @Test
public void testConstructor1() throws Exception {
CayenneRuntimeException ex = new CayenneRuntimeException();
assertNull(ex.getCause());
assertTrue(ex.getMessage().startsWith(CayenneException.getExceptionLabel()));
}
+ @Test
public void testConstructor2() throws Exception {
CayenneRuntimeException ex = new CayenneRuntimeException("abc");
assertNull(ex.getCause());
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
+ @Test
public void testConstructor3() throws Exception {
Throwable cause = new Throwable();
CayenneRuntimeException ex = new CayenneRuntimeException(cause);
@@ -49,6 +57,7 @@ public class CayenneRuntimeExceptionTest extends TestCase {
ex.getMessage());
}
+ @Test
public void testConstructor4() throws Exception {
Throwable cause = new Throwable();
CayenneRuntimeException ex = new CayenneRuntimeException("abc", cause);
@@ -56,6 +65,7 @@ public class CayenneRuntimeExceptionTest extends TestCase {
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
+ @Test
public void testThrow1() throws Exception {
try {
throw new CayenneRuntimeException();
@@ -66,6 +76,7 @@ public class CayenneRuntimeExceptionTest extends TestCase {
}
}
+ @Test
public void testThrow2() throws Exception {
try {
try {
@@ -80,12 +91,14 @@ public class CayenneRuntimeExceptionTest extends TestCase {
rtex.printStackTrace(new PrintWriter(w));
}
}
-
+
+ @Test
public void testMessageFormatting1() throws Exception {
CayenneRuntimeException ex = new CayenneRuntimeException("x%sx%sx", "a", "b");
assertEquals("xaxbx", ex.getUnlabeledMessage());
}
-
+
+ @Test
public void testMessageFormatting2() throws Exception {
Throwable cause = new Throwable();
CayenneRuntimeException ex = new CayenneRuntimeException("x%sx%sx", cause, "a", "b");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ConfigExceptionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ConfigExceptionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ConfigExceptionTest.java
index a1cbce0..c4bfd90 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ConfigExceptionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ConfigExceptionTest.java
@@ -19,24 +19,32 @@
package org.apache.cayenne;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ConfigExceptionTest extends TestCase {
+public class ConfigExceptionTest {
+ @Test
public void testConstructor1() throws Exception {
ConfigurationException ex = new ConfigurationException();
assertNull(ex.getCause());
assertTrue(ex.getMessage().startsWith(CayenneException.getExceptionLabel()));
}
+ @Test
public void testConstructor2() throws Exception {
ConfigurationException ex = new ConfigurationException("abc");
assertNull(ex.getCause());
assertEquals(CayenneException.getExceptionLabel() + "abc", ex.getMessage());
}
+ @Test
public void testConstructor3() throws Exception {
Throwable cause = new Throwable();
ConfigurationException ex = new ConfigurationException(cause);
@@ -46,6 +54,7 @@ public class ConfigExceptionTest extends TestCase {
ex.getMessage());
}
+ @Test
public void testConstructor4() throws Exception {
Throwable cause = new Throwable();
ConfigurationException ex = new ConfigurationException("abc", cause);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ContextStateRecorderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ContextStateRecorderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ContextStateRecorderTest.java
index b1bdd16..9d9bd27 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ContextStateRecorderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ContextStateRecorderTest.java
@@ -19,15 +19,19 @@
package org.apache.cayenne;
-import junit.framework.TestCase;
-
import org.apache.cayenne.graph.GraphManager;
import org.apache.cayenne.graph.MockGraphManager;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ContextStateRecorderTest extends TestCase {
+public class ContextStateRecorderTest {
+ @Test
public void testDirtyNodesInState() {
GraphManager map = new MockGraphManager();
@@ -75,6 +79,7 @@ public class ContextStateRecorderTest extends TestCase {
assertTrue(recorder.dirtyNodes(PersistenceState.HOLLOW).isEmpty());
}
+ @Test
public void testDirtyNodes() {
GraphManager map = new MockGraphManager();
ObjectContextStateLog recorder = new ObjectContextStateLog(map);
@@ -97,8 +102,8 @@ public class ContextStateRecorderTest extends TestCase {
assertTrue(recorder.dirtyNodes().isEmpty());
}
+ @Test
public void testHasChanges() {
-
ObjectContextStateLog recorder = new ObjectContextStateLog(new MockGraphManager());
assertFalse(recorder.hasChanges());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/DataRowTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataRowTest.java b/cayenne-server/src/test/java/org/apache/cayenne/DataRowTest.java
index e8f245b..e145cd2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataRowTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataRowTest.java
@@ -19,10 +19,13 @@
package org.apache.cayenne;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class DataRowTest extends TestCase {
+import static org.junit.Assert.assertFalse;
+public class DataRowTest {
+
+ @Test
public void testVersion() throws Exception {
DataRow s1 = new DataRow(10);
DataRow s2 = new DataRow(10);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
index 1b163b9..aef1c9e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ObjectContextChangeLogTest.java
@@ -19,15 +19,20 @@
package org.apache.cayenne;
-import junit.framework.TestCase;
-
import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
import org.apache.cayenne.graph.NodeCreateOperation;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
-public class ObjectContextChangeLogTest extends TestCase {
+public class ObjectContextChangeLogTest {
+ @Test
public void testReset() {
ObjectContextChangeLog recorder = new ObjectContextChangeLog();
assertNotNull(recorder.getDiffs());
@@ -50,6 +55,7 @@ public class ObjectContextChangeLogTest extends TestCase {
assertFalse(diff.isNoop());
}
+ @Test
public void testGetDiffs() {
// assert that after returning, the diffs array won't get modified by
// operation
@@ -66,6 +72,7 @@ public class ObjectContextChangeLogTest extends TestCase {
assertEquals(2, diff2.getDiffs().size());
}
+ @Test
public void testGetDiffsSerializable() throws Exception {
ObjectContextChangeLog recorder = new ObjectContextChangeLog();
recorder.addOperation(new NodeCreateOperation(new ObjectId("test")));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java
index 0a8d95e..e747086 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdRegressionTest.java
@@ -19,12 +19,14 @@
package org.apache.cayenne;
+import org.junit.Test;
+
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
-public class ObjectIdRegressionTest extends TestCase {
+public class ObjectIdRegressionTest {
// public void testX() {
// for (int i = 0; i < 10000; i++) {
@@ -38,6 +40,7 @@ public class ObjectIdRegressionTest extends TestCase {
// }
// }
+ @Test
public void testIdPool() throws Exception {
// testing uniqueness of a sequence of ObjectIds generated quickly one after the
// other...
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdTest.java
index 49b0b7b..f275242 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ObjectIdTest.java
@@ -19,17 +19,24 @@
package org.apache.cayenne;
+import org.apache.cayenne.util.Util;
+import org.apache.commons.collections.map.LinkedMap;
+import org.junit.Test;
+
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.util.Util;
-import org.apache.commons.collections.map.LinkedMap;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class ObjectIdTest extends TestCase {
+public class ObjectIdTest {
+ @Test
public void testConstructor() {
ObjectId temp1 = new ObjectId("e");
assertEquals("e", temp1.getEntityName());
@@ -43,6 +50,7 @@ public class ObjectIdTest extends TestCase {
assertSame(key, temp2.getKey());
}
+ @Test
public void testSerializabilityTemp() throws Exception {
ObjectId temp1 = new ObjectId("e");
ObjectId temp2 = (ObjectId) Util.cloneViaSerialization(temp1);
@@ -52,6 +60,7 @@ public class ObjectIdTest extends TestCase {
assertEquals(temp1, temp2);
}
+ @Test
public void testSerializabilityPerm() throws Exception {
ObjectId perm1 = new ObjectId("e", "a", "b");
@@ -70,12 +79,14 @@ public class ObjectIdTest extends TestCase {
assertEquals(perm1, perm2);
}
+ @Test
public void testEquals0() {
ObjectId oid1 = new ObjectId("TE");
assertEquals(oid1, oid1);
assertEquals(oid1.hashCode(), oid1.hashCode());
}
+ @Test
public void testEquals1() {
ObjectId oid1 = new ObjectId("T", "a", "b");
ObjectId oid2 = new ObjectId("T", "a", "b");
@@ -83,6 +94,7 @@ public class ObjectIdTest extends TestCase {
assertEquals(oid1.hashCode(), oid2.hashCode());
}
+ @Test
public void testEquals2() {
Map hm = new HashMap();
ObjectId oid1 = new ObjectId("T", hm);
@@ -91,6 +103,7 @@ public class ObjectIdTest extends TestCase {
assertEquals(oid1.hashCode(), oid2.hashCode());
}
+ @Test
public void testEquals3() {
String pknm = "xyzabc";
@@ -109,6 +122,7 @@ public class ObjectIdTest extends TestCase {
/**
* This is a test case reproducing conditions for the bug "8458963".
*/
+ @Test
public void testEquals5() {
Map hm1 = new HashMap();
@@ -127,6 +141,7 @@ public class ObjectIdTest extends TestCase {
/**
* Multiple key objectId
*/
+ @Test
public void testEquals6() {
Map hm1 = new HashMap();
@@ -147,6 +162,7 @@ public class ObjectIdTest extends TestCase {
* Checks that hashCode works even if keys are inserted in the map in a
* different order...
*/
+ @Test
public void testEquals7() {
// create maps with guaranteed iteration order
@@ -166,6 +182,7 @@ public class ObjectIdTest extends TestCase {
assertEquals(ref.hashCode(), oid.hashCode());
}
+ @Test
public void testEqualsBinaryKey() {
Map hm1 = new HashMap();
@@ -180,11 +197,13 @@ public class ObjectIdTest extends TestCase {
assertTrue(ref.equals(oid));
}
+ @Test
public void testEqualsNull() {
ObjectId o = new ObjectId("T", "ARTIST_ID", new Integer(42));
assertFalse(o.equals(null));
}
+ @Test
public void testIdAsMapKey() {
Map map = new HashMap();
Object o1 = new Object();
@@ -204,6 +223,7 @@ public class ObjectIdTest extends TestCase {
assertSame(o1, map.get(oid2));
}
+ @Test
public void testNotEqual1() {
ObjectId oid1 = new ObjectId("T1");
@@ -211,6 +231,7 @@ public class ObjectIdTest extends TestCase {
assertFalse(oid1.equals(oid2));
}
+ @Test
public void testNotEqual2() {
Map hm1 = new HashMap();
@@ -227,6 +248,7 @@ public class ObjectIdTest extends TestCase {
/**
* Test different numeric types.
*/
+ @Test
public void testEquals8() {
// create maps with guaranteed iteration order
@@ -246,6 +268,7 @@ public class ObjectIdTest extends TestCase {
assertEquals(ref.hashCode(), oid.hashCode());
}
+ @Test
public void testToString() {
Map m1 = new HashMap();
m1.put("a", "1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/DbArcIdTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbArcIdTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbArcIdTest.java
index f973846..e9f256e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbArcIdTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbArcIdTest.java
@@ -18,13 +18,17 @@
****************************************************************/
package org.apache.cayenne.access;
-import junit.framework.TestCase;
-
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.map.DbRelationship;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-public class DbArcIdTest extends TestCase {
+public class DbArcIdTest {
+ @Test
public void testHashCode() {
DbArcId id1 = new DbArcId(new ObjectId("x", "k", "v"),
@@ -46,6 +50,7 @@ public class DbArcIdTest extends TestCase {
assertFalse(h1 == id3.hashCode());
}
+ @Test
public void testEquals() {
DbArcId id1 = new DbArcId(new ObjectId("x", "k", "v"),
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
index 7be3c3d..3b91608 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
@@ -18,8 +18,6 @@
****************************************************************/
package org.apache.cayenne.access;
-import junit.framework.TestCase;
-
import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.ConfigurationTree;
import org.apache.cayenne.configuration.DataChannelDescriptor;
@@ -40,15 +38,21 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.map.naming.LegacyNameGenerator;
import org.apache.cayenne.resource.URLResource;
+import org.junit.Before;
+import org.junit.Test;
import java.net.URL;
import java.util.ArrayList;
-public class ManyToManyCandidateEntityTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class ManyToManyCandidateEntityTest {
private DataMap map;
- @Override
+ @Before
public void setUp() throws Exception {
Module testModule = new Module() {
@@ -74,18 +78,21 @@ public class ManyToManyCandidateEntityTest extends TestCase {
map = tree.getRootNode().getDataMap(testConfigName);
}
+ @Test
public void testMatchingForManyToManyEntity() throws Exception {
ObjEntity manyToManyEntity = map.getObjEntity("Table1Table2");
assertNotNull(ManyToManyCandidateEntity.build(manyToManyEntity));
}
+ @Test
public void testMatchingForNotManyToManyEntity() throws Exception {
ObjEntity entity = map.getObjEntity("Table1");
assertNull(ManyToManyCandidateEntity.build(entity));
}
+ @Test
public void testOptimisationForManyToManyEntity() {
ObjEntity manyToManyEntity = map.getObjEntity("Table1Table2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/event/SnapshotEventTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/event/SnapshotEventTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/event/SnapshotEventTest.java
index 1446958..94a49e6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/event/SnapshotEventTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/event/SnapshotEventTest.java
@@ -19,15 +19,18 @@
package org.apache.cayenne.access.event;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertSame;
-public class SnapshotEventTest extends TestCase {
+public class SnapshotEventTest {
+ @Test
public void testRootEvent() {
Object source = new Object();
Collection<?> deleted = new ArrayList<Object>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
index 26b8155..a12fe8d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
@@ -19,29 +19,35 @@
package org.apache.cayenne.access.jdbc;
-import java.sql.Types;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
+import org.junit.Test;
+
+import java.sql.Types;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class ColumnDescriptorTest extends TestCase {
+public class ColumnDescriptorTest {
+ @Test
public void testName() {
ColumnDescriptor column = new ColumnDescriptor();
column.setName("abc");
assertEquals("abc", column.getName());
}
+ @Test
public void testLabel() {
ColumnDescriptor column = new ColumnDescriptor();
column.setDataRowKey("abc");
assertEquals("abc", column.getDataRowKey());
}
+ @Test
public void testDbAttributeConstructor() {
DbEntity entity = new DbEntity("entity");
DbAttribute a = new DbAttribute();
@@ -60,6 +66,7 @@ public class ColumnDescriptorTest extends TestCase {
assertEquals(Types.VARCHAR, column.getJdbcType());
}
+ @Test
public void testEquals() {
ColumnDescriptor column1 = new ColumnDescriptor();
column1.setName("n1");
@@ -84,6 +91,7 @@ public class ColumnDescriptorTest extends TestCase {
assertFalse(column3.equals(column2));
}
+ @Test
public void testHashCode() {
ColumnDescriptor column1 = new ColumnDescriptor();
column1.setName("n1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
index 869904b..4547957 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
@@ -19,14 +19,9 @@
package org.apache.cayenne.access.jdbc;
-import static org.mockito.Mockito.mock;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
+import com.mockrunner.mock.jdbc.MockConnection;
+import com.mockrunner.mock.jdbc.MockResultSet;
+import com.mockrunner.mock.jdbc.MockStatement;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory;
import org.apache.cayenne.access.jdbc.reader.RowReader;
@@ -34,13 +29,21 @@ import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.query.MockQueryMetadata;
+import org.junit.Test;
-import com.mockrunner.mock.jdbc.MockConnection;
-import com.mockrunner.mock.jdbc.MockResultSet;
-import com.mockrunner.mock.jdbc.MockStatement;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-public class JDBCResultIteratorTest extends TestCase {
+public class JDBCResultIteratorTest {
+ @Test
public void testNextDataRow() throws Exception {
Connection c = new MockConnection();
Statement s = new MockStatement(c);
@@ -60,6 +63,7 @@ public class JDBCResultIteratorTest extends TestCase {
assertEquals("1", row.get("a"));
}
+ @Test
public void testClose() throws Exception {
Connection c = new MockConnection();
MockStatement s = new MockStatement(c);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
index 16f2c10..88791b5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLStatementTest.java
@@ -19,11 +19,17 @@
package org.apache.cayenne.access.jdbc;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
/**
*/
-public class SQLStatementTest extends TestCase {
+public class SQLStatementTest {
+
+ @Test
public void testConstructor() throws Exception {
ParameterBinding[] bindings = new ParameterBinding[0];
SQLStatement statement = new SQLStatement("abc", bindings);
@@ -31,6 +37,7 @@ public class SQLStatementTest extends TestCase {
assertSame(bindings, statement.getBindings());
}
+ @Test
public void testSQL() throws Exception {
SQLStatement statement = new SQLStatement();
statement.setSql("abc");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
index 0b93c64..69e5bf4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorChainTest.java
@@ -19,14 +19,17 @@
package org.apache.cayenne.access.jdbc;
+import org.junit.Test;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class SQLTemplateProcessorChainTest extends TestCase {
+public class SQLTemplateProcessorChainTest {
+ @Test
public void testProcessTemplateNoChunks() throws Exception {
// whatever is inside the chain, it should render as empty if there
// is no chunks...
@@ -55,6 +58,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("", compiled.getSql());
}
+ @Test
public void testProcessTemplateFullChain() throws Exception {
String template = "#chain(' OR ')"
+ "#chunk($a)$a#end"
@@ -71,6 +75,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("[A] OR [B] OR [C]", compiled.getSql());
}
+ @Test
public void testProcessTemplateFullChainAndPrefix() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -87,6 +92,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [A] OR [B] OR [C]", compiled.getSql());
}
+ @Test
public void testProcessTemplatePartialChainMiddle() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -102,6 +108,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [A] OR [C]", compiled.getSql());
}
+ @Test
public void testProcessTemplatePartialChainStart() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -117,6 +124,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [B] OR [C]", compiled.getSql());
}
+ @Test
public void testProcessTemplatePartialChainEnd() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -132,6 +140,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [A] OR [B]", compiled.getSql());
}
+ @Test
public void testProcessTemplateChainWithGarbage() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -147,6 +156,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [A] some other stuff OR [C]", compiled.getSql());
}
+ @Test
public void testProcessTemplateChainUnconditionalChunks() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk()C1#end"
@@ -160,6 +170,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE C1 OR C2 OR C3", compiled.getSql());
}
+ @Test
public void testProcessTemplateEmptyChain() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
@@ -173,6 +184,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("", compiled.getSql());
}
+ @Test
public void testProcessTemplateWithFalseOrZero1() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)[A]#end"
@@ -188,6 +200,7 @@ public class SQLTemplateProcessorChainTest extends TestCase {
assertEquals("WHERE [A] OR [B]", compiled.getSql());
}
+ @Test
public void testProcessTemplateWithFalseOrZero2() throws Exception {
String template = "#chain(' OR ' 'WHERE ')"
+ "#chunk($a)$a#end"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
index 84a40c3..bc498c8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
@@ -19,12 +19,16 @@
package org.apache.cayenne.access.jdbc;
+import org.junit.Test;
+
import java.util.Collections;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
-public class SQLTemplateProcessorSelectTest extends TestCase {
+public class SQLTemplateProcessorSelectTest {
+ @Test
public void testProcessTemplateUnchanged() throws Exception {
String sqlTemplate = "SELECT * FROM ME";
@@ -37,6 +41,7 @@ public class SQLTemplateProcessorSelectTest extends TestCase {
assertEquals(0, compiled.getResultColumns().length);
}
+ @Test
public void testProcessSelectTemplate1() throws Exception {
String sqlTemplate = "SELECT #result('A') FROM ME";
@@ -51,6 +56,7 @@ public class SQLTemplateProcessorSelectTest extends TestCase {
assertNull(compiled.getResultColumns()[0].getJavaClass());
}
+ @Test
public void testProcessSelectTemplate2() throws Exception {
String sqlTemplate = "SELECT #result('A' 'String') FROM ME";
@@ -66,6 +72,7 @@ public class SQLTemplateProcessorSelectTest extends TestCase {
assertEquals("java.lang.String", compiled.getResultColumns()[0].getJavaClass());
}
+ @Test
public void testProcessSelectTemplate3() throws Exception {
String sqlTemplate = "SELECT #result('A' 'String' 'B') FROM ME";
@@ -83,6 +90,7 @@ public class SQLTemplateProcessorSelectTest extends TestCase {
assertEquals("java.lang.String", column.getJavaClass());
}
+ @Test
public void testProcessSelectTemplate4() throws Exception {
String sqlTemplate = "SELECT #result('A'), #result('B'), #result('C') FROM ME";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
index 9b3111c..a45c068 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorTest.java
@@ -19,22 +19,25 @@
package org.apache.cayenne.access.jdbc;
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.ObjectId;
+import org.junit.Test;
+
import java.sql.Types;
import java.util.Arrays;
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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class SQLTemplateProcessorTest extends TestCase {
+public class SQLTemplateProcessorTest {
+ @Test
public void testProcessTemplateUnchanged1() throws Exception {
String sqlTemplate = "SELECT * FROM ME";
@@ -46,6 +49,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertEquals(0, compiled.getBindings().length);
}
+ @Test
public void testProcessTemplateUnchanged2() throws Exception {
String sqlTemplate = "SELECT a.b as XYZ FROM $SYSTEM_TABLE";
@@ -57,6 +61,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertEquals(0, compiled.getBindings().length);
}
+ @Test
public void testProcessTemplateSimpleDynamicContent() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE $a";
@@ -71,6 +76,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertEquals(0, compiled.getBindings().length);
}
+ @Test
public void testProcessTemplateBind() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE "
+ "COLUMN1 = #bind($a 'VARCHAR') AND COLUMN2 = #bind($b 'INTEGER')";
@@ -86,6 +92,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingValue(null, compiled.getBindings()[1]);
}
+ @Test
public void testProcessTemplateBindGuessVarchar() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN1 = #bind($a)";
Map map = Collections.singletonMap("a", "VALUE_OF_A");
@@ -98,6 +105,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingType(Types.VARCHAR, compiled.getBindings()[0]);
}
+ @Test
public void testProcessTemplateBindGuessInteger() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN1 = #bind($a)";
Map map = Collections.singletonMap("a", new Integer(4));
@@ -110,6 +118,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingType(Types.INTEGER, compiled.getBindings()[0]);
}
+ @Test
public void testProcessTemplateBindEqual() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN #bindEqual($a 'VARCHAR')";
@@ -129,6 +138,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingValue("VALUE_OF_A", compiled.getBindings()[0]);
}
+ @Test
public void testProcessTemplateBindNotEqual() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN #bindNotEqual($a 'VARCHAR')";
@@ -148,6 +158,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingValue("VALUE_OF_A", compiled.getBindings()[0]);
}
+ @Test
public void testProcessTemplateID() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN1 = #bind($helper.cayenneExp($a, 'db:ID_COLUMN'))";
@@ -165,6 +176,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingValue(new Integer(5), compiled.getBindings()[0]);
}
+ @Test
public void testProcessTemplateNotEqualID() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE "
+ "COLUMN1 #bindNotEqual($helper.cayenneExp($a, 'db:ID_COLUMN1')) "
@@ -190,6 +202,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertBindingValue("aaa", compiled.getBindings()[1]);
}
+ @Test
public void testProcessTemplateConditions() throws Exception {
String sqlTemplate = "SELECT * FROM ME #if($a) WHERE COLUMN1 > #bind($a)#end";
@@ -211,6 +224,7 @@ public class SQLTemplateProcessorTest extends TestCase {
assertEquals(0, compiled.getBindings().length);
}
+ @Test
public void testProcessTemplateBindCollection() throws Exception {
String sqlTemplate = "SELECT * FROM ME WHERE COLUMN IN (#bind($list 'VARCHAR'))";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
index b88dc67..ad7bf61 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateResourceManagerTest.java
@@ -19,15 +19,19 @@
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.junit.Test;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class SQLTemplateResourceManagerTest extends TestCase {
+public class SQLTemplateResourceManagerTest {
+ @Test
public void testFetResource() throws Exception {
SQLTemplateResourceManager rm = new SQLTemplateResourceManager();
rm.initialize(new MockupRuntimeServices());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java
index 195e033..83b6b0f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/BooleanTypeTest.java
@@ -22,19 +22,24 @@ package org.apache.cayenne.access.types;
import java.sql.SQLException;
import java.sql.Types;
-import junit.framework.TestCase;
-
import com.mockrunner.mock.jdbc.MockResultSet;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
/**
*/
-public class BooleanTypeTest extends TestCase {
+public class BooleanTypeTest {
+ @Test
public void testClassName() {
BooleanType type = new BooleanType();
assertEquals(Boolean.class.getName(), type.getClassName());
}
+ @Test
public void testMaterializeObjectFromResultSet() throws Exception {
MockResultSet rs = new MockResultSet("") {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/ByteArrayTypeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ByteArrayTypeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ByteArrayTypeTest.java
index 7f93d08..5953da2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ByteArrayTypeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ByteArrayTypeTest.java
@@ -19,10 +19,13 @@
package org.apache.cayenne.access.types;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class ByteArrayTypeTest extends TestCase {
+import static org.junit.Assert.fail;
+public class ByteArrayTypeTest {
+
+ @Test
public void testTrimBytes1() throws Exception {
byte[] b1 = new byte[] {
1, 2, 3
@@ -31,6 +34,7 @@ public class ByteArrayTypeTest extends TestCase {
assertByteArraysEqual(b1, b2);
}
+ @Test
public void testTrimBytes2() throws Exception {
byte[] ref = new byte[] {
1, 2, 3
@@ -42,6 +46,7 @@ public class ByteArrayTypeTest extends TestCase {
assertByteArraysEqual(ref, b2);
}
+ @Test
public void testTrimBytes3() throws Exception {
byte[] b1 = new byte[] {
0, 1, 2, 3
@@ -50,6 +55,7 @@ public class ByteArrayTypeTest extends TestCase {
assertByteArraysEqual(b1, b2);
}
+ @Test
public void testTrimBytes4() throws Exception {
byte[] b1 = new byte[] {};
byte[] b2 = ByteArrayType.trimBytes(b1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/CharTypeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/CharTypeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/CharTypeTest.java
index e0e61b8..660b701 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/CharTypeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/CharTypeTest.java
@@ -18,11 +18,14 @@
****************************************************************/
package org.apache.cayenne.access.types;
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
-public class CharTypeTest extends TestCase {
-
+
+public class CharTypeTest {
+
+ @Test
public void testRightTrim() {
CharType charType = new CharType(true, false);
String trimmedStr = charType.rtrim(" text ");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeFactoryTest.java
index 597476d..5a72fdc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeFactoryTest.java
@@ -18,10 +18,13 @@
****************************************************************/
package org.apache.cayenne.access.types;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EnumTypeFactoryTest extends TestCase {
+import static org.junit.Assert.assertNotNull;
+public class EnumTypeFactoryTest {
+
+ @Test
public void testSupportsEnums() {
EnumTypeFactory map = new EnumTypeFactory();
assertNotNull(map.getType(MockEnum.class));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeTest.java
index 7a47460..18aebbd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/EnumTypeTest.java
@@ -19,14 +19,18 @@
package org.apache.cayenne.access.types;
-import java.sql.Types;
-
import com.mockrunner.mock.jdbc.MockResultSet;
+import org.junit.Test;
+
+import java.sql.Types;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
-public class EnumTypeTest extends TestCase {
+public class EnumTypeTest {
+ @Test
public void testConstructor() throws Exception {
EnumType type = new EnumType(MockEnum.class);
assertEquals(MockEnum.class.getName(), type.getClassName());
@@ -37,6 +41,7 @@ public class EnumTypeTest extends TestCase {
}
}
+ @Test
public void testInvalidConstructor1() throws Exception {
try {
new EnumType(Object.class);
@@ -47,6 +52,7 @@ public class EnumTypeTest extends TestCase {
}
}
+ @Test
public void testInvalidConstructor2() throws Exception {
try {
new EnumType(null);
@@ -56,7 +62,8 @@ public class EnumTypeTest extends TestCase {
// expected
}
}
-
+
+ @Test
public void testMaterializeStringObject() throws Exception {
EnumType type = new EnumType(MockEnum.class);
@@ -68,7 +75,8 @@ public class EnumTypeTest extends TestCase {
Object o = type.materializeObject(rs, 1, Types.VARCHAR);
assertSame(MockEnum.b, o);
}
-
+
+ @Test
public void testMaterializeNumericObject() throws Exception {
EnumType type = new EnumType(MockEnum.class);
@@ -80,7 +88,8 @@ public class EnumTypeTest extends TestCase {
Object o = type.materializeObject(rs, 1, Types.NUMERIC);
assertSame(MockEnum.c, o);
}
-
+
+ @Test
public void testMaterializeStringObjectInnerEnum() throws Exception {
EnumType type = new EnumType(InnerEnumHolder.InnerEnum.class);
@@ -92,7 +101,8 @@ public class EnumTypeTest extends TestCase {
Object o = type.materializeObject(rs, 1, Types.VARCHAR);
assertSame(InnerEnumHolder.InnerEnum.b, o);
}
-
+
+ @Test
public void testMaterializeNumericObjectInnerEnum() throws Exception {
EnumType type = new EnumType(InnerEnumHolder.InnerEnum.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapEnumsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapEnumsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapEnumsTest.java
index bb32508..37b8afc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapEnumsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapEnumsTest.java
@@ -19,10 +19,18 @@
package org.apache.cayenne.access.types;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class ExtendedTypeMapEnumsTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+public class ExtendedTypeMapEnumsTest {
+
+ @Test
public void testCreateType1_5() {
ExtendedTypeMap map = new ExtendedTypeMap();
@@ -36,6 +44,7 @@ public class ExtendedTypeMapEnumsTest extends TestCase {
assertNotSame(type, type2);
}
+ @Test
public void testCreateType1_5InnerEnum() {
ExtendedTypeMap map = new ExtendedTypeMap();
@@ -56,6 +65,7 @@ public class ExtendedTypeMapEnumsTest extends TestCase {
assertSame(type.getClassName(), type2.getClassName());
}
+ @Test
public void testGetDefaultType1_4() {
ExtendedTypeMap map = new ExtendedTypeMap();
map.internalTypeFactories.clear();
@@ -65,6 +75,7 @@ public class ExtendedTypeMapEnumsTest extends TestCase {
assertNull(map.createType(MockEnum2.class.getName()));
}
+ @Test
public void testGetType() {
ExtendedTypeMap map = new ExtendedTypeMap();
ExtendedType type = map.getRegisteredType(MockEnum.class.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java
index 3da31d6..fc68377 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java
@@ -19,13 +19,20 @@
package org.apache.cayenne.access.types;
+import org.junit.Test;
+
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class ExtendedTypeMapTest extends TestCase {
+public class ExtendedTypeMapTest {
+ @Test
public void testRegisterType() throws Exception {
ExtendedTypeMap map = new ExtendedTypeMap();
ExtendedType tstType = new MockExtendedType();
@@ -39,6 +46,7 @@ public class ExtendedTypeMapTest extends TestCase {
assertSame(map.getDefaultType(), map.getRegisteredType(tstType.getClassName()));
}
+ @Test
public void testRegisterTypeSubclasses() throws Exception {
ExtendedTypeMap map = new ExtendedTypeMap();
ExtendedType tstType1 = new MockExtendedType(List.class);
@@ -74,7 +82,8 @@ public class ExtendedTypeMapTest extends TestCase {
assertSame(tstType1, map.getRegisteredType(List.class));
}
-
+
+ @Test
public void testRegisterArrayType() throws Exception {
ExtendedTypeMap map = new ExtendedTypeMap();
ByteArrayType tstType = new ByteArrayType(false, true);
@@ -93,6 +102,7 @@ public class ExtendedTypeMapTest extends TestCase {
.indexOf("SerializableTypeFactory") > 0);
}
+ @Test
public void testRegisteredTypeName() throws Exception {
ExtendedTypeMap map = new ExtendedTypeMap();
ExtendedType tstType = new MockExtendedType();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCacheTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCacheTest.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCacheTest.java
index f56302d..e487dd7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCacheTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCacheTest.java
@@ -18,31 +18,36 @@
****************************************************************/
package org.apache.cayenne.cache;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import net.sf.ehcache.CacheManager;
+import org.apache.cayenne.query.QueryMetadata;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-import net.sf.ehcache.CacheManager;
-
-import org.apache.cayenne.query.QueryMetadata;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class EhCacheQueryCacheTest extends TestCase {
+public class EhCacheQueryCacheTest {
private CacheManager cacheManager;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
cacheManager = new CacheManager();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
cacheManager.shutdown();
}
+ @Test
public void testGet() {
EhCacheQueryCache cache = new EhCacheQueryCache(cacheManager);
@@ -57,6 +62,7 @@ public class EhCacheQueryCacheTest extends TestCase {
assertSame(results, cache.get(md));
}
+ @Test
public void testGet_WithFactory() {
EhCacheQueryCache cache = new EhCacheQueryCache(cacheManager);
@@ -77,6 +83,7 @@ public class EhCacheQueryCacheTest extends TestCase {
assertSame(results, cache.get(md));
}
+ @Test
public void testGet_WithFactory_WithCacheGroups() {
EhCacheQueryCache cache = new EhCacheQueryCache(cacheManager);
@@ -98,6 +105,7 @@ public class EhCacheQueryCacheTest extends TestCase {
assertSame(results, cache.get(md));
}
+ @Test
public void testRemoveGroup_WithFactory_WithCacheGroups() {
EhCacheQueryCache cache = new EhCacheQueryCache(cacheManager);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCache_WithConfigTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCache_WithConfigTest.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCache_WithConfigTest.java
index 95b4ea7..964abd0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCache_WithConfigTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/EhCacheQueryCache_WithConfigTest.java
@@ -18,34 +18,39 @@
****************************************************************/
package org.apache.cayenne.cache;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import org.apache.cayenne.query.QueryMetadata;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import java.net.URL;
import java.util.ArrayList;
-import junit.framework.TestCase;
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-
-import org.apache.cayenne.query.QueryMetadata;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class EhCacheQueryCache_WithConfigTest extends TestCase {
+public class EhCacheQueryCache_WithConfigTest {
protected CacheManager cacheManager;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
URL config = getClass().getResource("test-ehcache.xml");
assertNotNull(config);
cacheManager = new CacheManager(config);
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
cacheManager.shutdown();
}
+ @Test
public void testRemoveGroup_WithFactory_WithCacheGroups() {
EhCacheQueryCache cache = new EhCacheQueryCache(cacheManager);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
index bc00900..7f6e8ce 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/MapQueryCacheTest.java
@@ -18,15 +18,18 @@
****************************************************************/
package org.apache.cayenne.cache;
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.MockQueryMetadata;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-public class MapQueryCacheTest extends TestCase {
+public class MapQueryCacheTest {
+ @Test
public void testSerializability() throws Exception {
MapQueryCache cache = new MapQueryCache(5);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java b/cayenne-server/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java
index 9dfc273..230bd1c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java
@@ -18,21 +18,25 @@
****************************************************************/
package org.apache.cayenne.cache;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
+import com.opensymphony.oscache.base.CacheEntry;
+import com.opensymphony.oscache.general.GeneralCacheAdministrator;
import org.apache.cayenne.cache.OSQueryCache.RefreshSpecification;
import org.apache.cayenne.query.MockQueryMetadata;
import org.apache.cayenne.query.QueryMetadata;
+import org.junit.Test;
-import com.opensymphony.oscache.base.CacheEntry;
-import com.opensymphony.oscache.general.GeneralCacheAdministrator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class OSQueryCacheTest extends TestCase {
+public class OSQueryCacheTest {
+ @Test
public void testDefaults() {
OSQueryCache cache = new OSQueryCache();
@@ -43,6 +47,7 @@ public class OSQueryCacheTest extends TestCase {
cache.defaultRefreshSpecification.refreshPeriod);
}
+ @Test
public void testDefaultOverrides() {
Properties props = new Properties();
@@ -55,6 +60,7 @@ public class OSQueryCacheTest extends TestCase {
assertEquals(15, cache.defaultRefreshSpecification.refreshPeriod);
}
+ @Test
public void testQueryOverrides() {
Properties props = new Properties();
@@ -82,7 +88,8 @@ public class OSQueryCacheTest extends TestCase {
assertEquals("24 * * * * *", xyz.cronExpression);
assertEquals(35, xyz.refreshPeriod);
}
-
+
+ @Test
public void testGroupNames() {
Properties props = new Properties();
@@ -102,6 +109,7 @@ public class OSQueryCacheTest extends TestCase {
assertTrue(c2.getGroupNames().contains("XYZ"));
}
+ @Test
public void testSize() {
OSQueryCache cache = new OSQueryCache();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/CayenneRuntimeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/CayenneRuntimeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/CayenneRuntimeTest.java
index 3f7028d..a3b66d4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/CayenneRuntimeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/CayenneRuntimeTest.java
@@ -18,14 +18,16 @@
****************************************************************/
package org.apache.cayenne.configuration;
-import static org.mockito.Mockito.mock;
-
import org.apache.cayenne.di.Injector;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
-public class CayenneRuntimeTest extends TestCase {
+public class CayenneRuntimeTest {
+ @Test
public void testBindThreadInjector() {
Injector injector = mock(Injector.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMergerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMergerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMergerTest.java
index 6114706..a1ea2dc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMergerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMergerTest.java
@@ -19,11 +19,17 @@
package org.apache.cayenne.configuration;
import org.apache.cayenne.map.DataMap;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class DefaultDataChannelDescriptorMergerTest extends TestCase {
+public class DefaultDataChannelDescriptorMergerTest {
+ @Test
public void testSingleDescriptor() {
DataChannelDescriptor descriptor = new DataChannelDescriptor();
descriptor.setName("Zx");
@@ -35,6 +41,7 @@ public class DefaultDataChannelDescriptorMergerTest extends TestCase {
assertEquals("Zx", merged.getName());
}
+ @Test
public void testMerged_Name() {
DataChannelDescriptor d1 = new DataChannelDescriptor();
d1.setName("Zx");
@@ -49,7 +56,8 @@ public class DefaultDataChannelDescriptorMergerTest extends TestCase {
assertNotSame(d2, merged);
assertEquals("Ym", merged.getName());
}
-
+
+ @Test
public void testMerged_Properties() {
DataChannelDescriptor d1 = new DataChannelDescriptor();
d1.getProperties().put("X", "1");
@@ -67,6 +75,7 @@ public class DefaultDataChannelDescriptorMergerTest extends TestCase {
assertEquals("4", merged.getProperties().get("Z"));
}
+ @Test
public void testMerged_DataMaps() {
DataChannelDescriptor d1 = new DataChannelDescriptor();
d1.setName("Zx");
@@ -92,6 +101,7 @@ public class DefaultDataChannelDescriptorMergerTest extends TestCase {
assertSame(m21, merged.getDataMap("C"));
}
+ @Test
public void testMerge_DataNodes() {
DataChannelDescriptor d1 = new DataChannelDescriptor();
d1.setName("Zx");
@@ -131,6 +141,7 @@ public class DefaultDataChannelDescriptorMergerTest extends TestCase {
assertNotSame(dn22, mergedC);
}
+ @Test
public void testMerge_DataNodesMapLinks() {
DataChannelDescriptor d1 = new DataChannelDescriptor();
d1.setName("Zx");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultRuntimePropertiesTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultRuntimePropertiesTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultRuntimePropertiesTest.java
index 2bc9290..56fefdd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultRuntimePropertiesTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/DefaultRuntimePropertiesTest.java
@@ -18,13 +18,18 @@
****************************************************************/
package org.apache.cayenne.configuration;
+import org.junit.Test;
+
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
-public class DefaultRuntimePropertiesTest extends TestCase {
+public class DefaultRuntimePropertiesTest {
+ @Test
public void testGet_FromMap() {
Map<String, String> propertiesMap = new HashMap<String, String>();
propertiesMap.put("key1", "v1");
@@ -34,6 +39,7 @@ public class DefaultRuntimePropertiesTest extends TestCase {
assertNull(properties.get("key2"));
}
+ @Test
public void testGet_FromSystem() {
String userDir = System.getProperty("user.dir");
@@ -45,6 +51,7 @@ public class DefaultRuntimePropertiesTest extends TestCase {
assertEquals(userDir, properties.get("user.dir"));
}
+ @Test
public void testGet_FromSystemOverridesMap() {
String userDir = System.getProperty("user.dir");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
index 24a92dc..a9c88b6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
@@ -18,12 +18,6 @@
****************************************************************/
package org.apache.cayenne.configuration;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
@@ -35,13 +29,24 @@ import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.resource.URLResource;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
-public class XMLDataChannelDescriptorLoaderTest extends TestCase {
+public class XMLDataChannelDescriptorLoaderTest {
private Injector injector;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Module testModule = new Module() {
public void configure(Binder binder) {
@@ -55,6 +60,7 @@ public class XMLDataChannelDescriptorLoaderTest extends TestCase {
this.injector = DIBootstrap.createInjector(testModule);
}
+ @Test
public void testLoadEmpty() {
// create and initialize loader instance to test
@@ -71,6 +77,7 @@ public class XMLDataChannelDescriptorLoaderTest extends TestCase {
assertEquals(testConfigName, tree.getRootNode().getName());
}
+ @Test
public void testLoad_MissingConfig() throws Exception {
// create and initialize loader instance to test
@@ -85,6 +92,7 @@ public class XMLDataChannelDescriptorLoaderTest extends TestCase {
}
}
+ @Test
public void testLoadDataMap() {
// create and initialize loader instance to test
@@ -106,6 +114,7 @@ public class XMLDataChannelDescriptorLoaderTest extends TestCase {
assertEquals("testConfigMap2", maps.iterator().next().getName());
}
+ @Test
public void testLoadDataEverything() {
// create and initialize loader instance to test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManagerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManagerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManagerTest.java
index 88ff42b..bf06086 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManagerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/osgi/OsgiClassLoaderManagerTest.java
@@ -18,14 +18,16 @@
****************************************************************/
package org.apache.cayenne.configuration.osgi;
-import static org.mockito.Mockito.mock;
+import org.junit.Test;
import java.util.Collections;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
-public class OsgiClassLoaderManagerTest extends TestCase {
+public class OsgiClassLoaderManagerTest {
+ @Test
public void testGetClassLoader() {
final ClassLoader appCl = mock(ClassLoader.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactoryTest.java
index d68249b..0ed02b5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactoryTest.java
@@ -18,20 +18,23 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.sql.DataSource;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DBCPDataSourceFactory;
import org.apache.cayenne.resource.URLResource;
import org.apache.commons.dbcp.BasicDataSource;
+import org.junit.Test;
+
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class DBCPDataSourceFactoryTest extends TestCase {
+public class DBCPDataSourceFactoryTest {
+ @Test
public void testGetDataSource() throws Exception {
String baseUrl = getClass().getPackage().getName().replace('.', '/');
@@ -59,6 +62,7 @@ public class DBCPDataSourceFactoryTest extends TestCase {
assertEquals("select 1 from xyz;", basicDataSource.getValidationQuery());
}
+ @Test
public void testGetDataSource_LegacyConfig() throws Exception {
String baseUrl = getClass().getPackage().getName().replace('.', '/');
@@ -86,6 +90,7 @@ public class DBCPDataSourceFactoryTest extends TestCase {
assertEquals("select 1 from xyz;", basicDataSource.getValidationQuery());
}
+ @Test
public void testGetDataSource_InvalidLocation() throws Exception {
String baseUrl = getClass().getPackage().getName().replace('.', '/');
[3/5] Apply JUnit4 instead of JUnit3 in cayenne-server
Posted by aa...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
index 72504d8..cdb7e6b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DefaultObjectMapRetainStrategy;
@@ -44,9 +40,19 @@ import org.apache.cayenne.tx.DefaultTransactionFactory;
import org.apache.cayenne.tx.DefaultTransactionManager;
import org.apache.cayenne.tx.TransactionFactory;
import org.apache.cayenne.tx.TransactionManager;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class DataContextFactoryTest extends TestCase {
+public class DataContextFactoryTest {
+ @Test
public void testCreateDataContextWithDedicatedCache() throws Exception {
final EventManager eventManager = new MockEventManager();
@@ -84,6 +90,7 @@ public class DataContextFactoryTest extends TestCase {
domain.getSharedSnapshotCache());
}
+ @Test
public void testCreateDataContextValidation() throws Exception {
final EventManager eventManager = new MockEventManager();
final DataDomain domain = new DataDomain("d1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
index 13ff1c6..fbbbce9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
@@ -18,13 +18,6 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import static org.mockito.Mockito.mock;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.DataDomain;
@@ -82,9 +75,21 @@ import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.resource.mock.MockResource;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-public class DataDomainProviderTest extends TestCase {
+public class DataDomainProviderTest {
+ @Test
public void testGet() {
// create dependencies
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
index 8a4842e..0e7385d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import junit.framework.TestCase;
-
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
@@ -40,13 +36,22 @@ import org.apache.cayenne.log.CommonsJdbcEventLogger;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.resource.ResourceLocator;
import org.apache.cayenne.resource.mock.MockResourceLocator;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class DefaultDataSourceFactoryLoaderTest extends TestCase {
+public class DefaultDataSourceFactoryLoaderTest {
private Injector injector;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
Module testModule = new Module() {
@Override
@@ -62,6 +67,7 @@ public class DefaultDataSourceFactoryLoaderTest extends TestCase {
this.injector = DIBootstrap.createInjector(testModule);
}
+ @Test
public void testGetDataSourceFactory_Implicit() throws Exception {
DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
@@ -76,6 +82,7 @@ public class DefaultDataSourceFactoryLoaderTest extends TestCase {
assertTrue(factory instanceof XMLPoolingDataSourceFactory);
}
+ @Test
public void testGetDataSourceFactory_Explicit() throws Exception {
DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
@@ -92,6 +99,7 @@ public class DefaultDataSourceFactoryLoaderTest extends TestCase {
((MockDataSourceFactory1) factory).getInjector());
}
+ @Test
public void testGetDataSourceFactory_Property() throws Exception {
final RuntimeProperties properties = mock(RuntimeProperties.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
index 4835ae6..45fad97 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
@@ -18,17 +18,8 @@
****************************************************************/
package org.apache.cayenne.configuration.server;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
+import com.mockrunner.mock.jdbc.MockConnection;
+import com.mockrunner.mock.jdbc.MockDataSource;
import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataNodeDescriptor;
@@ -50,12 +41,23 @@ import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.ResourceLocator;
+import org.junit.Test;
-import com.mockrunner.mock.jdbc.MockConnection;
-import com.mockrunner.mock.jdbc.MockDataSource;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class DefaultDbAdapterFactoryTest extends TestCase {
+public class DefaultDbAdapterFactoryTest {
+ @Test
public void testCreatedAdapter_Auto() throws Exception {
final DbAdapter adapter = mock(DbAdapter.class);
@@ -96,6 +98,7 @@ public class DefaultDbAdapterFactoryTest extends TestCase {
assertEquals("XXXXX", createdAdapter.createTable(new DbEntity("Test")));
}
+ @Test
public void testCreatedAdapter_Generic() throws Exception {
List<DbAdapterDetector> detectors = new ArrayList<DbAdapterDetector>();
@@ -128,6 +131,7 @@ public class DefaultDbAdapterFactoryTest extends TestCase {
assertEquals("CREATE TABLE Test ()", createdAdapter.createTable(new DbEntity("Test")));
}
+ @Test
public void testCreatedAdapter_Custom() throws Exception {
DataNodeDescriptor nodeDescriptor = new DataNodeDescriptor();
@@ -162,6 +166,7 @@ public class DefaultDbAdapterFactoryTest extends TestCase {
assertTrue("Unexpected class: " + createdAdapter.getClass().getName(), createdAdapter instanceof SybaseAdapter);
}
+ @Test
public void testCreatedAdapter_AutoExplicit() throws Exception {
final DbAdapter adapter = mock(DbAdapter.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
index f22ae1f..ab8c687 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/CayenneFilterTest.java
@@ -18,27 +18,31 @@
****************************************************************/
package org.apache.cayenne.configuration.web;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
+import com.mockrunner.mock.web.MockFilterChain;
+import com.mockrunner.mock.web.MockFilterConfig;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+import com.mockrunner.mock.web.MockServletContext;
import org.apache.cayenne.configuration.CayenneRuntime;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.ModuleCollection;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
+import org.junit.Test;
-import com.mockrunner.mock.web.MockFilterChain;
-import com.mockrunner.mock.web.MockFilterConfig;
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpServletResponse;
-import com.mockrunner.mock.web.MockServletContext;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-public class CayenneFilterTest extends TestCase {
+public class CayenneFilterTest {
+ @Test
public void testInitWithFilterName() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -61,6 +65,7 @@ public class CayenneFilterTest extends TestCase {
assertEquals(Arrays.asList("abc.xml"), locations);
}
+ @Test
public void testInitWithLocation() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -81,6 +86,7 @@ public class CayenneFilterTest extends TestCase {
assertEquals(Arrays.asList("xyz"), locations);
}
+ @Test
public void testInitWithStandardModules() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -112,6 +118,7 @@ public class CayenneFilterTest extends TestCase {
assertTrue(handler instanceof SessionContextRequestHandler);
}
+ @Test
public void testInitWithExtraModules() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -141,6 +148,7 @@ public class CayenneFilterTest extends TestCase {
assertTrue(handler instanceof MockRequestHandler);
}
+ @Test
public void testDoFilter() throws Exception {
MockFilterConfig config = new MockFilterConfig();
config.setFilterName("abc");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
index 2fa1d8e..c160ae8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/ServletContextHandlerTest.java
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.cayenne.configuration.web;
-import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
-
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+import com.mockrunner.mock.web.MockHttpSession;
import org.apache.cayenne.BaseContext;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.MockDataChannel;
@@ -30,13 +30,17 @@ import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
+import org.junit.Test;
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpServletResponse;
-import com.mockrunner.mock.web.MockHttpSession;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
-public class ServletContextHandlerTest extends TestCase {
+public class ServletContextHandlerTest {
+ @Test
public void testRequestStart_bindContext() {
Module module = new Module() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebConfigurationTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebConfigurationTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebConfigurationTest.java
index 4c159d0..0183163 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebConfigurationTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebConfigurationTest.java
@@ -18,20 +18,24 @@
****************************************************************/
package org.apache.cayenne.configuration.web;
+import com.mockrunner.mock.web.MockFilterConfig;
+import com.mockrunner.mock.web.MockServletConfig;
+import org.apache.cayenne.di.Binder;
+import org.apache.cayenne.di.Module;
+import org.junit.Test;
+
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.Module;
-
-import com.mockrunner.mock.web.MockFilterConfig;
-import com.mockrunner.mock.web.MockServletConfig;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
-public class WebConfigurationTest extends TestCase {
+public class WebConfigurationTest {
+ @Test
public void testFilterCreateModules_Standard() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -57,6 +61,7 @@ public class WebConfigurationTest extends TestCase {
assertSame(m2, it.next());
}
+ @Test
public void testFilterCreateModules_Extra() throws Exception {
MockFilterConfig config = new MockFilterConfig();
@@ -90,6 +95,7 @@ public class WebConfigurationTest extends TestCase {
assertTrue(it.next() instanceof MockModule2);
}
+ @Test
public void testServletCreateModules_Extra() throws Exception {
MockServletConfig config = new MockServletConfig();
@@ -123,6 +129,7 @@ public class WebConfigurationTest extends TestCase {
assertTrue(it.next() instanceof MockModule2);
}
+ @Test
public void testFilterConfigurationLocation_Name() {
MockFilterConfig config1 = new MockFilterConfig();
config1.setFilterName("cayenne-x");
@@ -143,6 +150,7 @@ public class WebConfigurationTest extends TestCase {
assertEquals("a/b/c/cayenne-z.xml", configuration3.getConfigurationLocation());
}
+ @Test
public void testServletConfigurationLocation_Name() {
MockServletConfig config1 = new MockServletConfig();
config1.setServletName("cayenne-x");
@@ -163,6 +171,7 @@ public class WebConfigurationTest extends TestCase {
assertEquals("a/b/c/cayenne-z.xml", configuration3.getConfigurationLocation());
}
+ @Test
public void testFilterConfigurationLocation_Parameter() {
MockFilterConfig config1 = new MockFilterConfig();
config1.setFilterName("cayenne-x");
@@ -174,6 +183,7 @@ public class WebConfigurationTest extends TestCase {
assertEquals("cayenne-y.xml", configuration1.getConfigurationLocation());
}
+ @Test
public void testServletConfigurationLocation_Parameter() {
MockServletConfig config1 = new MockServletConfig();
config1.setServletName("cayenne-x");
@@ -185,6 +195,7 @@ public class WebConfigurationTest extends TestCase {
assertEquals("cayenne-y.xml", configuration1.getConfigurationLocation());
}
+ @Test
public void testFilterParameters() {
MockFilterConfig config1 = new MockFilterConfig();
config1.setFilterName("cayenne-x");
@@ -204,6 +215,7 @@ public class WebConfigurationTest extends TestCase {
assertEquals("xxx", parameters.get("test"));
}
+ @Test
public void testFilterOtherParameters() {
MockFilterConfig config1 = new MockFilterConfig();
config1.setFilterName("cayenne-x");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebModuleTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebModuleTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebModuleTest.java
index eabff28..0fd2ff2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebModuleTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebModuleTest.java
@@ -20,11 +20,14 @@ package org.apache.cayenne.configuration.web;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultInjector;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
-public class WebModuleTest extends TestCase {
+public class WebModuleTest {
+ @Test
public void testBind_Scopes() {
Injector injector = new DefaultInjector(new WebModule());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
index d1fd3b7..5db0f43 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/configuration/web/WebUtilTest.java
@@ -18,16 +18,17 @@
****************************************************************/
package org.apache.cayenne.configuration.web;
-import static org.mockito.Mockito.mock;
-
-import org.apache.cayenne.configuration.CayenneRuntime;
-
import com.mockrunner.mock.web.MockServletContext;
+import org.apache.cayenne.configuration.CayenneRuntime;
+import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
-public class WebUtilTest extends TestCase {
+public class WebUtilTest {
+ @Test
public void testGetCayenneRuntime() {
MockServletContext context = new MockServletContext();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java b/cayenne-server/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
index af182eb..e35fae5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
@@ -19,15 +19,18 @@
package org.apache.cayenne.conn;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class DataSourceInfoTest extends TestCase {
+public class DataSourceInfoTest {
private DataSourceInfo dsi;
- @Override
+ @Before
public void setUp() throws Exception {
dsi = new DataSourceInfo();
dsi.setUserName("a");
@@ -39,18 +42,21 @@ public class DataSourceInfoTest extends TestCase {
dsi.setAdapterClassName("d");
}
+ @Test
public void testDefaultValues() throws java.lang.Exception {
DataSourceInfo localDsi = new DataSourceInfo();
assertEquals(1, localDsi.getMinConnections());
assertTrue(localDsi.getMinConnections() <= localDsi.getMaxConnections());
}
+ @Test
public void testClone() throws java.lang.Exception {
DataSourceInfo dsiClone = dsi.cloneInfo();
assertEquals(dsi, dsiClone);
assertTrue(dsi != dsiClone);
}
+ @Test
public void testSerialize() throws java.lang.Exception {
DataSourceInfo dsiUnserialized = Util.cloneViaSerialization(dsi);
assertEquals(dsi, dsiUnserialized);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/conn/DriverDataSourceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/conn/DriverDataSourceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/conn/DriverDataSourceTest.java
index f63b4c9..bd3ecd7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/conn/DriverDataSourceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/conn/DriverDataSourceTest.java
@@ -18,12 +18,16 @@
****************************************************************/
package org.apache.cayenne.conn;
+import org.junit.Test;
+
import java.sql.SQLException;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
-public class DriverDataSourceTest extends TestCase {
+public class DriverDataSourceTest {
+ @Test
public void testLazyInstantiationOfDriverClass() {
DriverDataSource dataSource = new DriverDataSource("does.not.exist.Driver", "jdbc:postgresql://localhost/database");
assertNotNull(dataSource);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java b/cayenne-server/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java
index 755dd53..e829372 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java
@@ -19,10 +19,11 @@
package org.apache.cayenne.conn;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class PooledConnectionImplTest extends TestCase {
+public class PooledConnectionImplTest {
+ @Test
public void testConnectionErrorNotificationConcurrency() throws Exception {
// test a case when error notification is sent to connection
// that has been removed from the pool, but when pool is still a
@@ -36,6 +37,7 @@ public class PooledConnectionImplTest extends TestCase {
con.connectionErrorNotification(new java.sql.SQLException("Bad SQL Exception.."));
}
+ @Test
public void testConnectionClosedNotificationConcurrency() throws Exception {
// test a case when closed notification is sent to connection
// that has been removed from the pool, but when pool is still a
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/dba/DefaultQuotingStrategyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/DefaultQuotingStrategyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/DefaultQuotingStrategyTest.java
index 7d825a7..27d725e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/DefaultQuotingStrategyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/DefaultQuotingStrategyTest.java
@@ -18,13 +18,15 @@
****************************************************************/
package org.apache.cayenne.dba;
-import junit.framework.TestCase;
-
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
-public class DefaultQuotingStrategyTest extends TestCase {
+public class DefaultQuotingStrategyTest {
+ @Test
public void testQuotedIdentifer() {
DataMap dm = new DataMap();
@@ -38,6 +40,7 @@ public class DefaultQuotingStrategyTest extends TestCase {
assertEquals("[c].[b].[a]", strategy.quotedIdentifier(de, "c", "b", "a"));
}
+ @Test
public void testUnQuotedIdentifer() {
DataMap dm = new DataMap();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
index 1293135..1db9cb0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/oracle/OracleUtilDateTypeTest.java
@@ -19,13 +19,17 @@
package org.apache.cayenne.dba.oracle;
+import org.junit.Test;
+
import java.util.Calendar;
import java.util.Date;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-public class OracleUtilDateTypeTest extends TestCase {
+public class OracleUtilDateTypeTest {
+ @Test
public void testNormalizeDate() throws Exception {
Date date = new Date();
Date timeNormalized = new OracleUtilDateType().normalizeDate(date);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
index c1a70b3..6dd0d9e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLExpressionTest.java
@@ -18,10 +18,14 @@
****************************************************************/
package org.apache.cayenne.ejbql;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EJBQLExpressionTest extends TestCase {
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+public class EJBQLExpressionTest {
+
+ @Test
public void testDbPath() {
EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -31,6 +35,7 @@ public class EJBQLExpressionTest extends TestCase {
assertNotNull(select);
}
+ @Test
public void testEnumPath() {
EJBQLParser parser = EJBQLParserFactory.getParser();
@@ -42,7 +47,7 @@ public class EJBQLExpressionTest extends TestCase {
/**
* <p>This should not parse because there are multiple non-bracketed parameters.</p>
*/
-
+ @Test
public void testInWithMultipleStringPositionalParameter_withoutBrackets() {
EJBQLParser parser = EJBQLParserFactory.getParser();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLParserFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLParserFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLParserFactoryTest.java
index ba6b39c..7d9e081 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLParserFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/EJBQLParserFactoryTest.java
@@ -18,15 +18,19 @@
****************************************************************/
package org.apache.cayenne.ejbql;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EJBQLParserFactoryTest extends TestCase {
+import static org.junit.Assert.assertNotNull;
+public class EJBQLParserFactoryTest {
+
+ @Test
public void testGetParser() {
EJBQLParser parser = EJBQLParserFactory.getParser();
assertNotNull(parser);
}
+ @Test
public void testDefaultParser() {
EJBQLParser parser = EJBQLParserFactory.getParser();
EJBQLExpression parsedSelect = parser.parse("select a from b");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/ejbql/parser/EJBQLPathTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/parser/EJBQLPathTest.java b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/parser/EJBQLPathTest.java
index 0697c17..fad76ce 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/ejbql/parser/EJBQLPathTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/ejbql/parser/EJBQLPathTest.java
@@ -18,10 +18,13 @@
****************************************************************/
package org.apache.cayenne.ejbql.parser;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class EJBQLPathTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class EJBQLPathTest {
+
+ @Test
public void testGetAbsolutePath() {
EJBQLPath path = new EJBQLPath(-1);
EJBQLIdentifier id = new EJBQLIdentifier(-1);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/DefaultEventManagerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/DefaultEventManagerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/DefaultEventManagerTest.java
index d7e2e18..93f8a3f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/DefaultEventManagerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/DefaultEventManagerTest.java
@@ -19,15 +19,16 @@
package org.apache.cayenne.event;
+import org.apache.cayenne.test.parallel.ParallelTestContainer;
+import org.junit.Before;
+import org.junit.Test;
+
import java.util.EventListener;
import java.util.EventObject;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.test.parallel.ParallelTestContainer;
+import static org.junit.Assert.*;
-public class DefaultEventManagerTest extends TestCase implements EventListener {
+public class DefaultEventManagerTest implements EventListener {
// used for counting received events on the class
public static int numberOfReceivedEventsForClass;
@@ -38,13 +39,14 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
// the event manager used for testing
private EventManager eventManager;
- @Override
+ @Before
public void setUp() {
eventManager = new DefaultEventManager();
numberOfReceivedEvents = 0;
numberOfReceivedEventsForClass = 0;
}
+ @Test
public void testSubjectListenerWouldRegisterListener() {
MockListener listener = new MockListener(eventManager);
@@ -69,6 +71,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
eventManager.postEvent(new EventObject(this), MockListener.mockSubject);
}
+ @Test
public void testObjectListenerWouldRegisterListener() {
MockListener listener = new MockListener(eventManager, this);
@@ -95,11 +98,12 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
eventManager.postEvent(new EventObject(this), MockListener.mockSubject);
}
+ @Test
public void testNullListener() {
try {
EventSubject subject = EventSubject.getSubject(this.getClass(), "hansi");
eventManager.addListener(null, null, null, subject);
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException ia) {
@@ -107,11 +111,12 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
}
}
+ @Test
public void testNullNotification() {
// null notification
try {
eventManager.addListener(this, "testNullObserver", CayenneEvent.class, null);
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException e) {
@@ -122,7 +127,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
try {
EventSubject subject = EventSubject.getSubject(this.getClass(), "");
eventManager.addListener(this, "testNullObserver", null, subject);
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException e) {
@@ -137,7 +142,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
"testNullObserver",
CayenneEvent.class,
subject);
- Assert.fail();
+ fail();
}
catch (IllegalArgumentException e) {
@@ -145,6 +150,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
}
}
+ @Test
public void testNonexistingMethod() {
try {
EventSubject subject = EventSubject.getSubject(this.getClass(), "hansi");
@@ -153,7 +159,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
"thisMethodDoesNotExist",
CayenneEvent.class,
subject);
- Assert.fail();
+ fail();
}
catch (RuntimeException e) {
@@ -161,6 +167,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
}
}
+ @Test
public void testInvalidArgumentTypes() {
try {
EventSubject subject = EventSubject.getSubject(this.getClass(), "hansi");
@@ -169,7 +176,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
"seeTheWrongMethod",
CayenneEvent.class,
subject);
- Assert.fail();
+ fail();
}
catch (RuntimeException e) {
@@ -177,6 +184,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
}
}
+ @Test
public void testNonretainedListener() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -190,9 +198,10 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
System.gc();
eventManager.postEvent(new CayenneEvent(this), subject);
- Assert.assertEquals(0, numberOfReceivedEventsForClass);
+ assertEquals(0, numberOfReceivedEventsForClass);
}
+ @Test
public void testValidSubclassOfRegisteredEventClass() throws Exception {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(this, "seeNotification", CayenneEvent.class, subject);
@@ -201,6 +210,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEvents(1, this);
}
+ @Test
public void testWrongRegisteredEventClass() throws Exception {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
@@ -213,6 +223,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEvents(0, this);
}
+ @Test
public void testSuccessfulNotificationDefaultSender() throws Exception {
DefaultEventManagerTest listener1 = this;
DefaultEventManagerTest listener2 = new DefaultEventManagerTest();
@@ -236,6 +247,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEventsForClass(2);
}
+ @Test
public void testSuccessfulNotificationIndividualSender() throws Exception {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -250,6 +262,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEventsForClass(1);
}
+ @Test
public void testSuccessfulNotificationIndividualSenderTwice() throws Exception {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(this, "seeNotification", CayenneEvent.class, subject);
@@ -265,6 +278,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEventsForClass(2);
}
+ @Test
public void testSuccessfulNotificationBothDefaultAndIndividualSender()
throws Exception {
DefaultEventManagerTest listener1 = this;
@@ -290,22 +304,26 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
assertReceivedEventsForClass(2);
}
+ @Test
public void testRemoveOnEmptyList() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
- Assert.assertFalse(eventManager.removeListener(this, subject));
+ assertFalse(eventManager.removeListener(this, subject));
}
+ @Test
public void testRemoveOnNullSubject() {
- Assert.assertFalse(eventManager.removeListener(this, null));
+ assertFalse(eventManager.removeListener(this, null));
}
+ @Test
public void testRemoveFromDefaultQueue() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(this, "seeNotification", CayenneEvent.class, subject);
- Assert.assertTrue(eventManager.removeListener(this, subject));
- Assert.assertFalse(eventManager.removeListener(this));
+ assertTrue(eventManager.removeListener(this, subject));
+ assertFalse(eventManager.removeListener(this));
}
+ @Test
public void testRemoveSpecificQueue() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -314,10 +332,11 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
CayenneEvent.class,
subject,
this);
- Assert.assertTrue(eventManager.removeListener(this, subject));
- Assert.assertFalse(eventManager.removeListener(this));
+ assertTrue(eventManager.removeListener(this, subject));
+ assertFalse(eventManager.removeListener(this));
}
+ @Test
public void testRemoveSpecificSender() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -326,10 +345,11 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
CayenneEvent.class,
subject,
this);
- Assert.assertTrue(eventManager.removeListener(this, subject, this));
- Assert.assertFalse(eventManager.removeListener(this));
+ assertTrue(eventManager.removeListener(this, subject, this));
+ assertFalse(eventManager.removeListener(this));
}
+ @Test
public void testRemoveNullSender() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -338,10 +358,11 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
CayenneEvent.class,
subject,
this);
- Assert.assertTrue(eventManager.removeListener(this, subject, null));
- Assert.assertFalse(eventManager.removeListener(this));
+ assertTrue(eventManager.removeListener(this, subject, null));
+ assertFalse(eventManager.removeListener(this));
}
+ @Test
public void testRemoveNonexistingSender() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(
@@ -350,10 +371,11 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
CayenneEvent.class,
subject,
this);
- Assert.assertFalse(eventManager.removeListener(this, subject, "foo"));
- Assert.assertTrue(eventManager.removeListener(this));
+ assertFalse(eventManager.removeListener(this, subject, "foo"));
+ assertTrue(eventManager.removeListener(this));
}
+ @Test
public void testRemoveAll() {
EventSubject subject1 = EventSubject.getSubject(this.getClass(), "XXX1");
EventSubject subject2 = EventSubject.getSubject(this.getClass(), "XXX2");
@@ -367,13 +389,14 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
subject3,
this);
- Assert.assertTrue(eventManager.removeListener(this));
- Assert.assertFalse(eventManager.removeListener(this));
- Assert.assertFalse(eventManager.removeListener(this, subject1));
- Assert.assertFalse(eventManager.removeListener(this, subject2));
- Assert.assertFalse(eventManager.removeListener(this, subject3));
+ assertTrue(eventManager.removeListener(this));
+ assertFalse(eventManager.removeListener(this));
+ assertFalse(eventManager.removeListener(this, subject1));
+ assertFalse(eventManager.removeListener(this, subject2));
+ assertFalse(eventManager.removeListener(this, subject3));
}
+ @Test
public void testSubjectGarbageCollection() {
EventSubject subject = EventSubject.getSubject(this.getClass(), "XXX");
eventManager.addListener(this, "seeNotification", CayenneEvent.class, subject);
@@ -383,7 +406,7 @@ public class DefaultEventManagerTest extends TestCase implements EventListener {
System.gc();
System.gc();
- Assert.assertFalse(eventManager.removeListener(this));
+ assertFalse(eventManager.removeListener(this));
}
// notification method
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/EventBridgeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/EventBridgeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/EventBridgeTest.java
index 818e780..dd76077 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/EventBridgeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/EventBridgeTest.java
@@ -19,17 +19,22 @@
package org.apache.cayenne.event;
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.access.event.SnapshotEvent;
import org.apache.cayenne.test.parallel.ParallelTestContainer;
+import org.junit.Test;
+
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class EventBridgeTest extends TestCase {
+public class EventBridgeTest {
+ @Test
public void testConstructor() throws Exception {
EventSubject local = EventSubject
.getSubject(EventBridgeTest.class, "testInstall");
@@ -42,6 +47,7 @@ public class EventBridgeTest extends TestCase {
assertEquals(external, bridge.getExternalSubject());
}
+ @Test
public void testStartup() throws Exception {
EventSubject local = EventSubject
.getSubject(EventBridgeTest.class, "testInstall");
@@ -64,6 +70,7 @@ public class EventBridgeTest extends TestCase {
assertEquals(1, bridge.shutdownCalls);
}
+ @Test
public void testShutdown() throws Exception {
EventSubject local = EventSubject
.getSubject(EventBridgeTest.class, "testInstall");
@@ -79,6 +86,7 @@ public class EventBridgeTest extends TestCase {
assertEquals(1, bridge.shutdownCalls);
}
+ @Test
public void testSendExternalEvent() throws Exception {
final EventSubject local = EventSubject.getSubject(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/EventSubjectTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
index a3f8ae7..792a729 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/EventSubjectTest.java
@@ -19,36 +19,42 @@
package org.apache.cayenne.event;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
-public class EventSubjectTest extends TestCase {
+public class EventSubjectTest {
+ @Test
public void testIllegalArguments() {
try {
EventSubject.getSubject(null, "Subject");
- Assert.fail();
+ fail();
} catch (IllegalArgumentException ex) {
// OK
}
try {
EventSubject.getSubject(Object.class, null);
- Assert.fail();
+ fail();
} catch (IllegalArgumentException ex) {
// OK
}
try {
EventSubject.getSubject(Object.class, "");
- Assert.fail();
+ fail();
} catch (IllegalArgumentException ex) {
// OK
}
}
+ @Test
public void testEqualityOfClonedSubjects() throws Exception {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
EventSubject s2 = (EventSubject) Util.cloneViaSerialization(s1);
@@ -58,33 +64,38 @@ public class EventSubjectTest extends TestCase {
assertEquals(s1.hashCode(), s2.hashCode());
}
+ @Test
public void testIdenticalSubject() {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
EventSubject s2 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
- Assert.assertSame(s1, s2);
+ assertSame(s1, s2);
}
+ @Test
public void testEqualityOfIdenticalSubjects() {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
EventSubject s2 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
- Assert.assertEquals(s1, s2);
+ assertEquals(s1, s2);
}
+ @Test
public void testEqualityOfSubjectsByDifferentOwner() {
EventSubject s1 = EventSubject.getSubject(EventSubject.class, "MySubject");
EventSubject s2 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
- Assert.assertFalse(s1.equals(s2));
+ assertFalse(s1.equals(s2));
}
+ @Test
public void testEqualityOfSubjectsByDifferentTopic() {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "Subject1");
EventSubject s2 = EventSubject.getSubject(EventSubjectTest.class, "Subject2");
- Assert.assertFalse(s1.equals(s2));
+ assertFalse(s1.equals(s2));
}
+ @Test
public void testSubjectEqualsNull() {
EventSubject s1 = EventSubject.getSubject(EventSubjectTest.class, "MySubject");
- Assert.assertFalse(s1.equals(null));
+ assertFalse(s1.equals(null));
}
// TODO: (Andrus) This test can not be run reliably and in fact consistently
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/JGroupsBridgeFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/JGroupsBridgeFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/JGroupsBridgeFactoryTest.java
index 686fb3d..3a6b6c1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/JGroupsBridgeFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/JGroupsBridgeFactoryTest.java
@@ -19,15 +19,18 @@
package org.apache.cayenne.event;
+import org.junit.Test;
+
import java.util.Collection;
import java.util.Collections;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
/**
*/
-public class JGroupsBridgeFactoryTest extends TestCase {
+public class JGroupsBridgeFactoryTest {
+ @Test
public void testCreateEventBridge() throws Exception {
Collection subjects = Collections.singleton(new EventSubject("test"));
EventBridge bridge = new JavaGroupsBridgeFactory().createEventBridge(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeFactoryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeFactoryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeFactoryTest.java
index af6a696..4eac54a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeFactoryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeFactoryTest.java
@@ -19,15 +19,19 @@
package org.apache.cayenne.event;
+import org.junit.Test;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class XMPPBridgeFactoryTest extends TestCase {
+public class XMPPBridgeFactoryTest {
+ @Test
public void testCreateEventBridge() {
XMPPBridgeFactory factory = new XMPPBridgeFactory();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeTest.java
index 310828c..d3d0a80 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/event/XMPPBridgeTest.java
@@ -19,15 +19,21 @@
package org.apache.cayenne.event;
+import org.junit.Test;
+
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
*/
-public class XMPPBridgeTest extends TestCase {
+public class XMPPBridgeTest {
+ @Test
public void testEventSerialization() throws Exception {
Map info = new HashMap();
info.put("a", "b");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/BooleanExpressionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/BooleanExpressionTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/BooleanExpressionTest.java
index db76731..a305cf9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/BooleanExpressionTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/BooleanExpressionTest.java
@@ -18,11 +18,15 @@
****************************************************************/
package org.apache.cayenne.exp;
-import junit.framework.TestCase;
-
import org.apache.cayenne.testdo.testmap.BooleanTestEntity;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class BooleanExpressionTest {
-public class BooleanExpressionTest extends TestCase {
+ @Test
public void testCAY1185() {
Expression expTrue = Expression.fromString("booleanColumn = true");
Expression expFalse = Expression.fromString("booleanColumn = false");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java
index 89af885..39ee644 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionEqualsTest.java
@@ -19,12 +19,16 @@
package org.apache.cayenne.exp;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
/**
*/
-public class ExpressionEqualsTest extends TestCase {
+public class ExpressionEqualsTest {
+ @Test
public void testEquals3() throws Exception {
Expression e1 = ExpressionFactory.matchExp("aa", "3");
Expression e2 = ExpressionFactory.matchExp("aa", "3");
@@ -33,6 +37,7 @@ public class ExpressionEqualsTest extends TestCase {
assertFalse(e2.equals(e3));
}
+ @Test
public void testEquals4() throws Exception {
Expression e1 = ExpressionFactory.matchExp("aa", "3").andExp(
ExpressionFactory.matchExp("aa", "4"));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
index 2b6752d..124952a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionParameterTest.java
@@ -19,10 +19,13 @@
package org.apache.cayenne.exp;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class ExpressionParameterTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class ExpressionParameterTest {
+
+ @Test
public void testConstructor() throws Exception {
ExpressionParameter p = new ExpressionParameter("abc");
assertEquals("abc", p.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
index 161effa..be442b7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
@@ -19,25 +19,29 @@
package org.apache.cayenne.exp;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
-public class ExpressionTraversalTest extends TestCase {
+public class ExpressionTraversalTest {
private TstTraversalHandler handler;
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
handler = new TstTraversalHandler();
}
+ @Test
public void testUnary() throws Exception {
doExpressionTest(new TstUnaryExpSuite());
}
+ @Test
public void testBinary() throws Exception {
doExpressionTest(new TstBinaryExpSuite());
}
+ @Test
public void testTernary() throws Exception {
doExpressionTest(new TstTernaryExpSuite());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
index 6bbd90d..7e262f9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/PropertyTest.java
@@ -18,17 +18,21 @@
****************************************************************/
package org.apache.cayenne.exp;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.reflect.TstJavaBean;
import org.apache.cayenne.reflect.UnresolvablePathException;
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class PropertyTest extends TestCase {
+public class PropertyTest {
+ @Test
public void testIn() {
Property<String> p = new Property<String>("x.y");
@@ -41,14 +45,16 @@ public class PropertyTest extends TestCase {
Expression e3 = p.in(Arrays.asList("a", "b"));
assertEquals("x.y in (\"a\", \"b\")", e3.toString());
}
-
+
+ @Test
public void testGetFrom() {
TstJavaBean bean = new TstJavaBean();
bean.setIntField(7);
final Property<Integer> INT_FIELD = new Property<Integer>("intField");
assertEquals(Integer.valueOf(7), INT_FIELD.getFrom(bean));
}
-
+
+ @Test
public void testGetFromNestedProperty() {
TstJavaBean bean = new TstJavaBean();
TstJavaBean nestedBean = new TstJavaBean();
@@ -57,7 +63,8 @@ public class PropertyTest extends TestCase {
final Property<Integer> OBJECT_FIELD_INT_FIELD = new Property<Integer>("objectField.intField");
assertEquals(Integer.valueOf(7), OBJECT_FIELD_INT_FIELD.getFrom(bean));
}
-
+
+ @Test
public void testGetFromNestedNull() {
TstJavaBean bean = new TstJavaBean();
bean.setObjectField(null);
@@ -72,7 +79,8 @@ public class PropertyTest extends TestCase {
}
}
}
-
+
+ @Test
public void testGetFromAll() {
TstJavaBean bean = new TstJavaBean();
bean.setIntField(7);
@@ -85,14 +93,16 @@ public class PropertyTest extends TestCase {
final Property<Integer> INT_FIELD = new Property<Integer>("intField");
assertEquals(Arrays.asList(7, 8), INT_FIELD.getFromAll(beans));
}
-
+
+ @Test
public void testSetIn() {
TstJavaBean bean = new TstJavaBean();
final Property<Integer> INT_FIELD = new Property<Integer>("intField");
INT_FIELD.setIn(bean, 7);
assertEquals(7, bean.getIntField());
}
-
+
+ @Test
public void testSetInNestedProperty() {
TstJavaBean bean = new TstJavaBean();
bean.setObjectField(new TstJavaBean());
@@ -102,7 +112,8 @@ public class PropertyTest extends TestCase {
OBJECT_FIELD_INT_FIELD.setIn(bean, 7);
assertEquals(7, ((TstJavaBean)bean.getObjectField()).getIntField());
}
-
+
+ @Test
public void testSetInNestedNull() {
TstJavaBean bean = new TstJavaBean();
bean.setObjectField(null);
@@ -117,7 +128,8 @@ public class PropertyTest extends TestCase {
}
}
}
-
+
+ @Test
public void testSetInAll() {
TstJavaBean bean = new TstJavaBean();
TstJavaBean bean2 = new TstJavaBean();
@@ -128,7 +140,8 @@ public class PropertyTest extends TestCase {
assertEquals(7, bean.getIntField());
assertEquals(7, bean2.getIntField());
}
-
+
+ @Test
public void testEquals() {
final Property<Integer> INT_FIELD = new Property<Integer>("intField");
final Property<Integer> INT_FIELD2 = new Property<Integer>("intField");
@@ -136,7 +149,8 @@ public class PropertyTest extends TestCase {
assertTrue(INT_FIELD != INT_FIELD2);
assertTrue(INT_FIELD.equals(INT_FIELD2));
}
-
+
+ @Test
public void testHashCode() {
final Property<Integer> INT_FIELD = new Property<Integer>("intField");
final Property<Integer> INT_FIELD2 = new Property<Integer>("intField");
@@ -145,7 +159,8 @@ public class PropertyTest extends TestCase {
assertTrue(INT_FIELD.hashCode() == INT_FIELD2.hashCode());
assertTrue(INT_FIELD.hashCode() != LONG_FIELD.hashCode());
}
-
+
+ @Test
public void testOuter() {
Property<String> inner = new Property<String>("xyz");
assertEquals("xyz+", inner.outer().getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathTest.java
index a43ba7d..e09f539 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbPathTest.java
@@ -18,16 +18,20 @@
****************************************************************/
package org.apache.cayenne.exp.parser;
+import org.junit.Test;
+
import java.io.IOException;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class ASTDbPathTest extends TestCase {
+public class ASTDbPathTest {
+ @Test
public void testToString() {
assertEquals("db:x.y", new ASTDbPath("x.y").toString());
}
+ @Test
public void testAppendAsString() throws IOException {
StringBuilder buffer = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCaseTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCaseTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCaseTest.java
index 4d3c156..713e7d8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCaseTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTLikeIgnoreCaseTest.java
@@ -18,12 +18,15 @@
****************************************************************/
package org.apache.cayenne.exp.parser;
-import junit.framework.TestCase;
-
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ASTLikeIgnoreCaseTest {
-public class ASTLikeIgnoreCaseTest extends TestCase {
+ @Test
public void testToEJBQL() {
Expression like = ExpressionFactory.likeIgnoreCaseExp("a", "%b%");
assertEquals(like.toEJBQL("p"), "upper(p.a) like '%B%'");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTListTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTListTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTListTest.java
index 280d728..c62c373 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTListTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTListTest.java
@@ -18,20 +18,21 @@
****************************************************************/
package org.apache.cayenne.exp.parser;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
-import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.Persistent;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class ASTListTest extends TestCase {
+public class ASTListTest {
+ @Test
public void testConstructorWithCollection() {
ObjectId objectId = new ObjectId("Artist", "ARTIST_ID", 1);
Persistent artist = mock(Persistent.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
index 90ab24e..72df7f9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTObjPathTest.java
@@ -18,16 +18,20 @@
****************************************************************/
package org.apache.cayenne.exp.parser;
+import org.junit.Test;
+
import java.io.IOException;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-public class ASTObjPathTest extends TestCase {
+public class ASTObjPathTest {
+ @Test
public void testToString() {
assertEquals("x.y", new ASTObjPath("x.y").toString());
}
+ @Test
public void testEncodeAsString() throws IOException {
StringBuilder buffer = new StringBuilder();
new ASTObjPath("x.y").appendAsString(buffer);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/EvaluatorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/EvaluatorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/EvaluatorTest.java
index 4a1c51f..2ae24dc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/EvaluatorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/EvaluatorTest.java
@@ -18,20 +18,24 @@
****************************************************************/
package org.apache.cayenne.exp.parser;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
+import org.junit.Test;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import org.apache.cayenne.ObjectId;
-import org.apache.cayenne.Persistent;
-
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-public class EvaluatorTest extends TestCase {
+public class EvaluatorTest {
+ @Test
public void testEvaluator_Null() {
Evaluator e = Evaluator.evaluator(null);
assertNotNull(e);
@@ -39,6 +43,7 @@ public class EvaluatorTest extends TestCase {
assertFalse(e.eq(null, new Object()));
}
+ @Test
public void testEvaluator_Object() {
Object o = new Object();
Evaluator e = Evaluator.evaluator(o);
@@ -47,6 +52,7 @@ public class EvaluatorTest extends TestCase {
assertFalse(e.eq(o, null));
}
+ @Test
public void testEvaluator_Number() {
Evaluator e = Evaluator.evaluator(1);
@@ -57,6 +63,7 @@ public class EvaluatorTest extends TestCase {
assertFalse(e.eq(1, 1.1));
}
+ @Test
public void testEvaluator_BigDecimal() {
Object lhs = new BigDecimal("1.10");
Evaluator e = Evaluator.evaluator(lhs);
@@ -68,6 +75,7 @@ public class EvaluatorTest extends TestCase {
assertEquals(-1, c.intValue());
}
+ @Test
public void testEvaluator_Persistent() {
ObjectId lhsId = new ObjectId("X", "k", 3);
@@ -94,6 +102,7 @@ public class EvaluatorTest extends TestCase {
assertFalse(e.eq(lhs, 4));
}
+ @Test
public void testEvaluator_Persistent_StringId() {
ObjectId lhsId = new ObjectId("X", "k", "A");
@@ -120,6 +129,7 @@ public class EvaluatorTest extends TestCase {
assertFalse(e.eq(lhs, "B"));
}
+ @Test
public void testEvaluator_Persistent_MultiKey() {
Map<String, Object> lhsIdMap = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/graph/GraphMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/graph/GraphMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/graph/GraphMapTest.java
index b488182..7487d37 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/graph/GraphMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/graph/GraphMapTest.java
@@ -19,12 +19,19 @@
package org.apache.cayenne.graph;
+import org.junit.Test;
+
import java.util.Collection;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-public class GraphMapTest extends TestCase {
+public class GraphMapTest {
+ @Test
public void testRegisterNode() {
GraphMap map = new GraphMap();
Object node = new Object();
@@ -33,6 +40,7 @@ public class GraphMapTest extends TestCase {
assertSame(node, map.getNode("key"));
}
+ @Test
public void testRegisteredNodes() {
GraphMap map = new GraphMap();
Object n1 = new Object();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java b/cayenne-server/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java
index 7f0d011..bc07819 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/graph/NodeDiffTest.java
@@ -19,16 +19,21 @@
package org.apache.cayenne.graph;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class NodeDiffTest extends TestCase {
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+public class NodeDiffTest {
+
+ @Test
public void testGetNodeId() {
Object id = new Object();
NodeDiff diff = new MockNodeDiff(id);
assertSame(id, diff.getNodeId());
}
+ @Test
public void testCompareTo() {
NodeDiff d1 = new MockNodeDiff("x", 1);
NodeDiff d2 = new MockNodeDiff("y", 2);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
index d1fb2f9..7e421df 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/log/CommonsJdbcEventLoggerTest.java
@@ -18,15 +18,18 @@
****************************************************************/
package org.apache.cayenne.log;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.util.IDUtil;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-public class CommonsJdbcEventLoggerTest extends TestCase {
+public class CommonsJdbcEventLoggerTest {
+ @Test
public void testSqlLiteralForObject() throws Exception {
StringBuilder buf = new StringBuilder();
@@ -35,6 +38,7 @@ public class CommonsJdbcEventLoggerTest extends TestCase {
assertTrue(buf.length() > 0);
}
+ @Test
public void testAppendFormattedByte() throws Exception {
assertFormatting((byte) 0, "00");
assertFormatting((byte) 1, "01");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/AttributeTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/AttributeTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/AttributeTest.java
index daaee6c..757c57c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/AttributeTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/AttributeTest.java
@@ -19,10 +19,14 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class AttributeTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+public class AttributeTest {
+
+ @Test
public void testName() throws Exception {
Attribute a = new MockAttribute();
@@ -31,6 +35,7 @@ public class AttributeTest extends TestCase {
assertEquals(tstName, a.getName());
}
+ @Test
public void testEntity() throws Exception {
Attribute a = new MockAttribute();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackDescriptorTest.java
index aba916a..42ab4e5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackDescriptorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackDescriptorTest.java
@@ -18,15 +18,19 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class CallbackDescriptorTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class CallbackDescriptorTest {
+
+ @Test
public void testConstructor() {
CallbackDescriptor m = new CallbackDescriptor(LifecycleEvent.POST_LOAD);
assertEquals(LifecycleEvent.POST_LOAD, m.getCallbackType());
}
+ @Test
public void testAddCallbackMethod() {
CallbackDescriptor m = new CallbackDescriptor(LifecycleEvent.POST_ADD);
assertEquals(0, m.getCallbackMethods().size());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackMapTest.java
index 1bac225..ce69ca3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/CallbackMapTest.java
@@ -18,10 +18,13 @@
****************************************************************/
package org.apache.cayenne.map;
-import junit.framework.TestCase;
+import org.junit.Test;
-public class CallbackMapTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+public class CallbackMapTest {
+
+ @Test
public void testGetCallbacks() {
CallbackDescriptor[] callbacks = new CallbackMap().getCallbacks();
assertEquals(LifecycleEvent.values().length, callbacks.length);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java
index 35fbd4e..21b9be6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ClientObjectRelationshipTest.java
@@ -19,12 +19,15 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.util.Util;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
-public class ClientObjectRelationshipTest extends TestCase {
+public class ClientObjectRelationshipTest {
+ @Test
public void testSerializability() throws Exception {
ClientObjRelationship r1 = new ClientObjRelationship("r1", "rr1", true, true);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6640dd9/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
index 0e2e966..042b0cc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
@@ -19,25 +19,29 @@
package org.apache.cayenne.map;
-import junit.framework.TestCase;
-
import org.apache.cayenne.query.MockQuery;
import org.apache.cayenne.query.Query;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
/**
* Test case for recursive lookup of DataMap resources via a parent
* namespace.
*
*/
-public class DataMapNamespaceTest extends TestCase {
+public class DataMapNamespaceTest {
+
protected DataMap map;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
map = new DataMap();
}
+ @Test
public void testNamespace() {
assertNull(map.getNamespace());
@@ -49,6 +53,7 @@ public class DataMapNamespaceTest extends TestCase {
assertNull(map.getNamespace());
}
+ @Test
public void testGetDbEntity() {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
@@ -66,6 +71,7 @@ public class DataMapNamespaceTest extends TestCase {
assertSame(e1, map.getDbEntity("entity"));
}
+ @Test
public void testGetObjEntity() throws Exception {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
@@ -83,6 +89,7 @@ public class DataMapNamespaceTest extends TestCase {
assertSame(e1, map.getObjEntity("entity"));
}
+ @Test
public void testGetProcedure() throws Exception {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
@@ -100,6 +107,7 @@ public class DataMapNamespaceTest extends TestCase {
assertSame(p1, map.getProcedure("procedure"));
}
+ @Test
public void testGetQuery() throws Exception {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
[5/5] git commit: Merge Pull request #23 ,
commit f6640dd9033330cb863fb425160492f4873c8319
Posted by aa...@apache.org.
Merge Pull request #23 , commit f6640dd9033330cb863fb425160492f4873c8319
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4fb3e9e7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4fb3e9e7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4fb3e9e7
Branch: refs/heads/master
Commit: 4fb3e9e7e1599499118ade12e8a32e249606f930
Parents: 5043aeb f6640dd
Author: aadamchik <aa...@apache.org>
Authored: Sun Nov 2 10:16:52 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Sun Nov 2 10:17:27 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/BaseContextTest.java | 22 +++--
.../apache/cayenne/CayenneExceptionTest.java | 15 +++-
.../cayenne/CayenneRuntimeExceptionTest.java | 21 ++++-
.../org/apache/cayenne/ConfigExceptionTest.java | 13 ++-
.../cayenne/ContextStateRecorderTest.java | 13 ++-
.../java/org/apache/cayenne/DataRowTest.java | 7 +-
.../cayenne/ObjectContextChangeLogTest.java | 13 ++-
.../apache/cayenne/ObjectIdRegressionTest.java | 7 +-
.../java/org/apache/cayenne/ObjectIdTest.java | 33 ++++++--
.../org/apache/cayenne/access/DbArcIdTest.java | 11 ++-
.../access/ManyToManyCandidateEntityTest.java | 15 +++-
.../cayenne/access/event/SnapshotEventTest.java | 7 +-
.../access/jdbc/ColumnDescriptorTest.java | 18 +++--
.../access/jdbc/JDBCResultIteratorTest.java | 28 ++++---
.../cayenne/access/jdbc/SQLStatementTest.java | 11 ++-
.../jdbc/SQLTemplateProcessorChainTest.java | 17 +++-
.../jdbc/SQLTemplateProcessorSelectTest.java | 12 ++-
.../access/jdbc/SQLTemplateProcessorTest.java | 26 ++++--
.../jdbc/SQLTemplateResourceManagerTest.java | 10 ++-
.../cayenne/access/types/BooleanTypeTest.java | 11 ++-
.../cayenne/access/types/ByteArrayTypeTest.java | 10 ++-
.../cayenne/access/types/CharTypeTest.java | 9 ++-
.../access/types/EnumTypeFactoryTest.java | 7 +-
.../cayenne/access/types/EnumTypeTest.java | 26 ++++--
.../access/types/ExtendedTypeMapEnumsTest.java | 15 +++-
.../access/types/ExtendedTypeMapTest.java | 16 +++-
.../cayenne/cache/EhCacheQueryCacheTest.java | 30 ++++---
.../cache/EhCacheQueryCache_WithConfigTest.java | 29 ++++---
.../apache/cayenne/cache/MapQueryCacheTest.java | 13 +--
.../apache/cayenne/cache/OSQueryCacheTest.java | 28 ++++---
.../configuration/CayenneRuntimeTest.java | 10 ++-
.../DefaultDataChannelDescriptorMergerTest.java | 17 +++-
.../DefaultRuntimePropertiesTest.java | 11 ++-
.../XMLDataChannelDescriptorLoaderTest.java | 27 ++++---
.../osgi/OsgiClassLoaderManagerTest.java | 8 +-
.../server/DBCPDataSourceFactoryTest.java | 23 +++---
.../server/DataContextFactoryTest.java | 17 ++--
.../server/DataDomainProviderTest.java | 21 +++--
.../DefaultDataSourceFactoryLoaderTest.java | 22 +++--
.../server/DefaultDbAdapterFactoryTest.java | 33 ++++----
.../configuration/web/CayenneFilterTest.java | 32 +++++---
.../web/ServletContextHandlerTest.java | 18 +++--
.../configuration/web/WebConfigurationTest.java | 28 +++++--
.../configuration/web/WebModuleTest.java | 7 +-
.../cayenne/configuration/web/WebUtilTest.java | 13 +--
.../apache/cayenne/conn/DataSourceInfoTest.java | 14 +++-
.../cayenne/conn/DriverDataSourceTest.java | 8 +-
.../cayenne/conn/PooledConnectionImplTest.java | 6 +-
.../cayenne/dba/DefaultQuotingStrategyTest.java | 9 ++-
.../dba/oracle/OracleUtilDateTypeTest.java | 8 +-
.../cayenne/ejbql/EJBQLExpressionTest.java | 11 ++-
.../cayenne/ejbql/EJBQLParserFactoryTest.java | 8 +-
.../cayenne/ejbql/parser/EJBQLPathTest.java | 7 +-
.../cayenne/event/DefaultEventManagerTest.java | 85 +++++++++++++-------
.../apache/cayenne/event/EventBridgeTest.java | 18 +++--
.../apache/cayenne/event/EventSubjectTest.java | 35 +++++---
.../cayenne/event/JGroupsBridgeFactoryTest.java | 7 +-
.../cayenne/event/XMPPBridgeFactoryTest.java | 8 +-
.../apache/cayenne/event/XMPPBridgeTest.java | 10 ++-
.../cayenne/exp/BooleanExpressionTest.java | 10 ++-
.../cayenne/exp/ExpressionEqualsTest.java | 9 ++-
.../cayenne/exp/ExpressionParameterTest.java | 7 +-
.../cayenne/exp/ExpressionTraversalTest.java | 12 ++-
.../org/apache/cayenne/exp/PropertyTest.java | 49 +++++++----
.../cayenne/exp/parser/ASTDbPathTest.java | 8 +-
.../exp/parser/ASTLikeIgnoreCaseTest.java | 9 ++-
.../apache/cayenne/exp/parser/ASTListTest.java | 15 ++--
.../cayenne/exp/parser/ASTObjPathTest.java | 8 +-
.../cayenne/exp/parser/EvaluatorTest.java | 24 ++++--
.../org/apache/cayenne/graph/GraphMapTest.java | 12 ++-
.../org/apache/cayenne/graph/NodeDiffTest.java | 9 ++-
.../cayenne/log/CommonsJdbcEventLoggerTest.java | 14 ++--
.../org/apache/cayenne/map/AttributeTest.java | 9 ++-
.../cayenne/map/CallbackDescriptorTest.java | 8 +-
.../org/apache/cayenne/map/CallbackMapTest.java | 7 +-
.../map/ClientObjectRelationshipTest.java | 9 ++-
.../cayenne/map/DataMapNamespaceTest.java | 20 +++--
.../org/apache/cayenne/map/DataMapTest.java | 50 +++++++++---
.../org/apache/cayenne/map/DbAttributeTest.java | 22 ++++-
.../java/org/apache/cayenne/map/DbJoinTest.java | 10 ++-
.../apache/cayenne/map/DbKeyGeneratorTest.java | 10 ++-
.../cayenne/map/EmbeddableAttributeTest.java | 8 +-
.../org/apache/cayenne/map/EmbeddableTest.java | 13 ++-
.../cayenne/map/EntityInheritanceTreeTest.java | 13 ++-
.../apache/cayenne/map/MapLoaderLoadTest.java | 25 +++---
.../apache/cayenne/map/ObjAttributeTest.java | 18 +++--
.../ObjEntitySingleTableInheritanceTest.java | 16 +++-
.../org/apache/cayenne/map/ProcedureTest.java | 10 ++-
.../org/apache/cayenne/map/QueryLoaderTest.java | 16 ++--
.../apache/cayenne/map/RelationshipTest.java | 11 ++-
.../cayenne/map/SQLTemplateBuilderTest.java | 16 +++-
.../cayenne/map/SelectQueryBuilderTest.java | 14 +++-
.../apache/cayenne/map/event/MapEventTest.java | 12 ++-
.../map/naming/LegacyNameGeneratorTest.java | 9 ++-
.../apache/cayenne/query/AbstractQueryTest.java | 13 ++-
.../apache/cayenne/query/NamedQueryTest.java | 14 +++-
.../apache/cayenne/query/ObjectIdQueryTest.java | 15 +++-
.../org/apache/cayenne/query/OrderingTest.java | 30 +++++--
.../cayenne/query/PrefetchTreeNodeTest.java | 19 +++--
.../cayenne/query/ProcedureQueryTest.java | 19 ++++-
.../apache/cayenne/query/RefreshQueryTest.java | 22 +++--
.../cayenne/query/RelationshipQueryTest.java | 11 ++-
.../cayenne/query/SelectQueryBasicsTest.java | 30 +++++--
.../cayenne/reflect/BasePropertyTest.java | 10 +--
.../cayenne/reflect/BeanAccessorTest.java | 11 ++-
.../cayenne/reflect/CallbackOnEntityTest.java | 13 ++-
.../cayenne/reflect/CallbackOnListenerTest.java | 8 +-
.../cayenne/reflect/EnumConverterTest.java | 14 ++--
.../cayenne/reflect/FieldAccessorTest.java | 13 ++-
.../LifecycleCallbackEventHandlerTest.java | 19 +++--
.../reflect/PersistentDescriptorTest.java | 13 ++-
.../cayenne/reflect/PropertyUtilsTest.java | 38 ++++++---
.../DataObjectAttributePropertyTest.java | 11 ++-
.../cayenne/remote/RemoteSessionTest.java | 11 ++-
.../remote/hessian/HessianConfigTest.java | 16 ++--
.../hessian/service/HessianServiceTest.java | 22 ++---
.../remote/service/BaseRemoteServiceTest.java | 17 ++--
.../remote/service/DispatchHelperTest.java | 12 ++-
.../ClassLoaderResourceLocatorTest.java | 12 ++-
.../resource/FilesystemResourceLocatorTest.java | 13 ++-
.../cayenne/resource/URLResourceTest.java | 13 +--
.../cayenne/unit/jira/CAY_10062004_ExpTest.java | 9 ++-
.../apache/cayenne/unit/jira/CAY_743Test.java | 9 ++-
.../apache/cayenne/util/Base64CodecTest.java | 25 +++++-
.../cayenne/util/GenericResponseTest.java | 11 ++-
.../org/apache/cayenne/util/IDUtilTest.java | 12 ++-
.../cayenne/util/IndexPropertyListTest.java | 10 ++-
.../org/apache/cayenne/util/InvocationTest.java | 73 +++++++++++------
.../apache/cayenne/util/ListResponseTest.java | 12 ++-
.../apache/cayenne/util/NameConverterTest.java | 21 ++++-
.../util/PersistentObjectHolderTest.java | 14 +++-
.../org/apache/cayenne/util/RegexUtilTest.java | 10 ++-
.../java/org/apache/cayenne/util/UtilTest.java | 50 ++++++++++--
.../ConcurrentLinkedHashMapTest.java | 9 ++-
.../validation/BeanValidationFailureTest.java | 8 +-
.../validation/ValidationExceptionTest.java | 7 +-
.../validation/ValidationResultTest.java | 17 ++--
137 files changed, 1623 insertions(+), 639 deletions(-)
----------------------------------------------------------------------