#48 Cleaning up tests.

codegen/src/main/java/org/robobinding/codegen/processor/PropertyUtils.java

@@ -1,7 +1,7 @@
 package org.robobinding.codegen.processor;
 
 import org.apache.commons.lang3.StringUtils;
-import org.robobinding.function.Bug;
+import org.robobinding.Bug;
 import org.robobinding.internal.java_beans.Introspector;
 
 

framework/src/test/java/org/robobinding/property/DependencyValidationTest.java → codegen/src/test/java/org/robobinding/codegen/processor/DependencyValidationTest.java

@@ -1,12 +1,9 @@
-package org.robobinding.property;
-
-import static org.robobinding.property.MockPropertyAccessorBuilder.aPropertyAccessor;
+package org.robobinding.codegen.processor;
 
 import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.robobinding.codegen.DependencyValidation;
 
 import com.google.common.collect.Sets;
 
@@ -30,17 +27,17 @@ public void setUp() {
 
 	@Test
 	public void givenValidDependentProperties_thenSuccessful() {
-		validation.validate(aPropertyAccessor().withPropertyName(PROPERTY_NAME).build(), Sets.newHashSet("property1", "property2"));
+		validation.validate(PROPERTY_NAME, Sets.newHashSet("property1", "property2"));
 	}
 
 	@Test(expected = RuntimeException.class)
 	public void givenDependingOnSelf_thenThrowException() {
-		validation.validate(aPropertyAccessor().withPropertyName(PROPERTY_NAME).build(), Sets.newHashSet("property1", PROPERTY_NAME, "property2"));
+		validation.validate(PROPERTY_NAME, Sets.newHashSet("property1", PROPERTY_NAME, "property2"));
 	}
 
 	@Test(expected = RuntimeException.class)
 	public void whenCreateWithSomeNonExistingDependentProperties_thenThrowException() {
-		validation.validate(aPropertyAccessor().withPropertyName(PROPERTY_NAME).build(), Sets.newHashSet("property1", "nonExistingProperty", "property2"));
+		validation.validate(PROPERTY_NAME, Sets.newHashSet("property1", "nonExistingProperty", "property2"));
 	}
 
 }

framework/src/integTest/java/org/robobinding/itempresentationmodel/BeanCursor.java

@@ -1,18 +1,19 @@
 package org.robobinding.itempresentationmodel;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.robobinding.property.PropertyAccessor;
-import org.robobinding.property.PropertyDescriptor;
+import org.robobinding.internal.java_beans.PropertyDescriptor;
 import org.robobinding.property.PropertyUtils;
 
 import android.database.AbstractCursor;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 /**
  * 
@@ -84,16 +85,23 @@ public boolean isNull(int column) {
 
 	private Object getColumnValue(int column) {
 		Preconditions.checkArgument(column < getNumColumns(), "column '" + column + "' is out of bound");
-		PropertyAccessor propertyAccesor = mapColumnToPropertyAccessor(column);
-		return propertyAccesor.getValue();
+		PropertyDescriptor descriptor = mapColumnToPropertyDescriptor(column);
+		try {
+			return descriptor.getReadMethod().invoke(getBean(), new Object[0]);
+		} catch (IllegalAccessException e) {
+			throw new RuntimeException(e);
+		} catch (IllegalArgumentException e) {
+			throw new RuntimeException(e);
+		} catch (InvocationTargetException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
-	private PropertyAccessor mapColumnToPropertyAccessor(int column) {
+	private PropertyDescriptor mapColumnToPropertyDescriptor(int column) {
 		String propertyName = mapColumnToPropertyName(column);
 		PropertyDescriptor descriptor = propertyDescriptorMap.get(propertyName);
 
-		PropertyAccessor propertyAccesor = new PropertyAccessor(getBean(), descriptor);
-		return propertyAccesor;
+		return descriptor;
 	}
 
 	private String mapColumnToPropertyName(int column) {
@@ -117,7 +125,14 @@ public T getObjectAtPosition(int position) {
 	public static <T> BeanCursor<T> create(Collection<T> beans, Class<T> beanClass) {
 		Preconditions.checkNotNull(beans, "beans can not be null");
 		Preconditions.checkNotNull(beanClass, "beanClass can not be null");
-		return new BeanCursor<T>(Lists.newArrayList(beans), PropertyUtils.getPropertyDescriptorMap(beanClass));
-
+		return new BeanCursor<T>(Lists.newArrayList(beans), getPropertyDescriptorMap(beanClass));
+	}
+
+	private static Map<String, PropertyDescriptor> getPropertyDescriptorMap(Class<?> beanClass) {
+		Map<String, PropertyDescriptor> propertyDescriptorMap = Maps.newHashMap();
+		for(PropertyDescriptor descriptor : PropertyUtils.getPropertyDescriptors(beanClass)) {
+			propertyDescriptorMap.put(descriptor.getName(), descriptor);
+		}
+		return propertyDescriptorMap;
 	}
 }

framework/src/integTest/java/org/robobinding/widget/abslistview/CheckedItemPositionAttributeTest.java

@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.adapterview.AbstractAdapterViewAttributeTest;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;

framework/src/integTest/java/org/robobinding/widget/abslistview/MapCheckedItemPositionsAttributeTest.java

@@ -9,7 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.abslistview.CheckedItemPositionsAttribute.MapCheckedItemPositionsAttribute;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/abslistview/SetCheckedItemPositionsAttributeTest.java

@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.abslistview.CheckedItemPositionsAttribute.SetCheckedItemPositionsAttribute;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/abslistview/SparseBooleanArrayCheckedItemPositionsAttributeTest.java

@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.abslistview.CheckedItemPositionsAttribute.SparseBooleanArrayCheckedItemPositionsAttribute;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/adapterview/DataSetAdapterTest.java

@@ -19,6 +19,7 @@
 import org.mockito.MockitoAnnotations;
 import org.robobinding.BindableView;
 import org.robobinding.itempresentationmodel.ItemPresentationModel;
+import org.robobinding.itempresentationmodel.RefreshableItemPresentationModel;
 import org.robobinding.property.DataSetValueModel;
 import org.robobinding.property.PropertyChangeListener;
 import org.robobinding.property.PropertyChangeListeners;
@@ -168,10 +169,9 @@ public Object getItem(int position) {
 			return null;
 		}
 
-		@SuppressWarnings("unchecked")
 		@Override
-		public ItemPresentationModel<Object> newRefreshableItemPresentationModel() {
-			return mock(ItemPresentationModel.class);
+		public RefreshableItemPresentationModel newRefreshableItemPresentationModel() {
+			return mock(RefreshableItemPresentationModel.class);
 		}
 	}
 }

framework/src/integTest/java/org/robobinding/widget/adapterview/SelectedItemPositionAttributeTest.java

@@ -8,8 +8,8 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
 import org.robobinding.util.RandomValues;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/compoundbutton/CheckedAttributeTest.java

@@ -6,8 +6,8 @@
 
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
 import org.robobinding.util.RandomValues;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robolectric.annotation.Config;
 
 /**

framework/src/integTest/java/org/robobinding/widget/edittext/TwoWayCharSequenceAttributeTest.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.edittext.TwoWayTextAttribute.TwoWayCharSequenceTextAttribute;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;

framework/src/integTest/java/org/robobinding/widget/edittext/TwoWayStringTextAttributeTest.java

@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.edittext.TwoWayTextAttribute.TwoWayStringTextAttribute;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;

framework/src/integTest/java/org/robobinding/widget/ratingbar/FloatRatingAttributeTest.java

@@ -7,8 +7,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
 import org.robobinding.util.RandomValues;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.ratingbar.RatingAttribute.FloatRatingAttribute;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/ratingbar/IntegerRatingAttributeTest.java

@@ -7,8 +7,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
 import org.robobinding.util.RandomValues;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robobinding.widget.ratingbar.RatingAttribute.IntegerRatingAttribute;
 import org.robolectric.annotation.Config;
 

framework/src/integTest/java/org/robobinding/widget/seekbar/TwoWayProgressAttributeTest.java

@@ -7,8 +7,8 @@
 
 import org.junit.Test;
 import org.robobinding.property.ValueModel;
-import org.robobinding.property.ValueModelUtils;
 import org.robobinding.util.RandomValues;
+import org.robobinding.viewattribute.property.ValueModelUtils;
 import org.robolectric.annotation.Config;
 
 /**

framework/src/main/java/org/robobinding/function/Bug.java → framework/src/main/java/org/robobinding/Bug.java

@@ -1,4 +1,4 @@
-package org.robobinding.function;
+package org.robobinding;
 
 /**
  * @since 1.0

framework/src/main/java/org/robobinding/function/LazyFunctions.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.robobinding.Bug;
 import org.robobinding.util.MethodUtils;
 
 import com.google.android.collect.Maps;
@@ -42,24 +43,21 @@ public Function find(String functionName, Class<?>... parameterTypes) {
 		}
 
 		MethodDescriptor methodDescriptor = new MethodDescriptor(method.getName(), method.getParameterTypes());
+		if(!functions.containsKey(methodDescriptor)) {
+			throw new RuntimeException("No such method '"+new MethodDescription(beanClass, method)+"'");
+		}
 
-		Function function = functions.get(method);
+		Function function = functions.get(methodDescriptor);
 
 		if (function == null) {
-			functions.put(methodDescriptor, createFunction(method, methodDescriptor));
-			function = functions.get(method);
+			function = supply.tryToCreateFunction(methodDescriptor);
+			if(function == null) {
+				throw new Bug(MessageFormat.format("The method '{0}' is not generated",  new MethodDescription(beanClass, method)));
+			}
+
+			functions.put(methodDescriptor, function);
 		}
 
 		return function;
 	}
-
-	private Function createFunction(Method method, MethodDescriptor methodDescriptor) {
-		Function function = supply.tryToCreateFunction(methodDescriptor);
-		if(function == null) {
-			MethodDescription description = new MethodDescription(beanClass, method);
-			throw new Bug(MessageFormat.format("The method '{0}' is not generated", description));
-		} else {
-			return function;
-		}
-	}
 }

framework/src/main/java/org/robobinding/function/MethodDescriptor.java

@@ -32,6 +32,10 @@ public boolean equals(Object other) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hashCode(name, parameterTypes);
+		int sum = Objects.hashCode(name);
+		for(Class<?> parameterType : parameterTypes) {
+			sum += Objects.hashCode(parameterType);
+		}
+		return sum;
 	}
 }

framework/src/main/java/org/robobinding/property/AbstractGetSet.java

@@ -1,6 +1,6 @@
 package org.robobinding.property;
 
-import org.robobinding.function.Bug;
+import org.robobinding.Bug;
 
 /**
  * @since 1.0

framework/src/main/java/org/robobinding/property/LazyProperties.java

@@ -48,7 +48,7 @@ public <T> ValueModel<T> getReadOnlyProperty(String propertyName) {
 	}
 
 	private PropertyValueModel getProperty(String propertyName, boolean isReadWriteProperty) {
-		if(properties.containsKey(propertyName)) {
+		if(!properties.containsKey(propertyName)) {
 			throw new RuntimeException("No such property '"+describeProperty(propertyName)+"'");
 		}
 
@@ -81,7 +81,7 @@ public Class<?> getPropertyType(String propertyName) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> DataSetValueModel<T> getDataSetProperty(String propertyName) {
-		if(dataSetProperties.containsKey(propertyName)) {
+		if(!dataSetProperties.containsKey(propertyName)) {
 			throw new RuntimeException("No such dataSet property '"+describeProperty(propertyName)+"'");
 		}
 

framework/src/main/java/org/robobinding/property/PropertyWithDependencySupply.java

@@ -2,7 +2,7 @@
 
 import java.text.MessageFormat;
 
-import org.robobinding.function.Bug;
+import org.robobinding.Bug;
 
 /**
  * @since 1.0