event bus beta

Author: bboyfeiyu

src/org/simple/eventbus/SubscribeMethod.java renamed to Simple_Event_Test/src/org/simple/eventbus/test/BusTestSuite.java

@@ -22,32 +22,22 @@
  * THE SOFTWARE.
  */
 
-package org.simple.eventbus;
+package org.simple.eventbus.test;
 
-import java.lang.reflect.Method;
+import android.test.suitebuilder.TestSuiteBuilder;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 /**
- * 订阅的函数
- * 
  * @author mrsimple
  */
-public class SubscribeMethod {
-    /**
-     * 订阅者
-     */
-    Method targetMethod;
-    /**
-     * 事件类型
-     */
-    Class<?> eventType;
-    /**
-     * 
-     */
-    ThreadMode threadMode;
-
-    public SubscribeMethod(Method md, Class<?> eventType, ThreadMode mode) {
-        this.targetMethod = md;
-        this.eventType = eventType;
-        this.threadMode = mode;
+public class BusTestSuite extends TestSuite {
+    public static Test suite() {
+        return new TestSuiteBuilder(BusTestSuite.class)
+                .includePackages(
+                        "org.simple.eventbus.test.EventBusTest",
+                        "org.simple.eventbus.test.SubscriberHolderTest")
+                .build();
     }
 }

Simple_Event_Test/src/org/simple/eventbus/test/EventBusTest.java

@@ -25,11 +25,17 @@
 package org.simple.eventbus.test;
 
 import android.test.AndroidTestCase;
+import android.util.Log;
 
 import org.simple.eventbus.EventBus;
+import org.simple.eventbus.EventType;
 import org.simple.eventbus.test.mock.MockActivity;
 import org.simple.eventbus.test.mock.Person;
+import org.simple.eventbus.test.mock.SingleSubscriber;
 
+/**
+ * @author mrsimple
+ */
 public class EventBusTest extends AndroidTestCase {
 
     EventBus bus = new EventBus();
@@ -45,18 +51,76 @@ protected void tearDown() throws Exception {
     /**
      * 
      */
-    public void testSubscribe() {
+    public void testRepeatRegister() {
         MockActivity mockActivity = new MockActivity();
-        bus.register(mockActivity);
-        bus.register(mockActivity);
-        bus.register(mockActivity);
-        bus.register(mockActivity);
+        for (int i = 0; i < 10; i++) {
+            // 测试重复注册一个对象
+            bus.register(mockActivity);
+        }
+
+        // 类型为Person的有效注册函数为2个.
+        assertEquals(2, bus.getSubscriptions(new EventType(Person.class)).size());
+        // Object类型的函数为1一个
+        assertEquals(1, bus.getSubscriptions(new EventType(Object.class)).size());
+    }
+
+    /**
+     * 
+     */
+    public void testRepeatRegisterWithTag() {
+        MockActivity mockActivity = new MockActivity();
+        for (int i = 0; i < 10; i++) {
+            // 测试重复注册一个对象
+            bus.register(mockActivity);
+        }
 
+        // 类型为Person且tag为"test"的有效注册函数为1个.
+        assertEquals(1, bus.getSubscriptions(new EventType(Person.class, "test")).size());
+
+        // 类型为Person且tag为"another"的有效注册函数为1个.
+        assertEquals(1, bus.getSubscriptions(new EventType(Person.class, "another")).size());
+    }
+
+    /**
+     * 
+     */
+    public void testSubscribeAndPost() {
+        MockActivity mockActivity = new MockActivity();
+        // 正常注册与发布
+        bus.register(mockActivity);
         bus.post(new Person("mr.simple"));
-        bus.unregister(mockActivity);
 
+        // 移除对象
+        bus.unregister(mockActivity);
+        // 移除对象之后post不会出现问题
         bus.post(new Person("mr.simple"));
+        // 移除对象测试
+        assertEquals(0, bus.getSubscriptions(new EventType(Person.class)).size());
+        assertEquals(0, bus.getSubscriptions(new EventType(Object.class)).size());
+    }
+
+    public void testRegisterNull() {
+        bus.register(null);
+    }
+
+    public void testUnRegisterNull() {
+        bus.unregister(null);
+    }
+
+    /**
+     * 
+     */
+    public void testPerformence() {
+        long start = System.nanoTime();
+        for (int i = 0; i < 1000; i++) {
+            SingleSubscriber subscriber = new SingleSubscriber();
+            bus.register(subscriber);
+        }
+        long end = System.nanoTime();
+        Log.d(getName(), "### register 1000 subscriber, time = " + (end - start) + " ns, "
+                + (end - start) / 1 * 1e6 + " ms");
 
+        assertEquals(1000, bus.getSubscriptions(new EventType(Object.class)).size());
     }
 
 }

Simple_Event_Test/src/org/simple/eventbus/test/SubscriberHolderTest.java

@@ -26,11 +26,13 @@
 
 import junit.framework.TestCase;
 
-import org.simple.eventbus.Event;
-
+import org.simple.eventbus.EventType;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * @author mrsimple
+ */
 public class SubscriberHolderTest extends TestCase {
 
     protected void setUp() throws Exception {
@@ -45,11 +47,11 @@ protected void tearDown() throws Exception {
      * 检测SubscriberHolder作为map的key的唯一性
      */
     public void testKeysInMap() {
-        Map<Event, String> map = new HashMap<Event, String>();
+        Map<EventType, String> map = new HashMap<EventType, String>();
 
         String tag = "default";
         for (int i = 0; i < 10; i++) {
-            map.put(new Event(String.class, tag), tag + i);
+            map.put(new EventType(String.class, tag), tag + i);
         }
 
         assertEquals(1, map.size());

Simple_Event_Test/src/org/simple/eventbus/test/mock/MockActivity.java

@@ -26,10 +26,64 @@
 
 import org.simple.eventbus.Subcriber;
 
+/**
+ * @author mrsimple
+ */
 public class MockActivity {
+
+    @Subcriber
+    void onEventNoParam() {
+    }
+
+    @Subcriber
+    void onEventTwoParam(Person person, int id) {
+
+    }
+
     @Subcriber
     void onEvent(Person person) {
         System.out.println("invoke onEvent(Person person) in " + this.getClass().getName());
         System.out.println("person name =  " + person.name);
     }
+
+    /**
+     * 参数相同,函数名不同
+     * 
+     * @param person
+     */
+    @Subcriber
+    void addPerson(Person person) {
+        System.out.println("invoke addPerson(Person person) in " + this.getClass().getName());
+        System.out.println("person name =  " + person.name);
+    }
+
+    /**
+     * test tag
+     * 
+     * @param person
+     */
+    @Subcriber(tag = "test")
+    void methodWithTag(Person person) {
+
+    }
+
+    /**
+     * another tag
+     * 
+     * @param person
+     */
+    @Subcriber(tag = "another")
+    void methodWithAnotherTag(Person person) {
+
+    }
+
+    /**
+     * 同名函数,但是参数不同
+     * 
+     * @param object
+     */
+    @Subcriber
+    void onEvent(Object object) {
+        System.out.println("invoke onEvent(Person person) in " + this.getClass().getName());
+    }
 }

Simple_Event_Test/src/org/simple/eventbus/test/mock/MockFragment.java renamed to Simple_Event_Test/src/org/simple/eventbus/test/mock/SingleSubscriber.java

@@ -29,20 +29,9 @@
 /**
  * @author mrsimple
  */
-public class MockFragment {
+public class SingleSubscriber {
     @Subcriber
     void onEvent(Object event) {
         System.out.println("invoke onEvent(Object event) in " + this.getClass().getName());
     }
-
-    @Subcriber
-    void onEvent(Person person) {
-        System.out.println("invoke onEvent(Person person) in " + this.getClass().getName());
-        System.out.println("person name =  " + person.name);
-    }
-
-    @Subcriber
-    void hello(Object event) {
-        System.out.println("invoke hello in " + this.getClass().getName());
-    }
 }

Simple_eventbus_demo/res/layout/activity_main.xml

@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#cccccc"
+    android:padding="2dp" >
+
+</ListView>

Simple_eventbus_demo/res/layout/list_fragment.xml

@@ -0,0 +1,23 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="3dp" >
+
+    <fragment
+        android:id="@+id/fragment_menu"
+        android:name="org.simple.eventbus.demo.fragment.MenuFragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <fragment
+        android:id="@+id/fragment_list"
+        android:name="org.simple.eventbus.demo.fragment.ConstactFragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="3" />
+
+</LinearLayout>

Simple_eventbus_demo/res/layout/main_activity.xml

@@ -2,32 +2,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#cccccc"
     android:orientation="vertical"
     android:padding="3dp" >
 
-    <Button
-        android:id="@+id/my_button_2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="回到到第一页" />
-
     <Button
         android:id="@+id/my_post_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="发布消息" />
+        android:text="添加用户" />
 
     <Button
-        android:id="@+id/my_post_event_tag_button"
+        android:id="@+id/my_remove_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="发布消息 ( tag == hello )" />
+        android:text="移除用户 ( tag == remove )" />
 
     <Button
         android:id="@+id/my_post_async_event_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="发布消息 ( mode == async )" />
 
+    <TextView
+        android:id="@+id/click_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp" />
+
 </LinearLayout>