Remove _activity from add and remove installation update event names

EricDahlvang · EricDahlvang · commit 631920925f6c · 2020-10-07T13:37:44.000-07:00
diff --git a/libraries/botbuilder-core/botbuilder/core/activity_handler.py b/libraries/botbuilder-core/botbuilder/core/activity_handler.py
@@ -379,12 +379,12 @@ async def on_installation_update(  # pylint: disable=unused-argument
         :returns: A task that represents the work queued to execute
         """
         if turn_context.activity.action == "add":
-            return await self.on_installation_update_add_activity(turn_context)
+            return await self.on_installation_update_add(turn_context)
         if turn_context.activity.action == "remove":
-            return await self.on_installation_update_remove_activity(turn_context)
+            return await self.on_installation_update_remove(turn_context)
         return
 
-    async def on_installation_update_add_activity(  # pylint: disable=unused-argument
+    async def on_installation_update_add(  # pylint: disable=unused-argument
         self, turn_context: TurnContext
     ):
         """
@@ -397,7 +397,7 @@ async def on_installation_update_add_activity(  # pylint: disable=unused-argumen
         """
         return
 
-    async def on_installation_update_remove_activity(  # pylint: disable=unused-argument
+    async def on_installation_update_remove(  # pylint: disable=unused-argument
         self, turn_context: TurnContext
     ):
         """
diff --git a/libraries/botbuilder-core/tests/test_activity_handler.py b/libraries/botbuilder-core/tests/test_activity_handler.py
@@ -77,13 +77,13 @@ async def on_installation_update(self, turn_context: TurnContext):
         self.record.append("on_installation_update")
         return await super().on_installation_update(turn_context)
 
-    async def on_installation_update_add_activity(self, turn_context: TurnContext):
-        self.record.append("on_installation_update_add_activity")
-        return await super().on_installation_update_add_activity(turn_context)
+    async def on_installation_update_add(self, turn_context: TurnContext):
+        self.record.append("on_installation_update_add")
+        return await super().on_installation_update_add(turn_context)
 
-    async def on_installation_update_remove_activity(self, turn_context: TurnContext):
-        self.record.append("on_installation_update_remove_activity")
-        return await super().on_installation_update_remove_activity(turn_context)
+    async def on_installation_update_remove(self, turn_context: TurnContext):
+        self.record.append("on_installation_update_remove")
+        return await super().on_installation_update_remove(turn_context)
 
     async def on_unrecognized_activity_type(self, turn_context: TurnContext):
         self.record.append("on_unrecognized_activity_type")
@@ -254,7 +254,7 @@ async def test_on_installation_update(self):
         assert len(bot.record) == 1
         assert bot.record[0] == "on_installation_update"
 
-    async def test_on_installation_update_add_activity(self):
+    async def test_on_installation_update_add(self):
         activity = Activity(type=ActivityTypes.installation_update, action="add")
 
         adapter = TestInvokeAdapter()
@@ -266,9 +266,9 @@ async def test_on_installation_update_add_activity(self):
 
         assert len(bot.record) == 2
         assert bot.record[0] == "on_installation_update"
-        assert bot.record[1] == "on_installation_update_add_activity"
+        assert bot.record[1] == "on_installation_update_add"
 
-    async def test_on_installation_update_add_remove_activity(self):
+    async def test_on_installation_update_add_remove(self):
         activity = Activity(type=ActivityTypes.installation_update, action="remove")
 
         adapter = TestInvokeAdapter()
@@ -280,7 +280,7 @@ async def test_on_installation_update_add_remove_activity(self):
 
         assert len(bot.record) == 2
         assert bot.record[0] == "on_installation_update"
-        assert bot.record[1] == "on_installation_update_remove_activity"
+        assert bot.record[1] == "on_installation_update_remove"
 
     async def test_healthcheck(self):
         activity = Activity(type=ActivityTypes.invoke, name="healthcheck",)
