From f8064e2d4810501472e29a7c06a1082e7cfce491 Mon Sep 17 00:00:00 2001 From: WonderCsabo Date: Sat, 9 May 2015 17:56:09 +0200 Subject: [PATCH 1/3] Fix @SeekBarTouchStop wrong naming convention SeekBarTouchStoped was expected instead of SeekBarTouchStopped --- .../java/org/androidannotations/helper/AnnotationHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java index 3c7fda50f4..ff4b5f1e9d 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java @@ -42,6 +42,7 @@ import org.androidannotations.annotations.OnActivityResult; import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.ResId; +import org.androidannotations.annotations.SeekBarTouchStop; import org.androidannotations.logger.Level; import org.androidannotations.logger.Logger; import org.androidannotations.logger.LoggerFactory; @@ -366,6 +367,9 @@ public String actionName(String annotationName) { if (OnActivityResult.class.getName().equals(annotationName)) { return "Result"; } + if (SeekBarTouchStop.class.getName().equals(annotationName)) { + return "SeekBarTouchStopped"; + } String annotationSimpleName = annotationName.substring(annotationName.lastIndexOf('.') + 1); if (annotationSimpleName.endsWith("e")) { return annotationSimpleName + "d"; From 70ce177069d4b682b23ed986c3593ddcf309e4e3 Mon Sep 17 00:00:00 2001 From: WonderCsabo Date: Sat, 9 May 2015 17:56:42 +0200 Subject: [PATCH 2/3] Test @SeekBarTouchStop naming convention --- .../test15/SeekBarChangeListenedActivity.java | 5 +++++ .../test15/SeekBarChangeListenedActivityTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java index 723aa4771e..33fd91ce17 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/SeekBarChangeListenedActivity.java @@ -77,6 +77,11 @@ void m9(SeekBar seekBar) { void m10() { } + @SeekBarTouchStop + void seekBar1SeekBarTouchStopped() { + handled = true; + } + @SeekBarTouchStart(R.id.seekBar1) void m11(SeekBar seekBar) { } diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java b/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java index 8d40d49b58..d6586d5d1c 100644 --- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java +++ b/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java @@ -86,4 +86,16 @@ public void testFromUserPassed() { assertThat(activity.fromUser).isTrue(); } + @Test + public void testSeekBarTouchStopNamingConvention() { + assertThat(activity.handled).isFalse(); + + SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); + ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); + + shadowSeekBar.getOnSeekBarChangeListener().onStopTrackingTouch(seekBar); + + assertThat(activity.handled).isTrue(); + } + } From fd868926205b4eb235ca6a421a841b560dc7ef96 Mon Sep 17 00:00:00 2001 From: WonderCsabo Date: Sat, 9 May 2015 17:59:54 +0200 Subject: [PATCH 3/3] Refactor SeekBarChangeListenedActivityTest --- .../SeekBarChangeListenedActivityTest.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java b/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java index d6586d5d1c..42f0bacd35 100644 --- a/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java +++ b/AndroidAnnotations/functional-test-1-5/src/test/java/org/androidannotations/test15/SeekBarChangeListenedActivityTest.java @@ -31,19 +31,20 @@ public class SeekBarChangeListenedActivityTest { private SeekBarChangeListenedActivity_ activity; + private SeekBar seekBar; + private ShadowSeekBar shadowSeekBar; @Before public void setUp() { activity = setupActivity(SeekBarChangeListenedActivity_.class); + seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); + shadowSeekBar = shadowOf_(seekBar); } @Test public void testActionHandled() { assertThat(activity.handled).isFalse(); - SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); - ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); - shadowSeekBar.getOnSeekBarChangeListener().onProgressChanged(seekBar, 0, false); assertThat(activity.handled).isTrue(); @@ -53,9 +54,6 @@ public void testActionHandled() { public void testSeekBarPassed() { assertThat(activity.seekBar).isNull(); - SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); - ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); - shadowSeekBar.getOnSeekBarChangeListener().onProgressChanged(seekBar, 0, false); assertThat(activity.seekBar).isEqualTo(seekBar); @@ -65,8 +63,6 @@ public void testSeekBarPassed() { public void testProgressPassed() { assertThat(activity.progress).isZero(); - SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); - ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); int progress = 45; shadowSeekBar.getOnSeekBarChangeListener().onProgressChanged(seekBar, progress, false); @@ -78,9 +74,6 @@ public void testProgressPassed() { public void testFromUserPassed() { assertThat(activity.fromUser).isFalse(); - SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); - ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); - shadowSeekBar.getOnSeekBarChangeListener().onProgressChanged(seekBar, 0, true); assertThat(activity.fromUser).isTrue(); @@ -90,9 +83,6 @@ public void testFromUserPassed() { public void testSeekBarTouchStopNamingConvention() { assertThat(activity.handled).isFalse(); - SeekBar seekBar = (SeekBar) activity.findViewById(R.id.seekBar1); - ShadowSeekBar shadowSeekBar = shadowOf_(seekBar); - shadowSeekBar.getOnSeekBarChangeListener().onStopTrackingTouch(seekBar); assertThat(activity.handled).isTrue();