Fixing issue 123, adding long prefs and related functional tests

pyricau · pyricau · commit a7118106ca5c · 2011-11-10T11:08:53.000+01:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SharedPrefProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/SharedPrefProcessor.java
@@ -30,6 +30,7 @@
 import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultBoolean;
 import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultFloat;
 import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultInt;
+import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultLong;
 import com.googlecode.androidannotations.annotations.sharedpreferences.DefaultString;
 import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref;
 import com.googlecode.androidannotations.annotations.sharedpreferences.SharedPref.Scope;
@@ -41,6 +42,7 @@
 import com.googlecode.androidannotations.api.sharedpreferences.IntPrefEditorField;
 import com.googlecode.androidannotations.api.sharedpreferences.IntPrefField;
 import com.googlecode.androidannotations.api.sharedpreferences.LongPrefEditorField;
+import com.googlecode.androidannotations.api.sharedpreferences.LongPrefField;
 import com.googlecode.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
 import com.googlecode.androidannotations.api.sharedpreferences.StringPrefEditorField;
 import com.googlecode.androidannotations.api.sharedpreferences.StringPrefField;
@@ -193,8 +195,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder activiti
                     defaultValue = JExpr.lit(false);
                 }
                 addFieldHelperMethod(helperClass, fieldName, defaultValue, BooleanPrefField.class, "booleanField");
-            }
-            if ("float".equals(returnType)) {
+            } else if ("float".equals(returnType)) {
                 JExpression defaultValue;
                 DefaultFloat defaultAnnotation = method.getAnnotation(DefaultFloat.class);
                 if (defaultAnnotation != null) {
@@ -203,8 +204,7 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder activiti
                     defaultValue = JExpr.lit(0f);
                 }
                 addFieldHelperMethod(helperClass, fieldName, defaultValue, FloatPrefField.class, "floatField");
-            }
-            if ("int".equals(returnType)) {
+            } else if ("int".equals(returnType)) {
                 JExpression defaultValue;
                 DefaultInt defaultAnnotation = method.getAnnotation(DefaultInt.class);
                 if (defaultAnnotation != null) {
@@ -213,8 +213,16 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder activiti
                     defaultValue = JExpr.lit(0);
                 }
                 addFieldHelperMethod(helperClass, fieldName, defaultValue, IntPrefField.class, "intField");
-            }
-            if ("java.lang.String".equals(returnType)) {
+            } else if ("long".equals(returnType)) {
+                JExpression defaultValue;
+                DefaultLong defaultAnnotation = method.getAnnotation(DefaultLong.class);
+                if (defaultAnnotation != null) {
+                    defaultValue = JExpr.lit(defaultAnnotation.value());
+                } else {
+                    defaultValue = JExpr.lit(0l);
+                }
+                addFieldHelperMethod(helperClass, fieldName, defaultValue, LongPrefField.class, "longField");
+            } else if ("java.lang.String".equals(returnType)) {
                 JExpression defaultValue;
                 DefaultString defaultAnnotation = method.getAnnotation(DefaultString.class);
                 if (defaultAnnotation != null) {
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/SomePrefs.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/prefs/SomePrefs.java
@@ -28,4 +28,7 @@ public interface SomePrefs {
 	
 	@DefaultInt(42)
 	int age();
+	
+	long lastUpdated();
+	
 }
diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/com/googlecode/androidannotations/test15/prefs/PrefsActivityTest.java b/AndroidAnnotations/functional-test-1-5/src/test/java/com/googlecode/androidannotations/test15/prefs/PrefsActivityTest.java
@@ -62,6 +62,22 @@ public void putInt() {
         somePrefs.age().put(42);
         assertThat(sharedPref.getInt("age", 0)).isEqualTo(42);
     }
+    
+    @Test
+    public void putLong() {
+        long now = System.currentTimeMillis();
+		somePrefs.lastUpdated().put(now);
+        assertThat(sharedPref.getLong("lastUpdated", 0)).isEqualTo(now);
+    }
+    
+    @Test
+    public void editLong() {
+        long now = System.currentTimeMillis();
+        
+        somePrefs.edit().lastUpdated().put(now).apply();
+
+        assertThat(sharedPref.getLong("lastUpdated", 0)).isEqualTo(now);
+    }    
 
     @Test
     public void putTwoValuesChained() {
@@ -122,6 +138,15 @@ public void getString() {
 
         assertThat(somePrefs.name().get()).isEqualTo("Something");
     }
+    
+    @Test
+    public void getLong() {
+        long now = System.currentTimeMillis();
+
+        sharedPref.edit().putLong("lastUpdated", now).commit();
+
+        assertThat(somePrefs.lastUpdated().get()).isEqualTo(now);
+    }
 
     @Test
     public void defaultValue() {

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,7 @@ public interface SomePrefs {`
`28`	`28`
`29`	`29`	`@DefaultInt(42)`
`30`	`30`	`int age();`
	`31`	`+`
	`32`	`+ long lastUpdated();`
	`33`	`+`
`31`	`34`	`}`