[Amdatu-commits] SVN r617 - in trunk/amdatu-core/tenant/src: main/java/org/amdatu/core/tenant test/java/org/amdatu/test/unit

[subvers...@amdatu.org]

Author: bdekruijff at gmail.com
Date: Thu Jan 13 10:29:44 2011
New Revision: 617

Log:
AMDATU-260 use equals when comparing strings for equality

Added:
   
trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
Modified:
   
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantEntity.java

Modified: 
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantEntity.java
==============================================================================
--- 
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantEntity.java 
    (original)
+++ 
trunk/amdatu-core/tenant/src/main/java/org/amdatu/core/tenant/TenantEntity.java 
    Thu Jan 13 10:29:44 2011
@@ -55,7 +55,7 @@
     public void setName(String name) {
         m_name = name;
     }
-    
+
     public Map<String, String> getProperties() {
         return new HashMap<String, String>(m_properties);
     }
@@ -82,14 +82,19 @@
         if (getClass() != obj.getClass())
             return false;
         TenantEntity other = (TenantEntity) obj;
-        return m_id == other.getId();
+        if (getId() == null && other.getId() != null)
+            return false;
+        if (getId() != null && other.getId() == null)
+            return false;
+        return getId().equals(other.getId());
     }
-    
+
     public boolean matches(Map<String, String> properties) {
         for (String key : properties.keySet()) {
             if (!m_properties.containsKey(key)) {
                 return false;
-            } else if (!m_properties.get(key).equals(properties.get(key))) {
+            }
+            else if (!m_properties.get(key).equals(properties.get(key))) {
                 return false;
             }
         }

Added: 
trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
==============================================================================
--- (empty file)
+++ 
trunk/amdatu-core/tenant/src/test/java/org/amdatu/test/unit/TenantEntityTest.java
   Thu Jan 13 10:29:44 2011
@@ -0,0 +1,18 @@
+package org.amdatu.test.unit;
+
+import org.amdatu.core.tenant.TenantEntity;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TenantEntityTest {
+
+    @Test
+    // AMDATU-260
+    public void testEquality() {
+        TenantEntity t1 = new TenantEntity("t13245", "Kwik");
+        TenantEntity t2 = new TenantEntity("t13245", "Kwek");
+        Assert.assertEquals(t1, t2);
+        TenantEntity t3 = new TenantEntity("t23245", "Kwek");
+        Assert.assertNotSame(t2, t3);
+    }
+}