Merge branch 'master' of github.com:pardom/ActiveAndroid

pardom-zz · Apr 4, 2014 · a83b2c2 · a83b2c2
2 parents 3d0fef7 + ae6588a
commit a83b2c2
Show file tree

Hide file tree

Showing 3 changed files with 180 additions and 3 deletions.
diff --git a/src/com/activeandroid/Model.java b/src/com/activeandroid/Model.java
@@ -32,6 +32,10 @@
 
 @SuppressWarnings("unchecked")
 public abstract class Model {
+
+	/** Prime number used for hashcode() implementation. */
+	private static final int HASH_PRIME = 739;
+
 	//////////////////////////////////////////////////////////////////////////////////////
 	// PRIVATE MEMBERS
 	//////////////////////////////////////////////////////////////////////////////////////
@@ -289,9 +293,21 @@ public String toString() {
 
 	@Override
 	public boolean equals(Object obj) {
-		final Model other = (Model) obj;
+		if (obj instanceof Model && this.mId != null) {
+			final Model other = (Model) obj;
+
+			return this.mId.equals(other.mId)							
+							&& (this.mTableInfo.getTableName().equals(other.mTableInfo.getTableName()));
+		} else {
+			return this == obj;
+		}
+	}
 
-		return this.mId != null && (this.mTableInfo.getTableName().equals(other.mTableInfo.getTableName()))
-				&& (this.mId.equals(other.mId));
+	@Override
+	public int hashCode() {
+		int hash = HASH_PRIME;
+		hash += HASH_PRIME * (mId == null ? super.hashCode() : mId.hashCode()); //if id is null, use Object.hashCode()
+		hash += HASH_PRIME * mTableInfo.getTableName().hashCode();
+		return hash; //To change body of generated methods, choose Tools | Templates.
 	}
 }
diff --git a/src/com/activeandroid/util/SQLiteUtils.java b/src/com/activeandroid/util/SQLiteUtils.java
@@ -348,4 +348,36 @@ public static <T extends Model> List<T> processCursor(Class<? extends Model> typ
 
 		return entities;
 	}
+
+	public static List<String> lexSqlScript(String sqlScript) {
+		ArrayList<String> sl = new ArrayList<String>();
+		boolean inString = false, quoteNext = false;
+		StringBuilder b = new StringBuilder(100);
+
+		for (int i = 0; i < sqlScript.length(); i++) {
+			char c = sqlScript.charAt(i);
+
+			if (c == ';' && !inString && !quoteNext) {
+				sl.add(b.toString());
+				b = new StringBuilder(100);
+				inString = false;
+				quoteNext = false;
+				continue;
+			}
+
+			if (c == '\'' && !quoteNext) {
+				inString = !inString;
+			}
+
+			quoteNext = c == '\\' && !quoteNext;
+
+			b.append(c);
+		}
+
+		if (b.length() > 0) {
+			sl.add(b.toString());
+		}
+
+		return sl;
+	}
 }
diff --git a/tests/src/com/activeandroid/test/ModelTest.java b/tests/src/com/activeandroid/test/ModelTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2013 Vojtech Sigler.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.activeandroid.test;
+
+import com.activeandroid.Model;
+import com.activeandroid.annotation.Table;
+import java.util.HashSet;
+import java.util.Set;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+
+/**
+ * Simple test now covering equals and hashcode methods.
+ */
+public class ModelTest extends ActiveAndroidTestCase {
+
+	/**
+	 * Equals should be type-safe.
+	 */	
+	public void testEqualsNonModel() {
+		MockModel model = new MockModel();
+
+		assertFalse(model.equals("Dummy"));
+		assertFalse(model.equals(null));
+	}
+
+	/**
+	 * Equals should not be true for different model classes.
+	 */	
+	public void testEqualsDifferentModel() {
+		Model model1 = new MockModel();
+		Model model2 = new AnotherMockModel();
+
+		assertFalse(model1.equals(model2));
+	}
+
+	/**
+	 * A new object does not have PK assigned yet,
+	 * therefore by default it is equal only to itself.
+	 */	
+	public void testEqualsOnNew() {
+		MockModel model1 = new MockModel();
+		MockModel model2 = new MockModel();
+
+		assertFalse(model1.equals(model2));
+		assertFalse(model2.equals(model1));
+		assertTrue(model1.equals(model1));//equal only to itself
+	}
+
+	/**
+	 * Two different rows in a table should not be equal (different ids).
+	 */	
+	public void testEqualsDifferentRows() {
+		MockModel model1 = new MockModel();
+		MockModel model2 = new MockModel();
+		MockModel model3;
+
+		model1.save();
+		model2.save();
+		model3 = Model.load(MockModel.class, model1.getId());
+
+		assertFalse(model1.equals(model2));
+		assertFalse(model2.equals(model1));
+		assertTrue(model1.equals(model3));
+		assertTrue(model1.equals(model3));
+		assertFalse(model3.equals(model2));
+		assertFalse(model2.equals(model3));
+	}
+
+	/**
+	 * Tests hashcode for new instances.
+	 */	
+	public void testHashCode() {
+		Set<Model> set = new HashSet<Model>();
+		Model m1 = new MockModel();
+		Model m2 = new MockModel();
+		Model m3 = new AnotherMockModel();
+
+		assertFalse(m1.hashCode() == m2.hashCode()); // hashes for unsaved models must not match
+		set.add(m1);
+		set.add(m2);
+		assertEquals(2, set.size()); //try in a set
+
+		assertFalse(m1.hashCode() == m3.hashCode());
+		set.add(m3);
+		assertEquals(3, set.size());
+	}
+
+	/**
+	 * Two rows in a table should have different hashcodes.
+	 */
+	public void testHashCodeDifferentRows() {
+		Set<Model> set = new HashSet<Model>();
+		Model m1 = new MockModel();
+		Model m2 = new MockModel();
+		Model m3;
+
+		m1.save();
+		m2.save();
+		m3 = Model.load(MockModel.class, m1.getId());
+
+		assertEquals(m1.hashCode(), m3.hashCode());
+		assertFalse(m1.hashCode() == m2.hashCode());
+		set.add(m1);
+		set.add(m2);
+		set.add(m3);
+		assertEquals(2, set.size());
+	}
+
+	/**
+	 * Mock model as we need 2 different model classes.
+	 */
+	@Table(name = "AnotherMockTable")
+	public static class AnotherMockModel extends Model {}
+}