You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2008/01/13 22:36:23 UTC
svn commit: r611655 [10/11] - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished: .settings/
src/main/java/org/apache/cayenne/ src/main/java/org/apache/cayenne/access/
src/main/java/org/apache/cayenne/access/event/
src/main/java/org/apache/cay...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/ExtendedTypeMapTest.java Sun Jan 13 13:35:44 2008
@@ -109,6 +109,7 @@
class TstTypeMap extends ExtendedTypeMap {
+ @Override
protected void initDefaultTypes() {
// noop to avoid any default types
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockAbstractType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockAbstractType.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockAbstractType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/types/MockAbstractType.java Sun Jan 13 13:35:44 2008
@@ -35,15 +35,18 @@
this.className = className;
}
+ @Override
public String getClassName() {
return className;
}
+ @Override
public Object materializeObject(CallableStatement rs, int index, int type)
throws Exception {
return null;
}
+ @Override
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTest.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
protected DefaultOperationObserver observer;
+ @Override
public void setUp() throws Exception {
observer = new DefaultOperationObserver();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/cache/OSQueryCacheTest.java Sun Jan 13 13:35:44 2008
@@ -110,6 +110,7 @@
List r1 = new ArrayList();
QueryMetadata m1 = new MockQueryMetadata() {
+ @Override
public String getCacheKey() {
return "a";
}
@@ -120,6 +121,7 @@
List r2 = new ArrayList();
QueryMetadata m2 = new MockQueryMetadata() {
+ @Override
public String getCacheKey() {
return "b";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderCase.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderCase.java Sun Jan 13 13:35:44 2008
@@ -82,6 +82,7 @@
this.failedMapRefs = failedMapRefs;
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("\n===== DomainHelperCase ====\n").append(configInfo);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigLoaderTest.java Sun Jan 13 13:35:44 2008
@@ -164,6 +164,7 @@
MockConfigLoaderDelegate delegate = new MockConfigLoaderDelegate() {
+ @Override
public void shouldLoadDataNode(
String domainName,
String nodeName,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigSaverTest.java Sun Jan 13 13:35:44 2008
@@ -109,6 +109,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
saver = new ConfigSaver();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigurationTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigurationTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ConfigurationTest.java Sun Jan 13 13:35:44 2008
@@ -83,28 +83,35 @@
/** Concrete Configuration subclass used for tests. */
public static class Config extends Configuration {
- public boolean canInitialize() {
+ @Override
+ public boolean canInitialize() {
return true;
}
- public void initialize() throws Exception {
+ @Override
+ public void initialize() throws Exception {
}
- public void didInitialize() {
+ @Override
+ public void didInitialize() {
}
- public ResourceLocator getResourceLocator() {
+ @Override
+ public ResourceLocator getResourceLocator() {
return null;
}
- protected InputStream getDomainConfiguration() {
+ @Override
+ protected InputStream getDomainConfiguration() {
return null;
}
- protected InputStream getMapConfiguration(String location) {
+ @Override
+ protected InputStream getMapConfiguration(String location) {
return null;
}
+ @Override
protected InputStream getViewConfiguration(String location) {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/EmptyConfiguration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/EmptyConfiguration.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/EmptyConfiguration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/EmptyConfiguration.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
this.setLoaderDelegate(new RuntimeLoadDelegate(this, this.getLoadStatus()));
}
+ @Override
public void addDomain(DataDomain domain) {
// noop
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfiguration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfiguration.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfiguration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/MockConfiguration.java Sun Jan 13 13:35:44 2008
@@ -34,30 +34,37 @@
super();
}
+ @Override
public boolean canInitialize() {
return true;
}
+ @Override
public void didInitialize() {
}
+ @Override
protected InputStream getDomainConfiguration() {
throw new NotImplementedException(
"this is an in-memory mockup...'getDomainConfiguration' is not implemented.");
}
+ @Override
protected InputStream getMapConfiguration(String name) {
return null;
}
+ @Override
protected ResourceLocator getResourceLocator() {
return null;
}
+ @Override
protected InputStream getViewConfiguration(String location) {
return null;
}
+ @Override
public void initialize() throws Exception {
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/DataSourceInfoTest.java Sun Jan 13 13:35:44 2008
@@ -26,6 +26,7 @@
public class DataSourceInfoTest extends CayenneCase {
private DataSourceInfo dsi;
+ @Override
public void setUp() throws java.lang.Exception {
dsi = new DataSourceInfo();
dsi.setUserName("a");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PoolManagerTest.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
String url = getConnectionInfo().getDataSourceUrl();
PoolManager pm = new PoolManager(driverName, url, 0, 3, "", "") {
+ @Override
protected void startMaintenanceThread() {
}
};
@@ -39,6 +40,7 @@
public void testPassword() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "b") {
+ @Override
protected void startMaintenanceThread() {
}
};
@@ -47,6 +49,7 @@
public void testUserName() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "a", "") {
+ @Override
protected void startMaintenanceThread() {
}
};
@@ -55,6 +58,7 @@
public void testMinConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+ @Override
protected void startMaintenanceThread() {
}
};
@@ -63,6 +67,7 @@
public void testMaxConnections() throws Exception {
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+ @Override
protected void startMaintenanceThread() {
}
};
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/PooledConnectionImplTest.java Sun Jan 13 13:35:44 2008
@@ -28,6 +28,7 @@
// that has been removed from the pool, but when pool is still a
// listener for its events.
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+ @Override
protected void startMaintenanceThread() {}
};
PooledConnectionImpl con = new PooledConnectionImpl();
@@ -40,6 +41,7 @@
// that has been removed from the pool, but when pool is still a
// listener for its events.
PoolManager pm = new PoolManager(null, 0, 3, "", "") {
+ @Override
protected void startMaintenanceThread() {}
};
PooledConnectionImpl con = new PooledConnectionImpl();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/TstConnection.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/TstConnection.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/TstConnection.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conn/TstConnection.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
super(null, null);
}
+ @Override
public void close() {
// do nothing...
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/JdbcAdapterTest.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
protected JdbcAdapter adapter;
+ @Override
protected void setUp() throws java.lang.Exception {
adapter = new JdbcAdapter();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java Sun Jan 13 13:35:44 2008
@@ -32,6 +32,7 @@
protected DataNode node;
protected DbEntity paintEnt;
+ @Override
protected void setUp() throws Exception {
deleteTestData();
node = getDomain().getDataNodes().iterator().next();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
public class OraclePkGeneratorTest extends CayenneCase {
protected OraclePkGenerator pkGenerator;
+ @Override
protected void setUp() throws Exception {
pkGenerator = new OraclePkGenerator();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventBridgeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventBridgeTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventBridgeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventBridgeTest.java Sun Jan 13 13:35:44 2008
@@ -104,6 +104,7 @@
// we must wait till notification is received
ThreadedTestHelper helper = new ThreadedTestHelper() {
+ @Override
protected void assertResult() throws Exception {
assertTrue(bridge.lastLocalEvent instanceof SnapshotEvent);
assertEquals(local, bridge.lastLocalEvent.getSubject());
@@ -128,6 +129,7 @@
// we must wait till notification is received
ThreadedTestHelper helper1 = new ThreadedTestHelper() {
+ @Override
protected void assertResult() throws Exception {
assertTrue(bridge.lastLocalEvent instanceof SnapshotEvent);
assertEquals(local, bridge.lastLocalEvent.getSubject());
@@ -147,14 +149,17 @@
super(localSubject, externalSubject);
}
+ @Override
public void sendExternalEvent(CayenneEvent event) {
lastLocalEvent = event;
}
+ @Override
protected void shutdownExternal() throws Exception {
shutdownCalls++;
}
+ @Override
protected void startupExternal() throws Exception {
startupCalls++;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventManagerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventManagerTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventManagerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/EventManagerTest.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
// the event manager used for testing
private EventManager _eventManager;
+ @Override
public void setUp() {
_eventManager = new EventManager();
_numberOfReceivedEvents = 0;
@@ -398,6 +399,7 @@
ThreadedTestHelper helper = new ThreadedTestHelper() {
+ @Override
protected void assertResult() throws Exception {
assertEquals(expected, listener._numberOfReceivedEvents);
}
@@ -409,6 +411,7 @@
private static void assertReceivedEventsForClass(final int expected) throws Exception {
ThreadedTestHelper helper = new ThreadedTestHelper() {
+ @Override
protected void assertResult() throws Exception {
assertEquals(expected, _numberOfReceivedEventsForClass);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/MockEventBridge.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/MockEventBridge.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/MockEventBridge.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/event/MockEventBridge.java Sun Jan 13 13:35:44 2008
@@ -38,12 +38,15 @@
this.properties = properties;
}
+ @Override
protected void startupExternal() throws Exception {
}
+ @Override
protected void shutdownExternal() throws Exception {
}
+ @Override
protected void sendExternalEvent(CayenneEvent localEvent) throws Exception {
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionFactoryExtrasTest.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
protected TstTraversalHandler handler;
+ @Override
protected void setUp() throws java.lang.Exception {
handler = new TstTraversalHandler();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ExpressionTraversalTest.java Sun Jan 13 13:35:44 2008
@@ -25,6 +25,7 @@
public class ExpressionTraversalTest extends CayenneCase {
protected TstTraversalHandler handler;
+ @Override
protected void setUp() throws Exception {
handler = new TstTraversalHandler();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatTest.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
protected DataContext context;
+ @Override
public void setUp() throws Exception {
super.setUp();
deleteTestData();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSingleTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSingleTemplateTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSingleTemplateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSingleTemplateTest.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
*/
public class ClassGeneratorSingleTemplateTest extends ClassGeneratorTestBase {
+ @Override
protected ClassGenerator createGenerator() throws Exception {
return new ClassGenerator(MapClassGenerator.SINGLE_CLASS_TEMPLATE, ClassGenerator.VERSION_1_1);
}
@@ -52,6 +53,7 @@
ObjEntity testEntity = new ObjEntity("Test");
ObjRelationship toMany = new ObjRelationship("tomany") {
+ @Override
public boolean isToMany() {
return true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSuperTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSuperTemplateTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSuperTemplateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorSuperTemplateTest.java Sun Jan 13 13:35:44 2008
@@ -28,6 +28,7 @@
*/
public class ClassGeneratorSuperTemplateTest extends ClassGeneratorTestBase {
+ @Override
protected ClassGenerator createGenerator() throws Exception {
return new ClassGenerator(MapClassGenerator.SUPERCLASS_TEMPLATE, ClassGenerator.VERSION_1_1);
}
@@ -51,6 +52,7 @@
ObjEntity testEntity = new ObjEntity("Test");
ObjRelationship toMany = new ObjRelationship("tomany") {
+ @Override
public boolean isToMany() {
return true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTest.java Sun Jan 13 13:35:44 2008
@@ -32,6 +32,7 @@
protected ClassGenerationInfo cgen;
+ @Override
protected void setUp() throws Exception {
super.setUp();
cgen = new ClassGenerationInfo();
@@ -87,6 +88,7 @@
ObjRelationship toMany = new ObjRelationship("tomany") {
+ @Override
public boolean isToMany() {
return true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTestBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTestBase.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTestBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ClassGeneratorTestBase.java Sun Jan 13 13:35:44 2008
@@ -32,6 +32,7 @@
protected ClassGenerator cgen;
+ @Override
protected void setUp() throws Exception {
super.setUp();
cgen = createGenerator();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/gen/ImportUtilsTest.java Sun Jan 13 13:35:44 2008
@@ -28,6 +28,7 @@
protected ImportUtils importUtils = null;
+ @Override
protected void setUp() throws Exception {
super.setUp();
importUtils = new ImportUtils();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/graph/MockNodeDiff.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/graph/MockNodeDiff.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/graph/MockNodeDiff.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/graph/MockNodeDiff.java Sun Jan 13 13:35:44 2008
@@ -29,9 +29,11 @@
super(nodeId, diffId);
}
+ @Override
public void apply(GraphChangeHandler tracker) {
}
+ @Override
public void undo(GraphChangeHandler tracker) {
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/AshwoodEntitySorterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/AshwoodEntitySorterTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/AshwoodEntitySorterTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/AshwoodEntitySorterTest.java Sun Jan 13 13:35:44 2008
@@ -33,6 +33,7 @@
protected AshwoodEntitySorter sorter;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java Sun Jan 13 13:35:44 2008
@@ -33,6 +33,7 @@
public class DataMapNamespaceTest extends TestCase {
protected DataMap map;
+ @Override
protected void setUp() throws Exception {
super.setUp();
map = new DataMap();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbRelationshipTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/DbRelationshipTest.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
protected DbEntity paintingEnt;
protected DbEntity galleryEnt;
+ @Override
public void setUp() throws Exception {
artistEnt = getDbEntity("ARTIST");
paintingEnt = getDbEntity("PAINTING");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverClassDescriptorTest.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
/**
* Configures multi-tier stack as we want to access descriptors in different tiers...
*/
+ @Override
protected AccessStack buildAccessStack() {
return CayenneResources
.getResources()
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/EntityResolverInheritanceTest.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
public class EntityResolverInheritanceTest extends PeopleCase {
protected EntityResolver resolver;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockAttribute.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockAttribute.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockAttribute.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockAttribute.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void encodeAsXML(XMLEncoder encoder) {
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntity.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntity.java Sun Jan 13 13:35:44 2008
@@ -39,12 +39,14 @@
super(name);
}
+ @Override
public Expression translateToRelatedEntity(
Expression expression,
String relationshipPath) {
return null;
}
+ @Override
public Iterator resolvePathComponents(Expression pathExp) throws ExpressionException {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntityResolver.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockEntityResolver.java Sun Jan 13 13:35:44 2008
@@ -33,6 +33,7 @@
this.mockObjEntity = mockObjEntity;
}
+ @Override
public synchronized ObjEntity lookupObjEntity(Class aClass) {
return mockObjEntity;
}
@@ -45,6 +46,7 @@
return mockObjEntity;
}
+ @Override
public synchronized ObjEntity lookupObjEntity(String entityName) {
return mockObjEntity;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockObjRelationship.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockObjRelationship.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockObjRelationship.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockObjRelationship.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
public ObjRelationship getReverseRelationship() {
return reverseRelationship;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockRelationship.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockRelationship.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockRelationship.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockRelationship.java Sun Jan 13 13:35:44 2008
@@ -31,6 +31,7 @@
super(name);
}
+ @Override
public Entity getTargetEntity() {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityInheritanceTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityInheritanceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityInheritanceTest.java Sun Jan 13 13:35:44 2008
@@ -52,6 +52,7 @@
protected ObjRelationship relationship2;
protected ObjRelationship relationship3;
+ @Override
public void setUp() throws Exception {
map = new DataMap();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjEntityTest.java Sun Jan 13 13:35:44 2008
@@ -91,6 +91,7 @@
ObjRelationship r1 = new ObjRelationship("r1") {
+ @Override
public Entity getTargetEntity() {
return target;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ObjRelationshipTest.java Sun Jan 13 13:35:44 2008
@@ -81,6 +81,7 @@
final ObjEntity target = new ObjEntity("te1");
ObjRelationship r1 = new ObjRelationship("r1") {
+ @Override
public Entity getTargetEntity() {
return target;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ProcedureTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ProcedureTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ProcedureTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/ProcedureTest.java Sun Jan 13 13:35:44 2008
@@ -27,6 +27,7 @@
public class ProcedureTest extends TestCase {
protected Procedure procedure;
+ @Override
public void setUp() throws Exception {
procedure = new Procedure();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java Sun Jan 13 13:35:44 2008
@@ -29,9 +29,11 @@
protected QueryLoader builder;
+ @Override
protected void setUp() throws Exception {
builder = new QueryLoader() {
+ @Override
public Query getQuery() {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java Sun Jan 13 13:35:44 2008
@@ -85,6 +85,7 @@
class MockupRootQueryBuilder extends SQLTemplateBuilder {
+ @Override
public Object getRoot() {
return "FakeRoot";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java Sun Jan 13 13:35:44 2008
@@ -77,6 +77,7 @@
class MockupRootQueryBuilder extends SelectQueryBuilder {
+ @Override
public Object getRoot() {
return "FakeRoot";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/event/MapEventTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/event/MapEventTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/event/MapEventTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/event/MapEventTest.java Sun Jan 13 13:35:44 2008
@@ -60,6 +60,7 @@
this.newName = newName;
}
+ @Override
public String getNewName() {
return newName;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectFileTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectFileTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectFileTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectFileTest.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
pr = new TstProject(new File("xyz"));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectTest.java Sun Jan 13 13:35:44 2008
@@ -37,6 +37,7 @@
protected ApplicationProject p;
protected File f;
+ @Override
protected void setUp() throws Exception {
super.setUp();
f = new File(Configuration.DEFAULT_DOMAIN_FILE);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java Sun Jan 13 13:35:44 2008
@@ -142,9 +142,11 @@
// do nothing...
}
+ @Override
protected DataNode createDataNode(String nodeName) {
return new DataNode(nodeName) {
+ @Override
public DataSource getDataSource() {
return dataSource;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapFileTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapFileTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapFileTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapFileTest.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
pr = new TstProject(new File("xyz"));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataMapProjectTest.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
protected DataMapProject p;
protected File f;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeConfigInfoTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeConfigInfoTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeConfigInfoTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeConfigInfoTest.java Sun Jan 13 13:35:44 2008
@@ -33,6 +33,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
test = new DataNodeConfigInfo();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeFileTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeFileTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeFileTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/DataNodeFileTest.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
protected DataNode node;
protected Project pr;
+ @Override
protected void setUp() throws Exception {
pr = new TstProject(new File("xyz"));
node = new DataNode("n1");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
protected File testProjectFile;
protected PartialProject project;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectConfigInfoTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectConfigInfoTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectConfigInfoTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectConfigInfoTest.java Sun Jan 13 13:35:44 2008
@@ -30,6 +30,7 @@
public class ProjectConfigInfoTest extends CayenneCase {
protected ProjectConfigInfo config;
+ @Override
protected void setUp() throws Exception {
super.setUp();
config = new ProjectConfigInfo();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectFileTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectFileTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectFileTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectFileTest.java Sun Jan 13 13:35:44 2008
@@ -32,6 +32,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
pf = new TestProjectFile("name.ext");
@@ -73,6 +74,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getObject()
*/
+ @Override
public Object getObject() {
return null;
}
@@ -80,6 +82,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getObjectName()
*/
+ @Override
public String getObjectName() {
return OBJ_NAME;
}
@@ -87,6 +90,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#saveToFile(File)
*/
+ @Override
public void save(PrintWriter out) throws Exception {}
/**
@@ -99,6 +103,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#isObjectSupported(Object)
*/
+ @Override
public boolean canHandle(Object obj) {
return false;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
f = new File("xyz");
@@ -103,6 +104,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#canHandle(Object)
*/
+ @Override
public boolean canHandle(Object obj) {
return false;
}
@@ -117,6 +119,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getObject()
*/
+ @Override
public Object getObject() {
return null;
}
@@ -124,6 +127,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getObjectName()
*/
+ @Override
public String getObjectName() {
return null;
}
@@ -131,12 +135,14 @@
/**
* @see org.apache.cayenne.project.ProjectFile#saveToFile(File)
*/
+ @Override
public void save(PrintWriter out) throws Exception {
}
/**
* @see org.apache.cayenne.project.ProjectFile#saveCommit()
*/
+ @Override
public File saveCommit() {
commitCount++;
return new File("abc");
@@ -153,6 +159,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#saveTemp()
*/
+ @Override
public void saveTemp() throws Exception {
saveTempCount++;
@@ -164,6 +171,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#saveUndo()
*/
+ @Override
public void saveUndo() {
undoCount++;
}
@@ -171,6 +179,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getFileName()
*/
+ @Override
public String getLocation() {
return null;
}
@@ -179,6 +188,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#getOldFileName()
*/
+ @Override
public String getOldLocation() {
return null;
}
@@ -187,6 +197,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#resolveFile()
*/
+ @Override
public File resolveFile() {
return new File("abc");
}
@@ -195,6 +206,7 @@
/**
* @see org.apache.cayenne.project.ProjectFile#resolveOldFile()
*/
+ @Override
public File resolveOldFile() {
return new File("xyz");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/TstProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/TstProject.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/TstProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/TstProject.java Sun Jan 13 13:35:44 2008
@@ -45,11 +45,13 @@
/**
* @see org.apache.cayenne.project.Project#checkForUpgrades()
*/
+ @Override
public void checkForUpgrades() {}
/**
* @see org.apache.cayenne.project.Project#treeNodes()
*/
+ @Override
public Iterator treeNodes() {
return new ArrayList().iterator();
}
@@ -57,6 +59,7 @@
/**
* @see org.apache.cayenne.project.Project#getChildren()
*/
+ @Override
public List getChildren() {
return new ArrayList();
}
@@ -64,6 +67,7 @@
/**
* @see org.apache.cayenne.project.Project#projectFileForObject(Object)
*/
+ @Override
public ProjectFile projectFileForObject(Object obj) {
return null;
}
@@ -71,10 +75,12 @@
/**
* @see org.apache.cayenne.project.Project#projectLoadStatus()
*/
+ @Override
public ConfigStatus getLoadStatus() {
return null;
}
+ @Override
public void upgrade() throws ProjectException {
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ObjEntityValidatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ObjEntityValidatorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ObjEntityValidatorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ObjEntityValidatorTest.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
protected DataDomain domain;
protected DataMap map;
+ @Override
protected void setUp() throws Exception {
super.setUp();
domain = new DataDomain("d1");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ValidatorTestBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ValidatorTestBase.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ValidatorTestBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/ValidatorTestBase.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
protected Validator validator;
protected ApplicationProject project;
+ @Override
protected void setUp() throws Exception {
super.setUp();
project = new ApplicationProject(new File(System.getProperty("user.dir")));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockAbstractQuery.java Sun Jan 13 13:35:44 2008
@@ -33,6 +33,7 @@
setName(name);
}
+ @Override
public SQLAction createSQLAction(SQLActionVisitor visitor) {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockBatchQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockBatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockBatchQuery.java Sun Jan 13 13:35:44 2008
@@ -37,21 +37,26 @@
super(dbEntity);
}
+ @Override
public List<DbAttribute> getDbAttributes() {
return null;
}
+ @Override
public void reset() {
}
+ @Override
public boolean next() {
return false;
}
+ @Override
public Object getValue(int valueIndex) {
return null;
}
+ @Override
public int size() {
return 0;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQualifiedQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQualifiedQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQualifiedQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQualifiedQuery.java Sun Jan 13 13:35:44 2008
@@ -28,6 +28,7 @@
*/
public class MockQualifiedQuery extends QualifiedQuery {
+ @Override
public SQLAction createSQLAction(SQLActionVisitor visitor) {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBase.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryBase.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
protected SelectQuery query;
protected MockOperationObserver opObserver;
+ @Override
protected void setUp() throws Exception {
deleteTestData();
populateTables();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java Sun Jan 13 13:35:44 2008
@@ -433,6 +433,7 @@
assertEquals(2, router.getQueryCount());
}
+ @Override
protected void populateTables() throws java.lang.Exception {
String insertArtist = "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME, DATE_OF_BIRTH) VALUES (?,?,?)";
Connection conn = getConnection();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/BasePropertyTest.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
new MockClassDescriptor(),
new MockAccessor() {
+ @Override
public String getName() {
return "xyz";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java Sun Jan 13 13:35:44 2008
@@ -137,6 +137,7 @@
static class C4 extends C1 {
+ @Override
void c1Callback() {
callbacks.add("c4Callback");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/MockBaseProperty.java Sun Jan 13 13:35:44 2008
@@ -29,6 +29,7 @@
super(owner, accessor);
}
+ @Override
public boolean visit(PropertyVisitor visitor) {
return true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/ClientChannelTest.java Sun Jan 13 13:35:44 2008
@@ -160,16 +160,20 @@
public void testEventBridgeFailure() throws Exception {
MockClientConnection connection = new MockClientConnection() {
+ @Override
public EventBridge getServerEventBridge() throws CayenneRuntimeException {
return new EventBridge(Collections.EMPTY_LIST, "ext") {
+ @Override
protected void sendExternalEvent(CayenneEvent localEvent)
throws Exception {
}
+ @Override
protected void shutdownExternal() throws Exception {
}
+ @Override
protected void startupExternal() throws Exception {
// intentionally throw an exception
throw new CayenneRuntimeException("Test failure");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/MockMessage.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/MockMessage.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/MockMessage.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/MockMessage.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
/**
* Returns a description of the type of message. In this case always "Mock message".
*/
+ @Override
public String toString() {
return "Mock message";
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListTest.java Sun Jan 13 13:35:44 2008
@@ -44,6 +44,7 @@
protected RemoteIncrementalFaultList list;
protected SelectQuery query;
+ @Override
protected AccessStack buildAccessStack() {
return CayenneResources
.getResources()
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/MockAbstractSerializerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/MockAbstractSerializerFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/MockAbstractSerializerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/MockAbstractSerializerFactory.java Sun Jan 13 13:35:44 2008
@@ -30,10 +30,12 @@
protected EntityResolver entityResolver;
+ @Override
public Serializer getSerializer(Class cl) throws HessianProtocolException {
return null;
}
+ @Override
public Deserializer getDeserializer(Class cl) throws HessianProtocolException {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/hessian/service/HessianServiceTest.java Sun Jan 13 13:35:44 2008
@@ -42,10 +42,12 @@
HessianService handler = new HessianService() {
+ @Override
protected void initCayenneStack(Map properties) {
this.domain = new DataDomain("test");
}
+ @Override
protected HttpSession getSession(boolean create) {
return new MockHttpSession();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/remote/service/BaseRemoteServiceTest.java Sun Jan 13 13:35:44 2008
@@ -32,14 +32,17 @@
BaseRemoteService handler = new BaseRemoteService() {
+ @Override
protected ServerSession createServerSession() {
return new ServerSession(new RemoteSession("a"), null);
}
+ @Override
protected ServerSession createServerSession(String name) {
return createServerSession();
}
+ @Override
protected ServerSession getServerSession() {
return createServerSession();
}
@@ -48,6 +51,7 @@
try {
handler.processMessage(new QueryMessage(null) {
+ @Override
public Query getQuery() {
// serializable exception thrown
throw new CayenneRuntimeException();
@@ -63,6 +67,7 @@
try {
handler.processMessage(new QueryMessage(null) {
+ @Override
public Query getQuery() {
// non-serializable exception thrown
throw new MockUnserializableException();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable1.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable1.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable1.java Sun Jan 13 13:35:44 2008
@@ -26,6 +26,7 @@
protected ObjEntity entity;
protected transient boolean prePersisted;
+ @Override
public ObjEntity getObjEntity() {
return (entity != null) ? entity : super.getObjEntity();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable3.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable3.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable3.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/testdo/mt/MtTable3.java Sun Jan 13 13:35:44 2008
@@ -25,6 +25,7 @@
protected ObjEntity entity;
+ @Override
public ObjEntity getObjEntity() {
return (entity != null) ? entity : super.getObjEntity();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java Sun Jan 13 13:35:44 2008
@@ -40,6 +40,7 @@
protected CayenneGeneratorTask task;
+ @Override
public void setUp() {
task = new CayenneGeneratorTask();
task.setProject(project);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java Sun Jan 13 13:35:44 2008
@@ -65,6 +65,7 @@
Util.copy(url3, mapEmbeddables);
}
+ @Override
public void setUp() {
task = new CayenneGeneratorTask();
task.setProject(project);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/DeploymentConfiguratorTest.java Sun Jan 13 13:35:44 2008
@@ -71,6 +71,7 @@
Util.copy(url3, altNodeFile);
}
+ @Override
public void setUp() throws Exception {
// create test dir
File testDir = null;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/tools/NamePatternMatcherTest.java Sun Jan 13 13:35:44 2008
@@ -63,6 +63,7 @@
public void testTokenizer() {
Task parentTask = new Task() {
+ @Override
public void log(String msg, int msgLevel) {
System.out.println(String.valueOf(msgLevel) + ": " + msg);
}
@@ -90,6 +91,7 @@
public void testTokenizerEntities() {
Task parentTask = new Task() {
+ @Override
public void log(String msg, int msgLevel) {
System.out.println(String.valueOf(msgLevel) + ": " + msg);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneCase.java Sun Jan 13 13:35:44 2008
@@ -50,6 +50,7 @@
// create dummy shared config
Configuration config = new DefaultConfiguration() {
+ @Override
public void initialize() {
}
};
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DB2StackAdapter.java Sun Jan 13 13:35:44 2008
@@ -35,18 +35,22 @@
super(adapter);
}
+ @Override
public void willDropTables(Connection conn, DataMap map, Collection tablesToDrop) throws Exception {
// avoid dropping constraints...
}
+ @Override
public boolean supportsBinaryPK() {
return false;
}
+ @Override
public boolean supportsLobs() {
return true;
}
+ @Override
public boolean supportsStoredProcedures() {
return false;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/DerbyStackAdapter.java Sun Jan 13 13:35:44 2008
@@ -36,14 +36,17 @@
super(adapter);
}
+ @Override
public boolean supportsBinaryPK() {
return false;
}
+ @Override
public boolean supportsCaseInsensitiveOrder() {
return false;
}
+ @Override
public boolean supportsLobs() {
return true;
}