Merge pull request #387 from Garagoth/master

#381: Fixed test method names, enchanced tests a bit

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/Model.java

@@ -56,7 +56,7 @@ public abstract class Model extends CallbackSupport implements Externalizable {
     private final static Logger logger = LoggerFactory.getLogger(Model.class);
 
     private Map<String, Object> attributes = new CaseInsensitiveMap<Object>();
-    private final CaseInsensitiveSet dirtyAttributes = new CaseInsensitiveSet();
+    private final Set<String> dirtyAttributeNames = new CaseInsensitiveSet();
     private boolean frozen = false;
     private MetaModel metaModelLocal;
     private ModelRegistry modelRegistryLocal;
@@ -143,11 +143,11 @@ public static MetaModel getMetaModel() {
     }
 
     protected Map<String, Object> getAttributes() {
-        return attributes;
+        return Collections.unmodifiableMap(attributes);
     }
 
-    protected CaseInsensitiveSet getDirtyAttributes() {
-        return dirtyAttributes;
+    protected Set<String> dirtyAttributeNames() {
+        return Collections.unmodifiableSet(dirtyAttributeNames);
     }
 
     /**
@@ -160,7 +160,7 @@ protected CaseInsensitiveSet getDirtyAttributes() {
      */
     public <T extends Model> T fromMap(Map input) {
         hydrate(input);
-        dirtyAttributes.addAll(input.keySet());
+        dirtyAttributeNames.addAll(input.keySet());
         return (T) this;
     }
 
@@ -287,16 +287,17 @@ private <T extends Model> T setRaw(String attributeName, Object value) {
         getMetaModelLocal().checkAttributeOrAssociation(attributeName);
 
         attributes.put(attributeName, value);
-        dirtyAttributes.add(attributeName);
+        dirtyAttributeNames.add(attributeName);
         return (T) this;
     }
 
     /**
      * Will return true if any attribute of this instance was changed after latest load/save.
+     * (Instance state differs from state in DB)
      * @return true if this instance was modified.
      */
     public boolean isModified() {
-        return !dirtyAttributes.isEmpty();
+        return !dirtyAttributeNames.isEmpty();
     }
 
     /**
@@ -309,6 +310,14 @@ public boolean isFrozen(){
         return frozen;
     }
 
+    /**
+     * Synonym for {@link #isModified()}.
+     *
+     * @return true if this instance was modified.
+     */
+    public boolean modified() {
+        return isModified();
+    }
 
     /**
      * Returns names of all attributes from this model.
@@ -1138,27 +1147,27 @@ public void setParent(Model parent) {
      * @param other target model.
      */
     public void copyTo(Model other) {
+        other.copyFrom(this);
+    }
+
+    /**
+     * Copies all attribute values (except for ID, created_at and updated_at) from other instance to this one.
+     *
+     * @param other source model.
+     */
+    public void copyFrom(Model other) {
         if (!getMetaModelLocal().getTableName().equals(other.getMetaModelLocal().getTableName())) {
             throw new IllegalArgumentException("can only copy between the same types");
         }
-
+        Map<String, Object> otherAttributes = other.getAttributes();
         for (String name : getMetaModelLocal().getAttributeNamesSkipId()) {
-            other.getAttributes().put(name, get(name));
-            other.getDirtyAttributes().add(name);
+            attributes.put(name, otherAttributes.get(name));
+            dirtyAttributeNames.add(name);
             // Why not use setRaw() here? Does the same and avoids duplication of code... (Garagoth)
             // other.setRaw(name, getRaw(name));
         }
     }
 
-    /**
-     * Copies all attribute values (except for ID, created_at and updated_at) from this instance to the other.
-     *
-     * @param other target model.
-     */
-    public void copyFrom(Model other) {
-        other.copyTo(this);
-    }
-
     /**
      * This method should be called from all instance methods for performance.
      *
@@ -1196,7 +1205,7 @@ public void refresh() {
                     "this ID does not exist anymore. Stale model: " + this);
         }
         fresh.copyTo(this);
-        dirtyAttributes.clear();
+        dirtyAttributeNames.clear();
     }
 
     /**
@@ -2425,7 +2434,7 @@ public void reset() {
      */
     public void thaw(){
         attributes.put(getIdName(), null);
-        dirtyAttributes.addAll(attributes.keySet());
+        dirtyAttributeNames.addAll(attributes.keySet());
         frozen = false;
     }
 
@@ -2551,7 +2560,7 @@ public boolean insert() {
                 attributes.put(metaModel.getVersionColumn(), 1);
             }
 
-            dirtyAttributes.clear(); // Clear all dirty attribute names as all were inserted. What about versionColumn ?
+            dirtyAttributeNames.clear(); // Clear all dirty attribute names as all were inserted. What about versionColumn ?
             fireAfterCreate();
 
             return done;
@@ -2582,7 +2591,7 @@ private boolean update() {
         MetaModel metaModel = getMetaModelLocal();
         StringBuilder query = new StringBuilder().append("UPDATE ").append(metaModel.getTableName()).append(" SET ");
         Set<String> attributeNames = metaModel.getAttributeNamesSkipGenerated(manageTime);
-        attributeNames.retainAll(dirtyAttributes);
+        attributeNames.retainAll(dirtyAttributeNames);
         if(attributeNames.size() > 0) {
             join(query, attributeNames, " = ?, ");
             query.append(" = ?");
@@ -2624,7 +2633,7 @@ private boolean update() {
         if(metaModel.cached()){
             QueryCache.instance().purgeTableCache(metaModel.getTableName());
         }
-        dirtyAttributes.clear();
+        dirtyAttributeNames.clear();
         fireAfterUpdate();
         return updated > 0;
     }

activejdbc/src/test/java/org/javalite/activejdbc/Defect381_UpdateModifiedOnlyTest.java

@@ -28,29 +28,36 @@
 public class Defect381_UpdateModifiedOnlyTest extends ActiveJDBCTest {
 
     @Test
-    public void isModifiedWhenModified() {
+    public void shouldBeModifiedWhenModified() {
         Programmer prg = Programmer.createIt("first_name", "John");
         the(prg).shouldNotBe("new");
         the(prg).shouldNotBe("modified");
         prg.set("last_name", "Doe");
         the(prg).shouldBe("modified");
+        the(prg.dirtyAttributeNames()).shouldContain("last_name");
+        the(prg.dirtyAttributeNames().size()).shouldBeEqual(1);
+        
         prg.saveIt();
         the(prg).shouldNotBe("modified");
+        the(prg.dirtyAttributeNames().size()).shouldBeEqual(0);
     }
 
     @Test
-    public void isModifiedAfterCreated() {
+    public void shouldBeModifiedAfterCreated() {
         Programmer prg = Programmer.create("first_name", "John");
         the(prg).shouldBe("new");
         the(prg).shouldBe("modified");
         prg.set("last_name", "Doe");
         the(prg).shouldBe("modified");
+        the(prg.dirtyAttributeNames()).shouldBeEqual(prg.getAttributes().keySet());
+        
         prg.saveIt();
         the(prg).shouldNotBe("modified");
+        the(prg.dirtyAttributeNames().size()).shouldBeEqual(0);
     }
 
     @Test
-    public void isModifiedAfterFroMap() {
+    public void shouldBeModifiedAfterFromMap() {
         Programmer prg = Programmer.createIt("first_name", "John");
         the(prg).shouldNotBe("new");
         the(prg).shouldNotBe("modified");
@@ -64,7 +71,7 @@ public void isModifiedAfterFroMap() {
     }
 
     @Test
-    public void isModifiedAfterFind() {
+    public void shouldNotBeModifiedAfterFind() {
         Programmer prg = Programmer.createIt("first_name", "John", "last_name", "Doe");
         the(prg).shouldNotBe("new");
         the(prg).shouldNotBe("modified");
@@ -76,7 +83,14 @@ public void isModifiedAfterFind() {
         the(prgFromDB.get("last_name")).shouldBeEqual("Doe");
 
         prgFromDB.set("first_name", "Jane");
+        prgFromDB.set("last_name", "Moe");
         the(prgFromDB).shouldBe("modified");
+        the(prgFromDB.dirtyAttributeNames()).shouldContain("first_name");
+        the(prgFromDB.dirtyAttributeNames()).shouldContain("last_name");
+        the(prgFromDB.dirtyAttributeNames()).shouldContain("First_Name");
+        the(prgFromDB.dirtyAttributeNames()).shouldContain("LAST_NAME");
+        the(prgFromDB.dirtyAttributeNames().size()).shouldBeEqual(2);
+        
         prgFromDB.saveIt();
         the(prgFromDB).shouldNotBe("modified");
 
@@ -86,7 +100,7 @@ public void isModifiedAfterFind() {
     }
 
     @Test
-    public void isModifiedAfterDeletaAndThaw() {
+    public void shouldBeModifiedAfterDeletaAndThaw() {
         Programmer prg = Programmer.createIt("first_name", "John", "last_name", "Doe");
         the(prg).shouldNotBe("new");
         the(prg).shouldNotBe("modified");
@@ -97,10 +111,34 @@ public void isModifiedAfterDeletaAndThaw() {
         prg.thaw();
         the(prg).shouldBe("new");
         the(prg).shouldBe("modified");
-        the(prg.getDirtyAttributes()).shouldBeEqual(prg.getAttributes().keySet());
+        the(prg.dirtyAttributeNames()).shouldBeEqual(prg.getAttributes().keySet());
 
         prg.saveIt();
         the(prg).shouldNotBe("new");
         the(prg).shouldNotBe("modified");
     }
+    
+    @Test
+    public void shouldBeModifiedAfterCopyTo() {
+        Programmer prg = Programmer.createIt("first_name", "John", "last_name", "Doe");
+        the(prg).shouldNotBe("new");
+        the(prg).shouldNotBe("modified");
+        
+        Programmer prg2 = Programmer.createIt("first_name", "Jane", "last_name", "Doe");
+        the(prg).shouldNotBe("new");
+        the(prg).shouldNotBe("modified");
+        
+        prg.copyTo(prg2);
+        the(prg).shouldNotBe("new");
+        the(prg2).shouldBe("modified");
+    }
+    
+    @Test
+    public void shouldBeCaseInsensitive() {
+        Programmer prg = new Programmer();
+        prg.set("FIRST_NAME", "John");
+        prg.set("First_Name", "John");
+        prg.set("first_name", "John");
+        the(prg.dirtyAttributeNames().size()).shouldBeEqual(1);
+    }
 }