svn commit: r692349 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/cache/decorators/SerializedCache.java main/java/org/apache/ibatis/cache/impl/BaseCache.java test/java/org/apache/ibatis/cache/BaseCacheTest.java

[cbegin]

Author: cbegin
Date: Thu Sep  4 23:35:46 2008
New Revision: 692349

URL: http://svn.apache.org/viewvc?rev=692349&view=rev
Log:
fixed cache test

Modified:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/BaseCache.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java?rev=692349&r1=692348&r2=692349&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SerializedCache.java
 Thu Sep  4 23:35:46 2008
@@ -50,6 +50,14 @@
     return delegate.getReadWriteLock();
   }
 
+  public int hashCode() {
+    return delegate.hashCode();
+  }
+
+  public boolean equals(Object obj) {
+    return delegate.equals(obj);
+  }
+
   private byte[] serialize(Serializable value) {
     try {
       ByteArrayOutputStream bos = new ByteArrayOutputStream();

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/BaseCache.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/BaseCache.java?rev=692349&r1=692348&r2=692349&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/BaseCache.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/BaseCache.java
 Thu Sep  4 23:35:46 2008
@@ -31,10 +31,7 @@
     if (!(o instanceof Cache)) return false;
 
     Cache otherCache = (Cache) o;
-
-    if (!getId().equals(otherCache.getId())) return false;
-
-    return true;
+    return getId().equals(otherCache.getId());
   }
 
   public int hashCode() {

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java?rev=692349&r1=692348&r2=692349&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/BaseCacheTest.java
 Thu Sep  4 23:35:46 2008
@@ -17,6 +17,12 @@
     Assert.assertTrue(cache.equals(new SerializedCache(cache)));
     Assert.assertTrue(cache.equals(new LoggingCache(cache)));
     Assert.assertTrue(cache.equals(new ScheduledCache(cache, 5000)));
+
+    Assert.assertEquals(cache.hashCode(), new 
SynchronizedCache(cache).hashCode());
+    Assert.assertEquals(cache.hashCode(), new 
SerializedCache(cache).hashCode());
+    Assert.assertEquals(cache.hashCode(), new LoggingCache(cache).hashCode());
+    Assert.assertEquals(cache.hashCode(), new 
ScheduledCache(cache).hashCode());
+
     Set<Cache> caches = new HashSet<Cache>();
     caches.add(cache);
     caches.add(new SynchronizedCache(cache));