diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Activity.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Activity.java index c90ade421..560c41d99 100644 --- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Activity.java +++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Activity.java @@ -1871,130 +1871,4 @@ public TeamsMeetingInfo teamsGetMeetingInfo() { return teamsChannelData != null ? teamsChannelData.getMeeting() : null; } - - /** - * Returns this activity as a Message Activity; or null, if this is not that type of activity. - * - * @return This activity as a message activity; or null. - */ - public Activity asMessageActivity() { - return isActivity(ActivityTypes.MESSAGE) ? this : null; - } - - /** - * Returns this activity as a Contact Relation Update Activity; or null, if this is not that type of activity. - * - * @return This activity as a contact relation update activity; or null. - */ - public Activity asContactRelationUpdateActivity() { - return isActivity(ActivityTypes.CONTACT_RELATION_UPDATE) ? this : null; - } - - /** - * Returns this activity as an Installation Update Activity; or null, if this is not that type of activity. - * - * @return This activity as an installation update activity; or null. - */ - public Activity asInstallationUpdateActivity() { - return isActivity(ActivityTypes.INSTALLATION_UPDATE) ? this : null; - } - - /** - * Returns this activity as a Conversation Update Activity; or null, if this is not that type of activity. - * - * @return This activity as a conversation update activity; or null. - */ - public Activity asConversationUpdateActivity() { - return isActivity(ActivityTypes.CONVERSATION_UPDATE) ? this : null; - } - - /** - * Returns this activity as a Typing Activity; or null, if this is not that type of activity. - * - * @return This activity as a typing activity; or null. - */ - public Activity asTypingActivity() { - return isActivity(ActivityTypes.TYPING) ? this : null; - } - - /** - * Returns this activity an End of Conversation Activity; or null, if this is not that type of activity. - * - * @return This activity as an end of conversation activity; or null. - */ - public Activity asEndOfConversationActivity() { - return isActivity(ActivityTypes.END_OF_CONVERSATION) ? this : null; - } - - /** - * Returns this activity an Event Activity; or null, if this is not that type of activity. - * - * @return This activity as an event activity; or null. - */ - public Activity asEventActivity() { - return isActivity(ActivityTypes.EVENT) ? this : null; - } - - /** - * Returns this activity an Invoke Activity; or null, if this is not that type of activity. - * - * @return This activity as an invoke activity; or null. - */ - public Activity asInvokeActivity() { - return isActivity(ActivityTypes.INVOKE) ? this : null; - } - - /** - * Returns this activity a Message Update Activity; or null, if this is not that type of activity. - * - * @return This activity as a message update activity; or null. - */ - public Activity asMessageUpdateActivity() { - return isActivity(ActivityTypes.MESSAGE_UPDATE) ? this : null; - } - - /** - * Returns this activity a Message Delete Activity; or null, if this is not that type of activity. - * - * @return This activity as a message delete activity; or null. - */ - public Activity asMessageDeleteActivity() { - return isActivity(ActivityTypes.MESSAGE_DELETE) ? this : null; - } - - /** - * Returns this activity a Message Reaction Activity; or null, if this is not that type of activity. - * - * @return This activity as a message reaction activity; or null. - */ - public Activity asMessageReactionActivity() { - return isActivity(ActivityTypes.MESSAGE_REACTION) ? this : null; - } - - /** - * Returns this activity a Suggestion Activity; or null, if this is not that type of activity. - * - * @return This activity as a suggestion activity; or null. - */ - public Activity asSuggestionActivity() { - return isActivity(ActivityTypes.SUGGESTION) ? this : null; - } - - /** - * Returns this activity a Trace Activity; or null, if this is not that type of activity. - * - * @return This activity as a trace activity; or null. - */ - public Activity asTraceActivity() { - return isActivity(ActivityTypes.TRACE) ? this : null; - } - - /** - * Returns this activity a Handoff Activity; or null, if this is not that type of activity. - * - * @return This activity as a handoff activity; or null. - */ - public Activity asHandoffActivity() { - return isActivity(ActivityTypes.HANDOFF) ? this : null; - } } diff --git a/libraries/bot-schema/src/test/java/com/microsoft/bot/schema/ActivityTest.java b/libraries/bot-schema/src/test/java/com/microsoft/bot/schema/ActivityTest.java index de444d73e..61bf75290 100644 --- a/libraries/bot-schema/src/test/java/com/microsoft/bot/schema/ActivityTest.java +++ b/libraries/bot-schema/src/test/java/com/microsoft/bot/schema/ActivityTest.java @@ -403,314 +403,6 @@ public void CreateReplyWithoutArguments() { Assert.assertEquals(reply.getLocale(), activity.getLocale()); } - @Test - public void AsMessageActivity() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asMessageActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.MESSAGE); - } - - @Test - public void AsMessageActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("trace"); - - Activity result = activity.asMessageActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsContactRelationUpdateActivity() { - Activity activity = createActivity(); - - activity.setType("contactRelationUpdate"); - - Activity result = activity.asContactRelationUpdateActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.CONTACT_RELATION_UPDATE); - } - - @Test - public void AsContactRelationUpdateActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asContactRelationUpdateActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsInstallationUpdateActivity() { - Activity activity = createActivity(); - - activity.setType("installationUpdate"); - - Activity result = activity.asInstallationUpdateActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.INSTALLATION_UPDATE); - } - - @Test - public void AsInstallationUpdateActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asInstallationUpdateActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsConversationUpdateActivity() { - Activity activity = createActivity(); - - activity.setType("conversationUpdate"); - - Activity result = activity.asConversationUpdateActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.CONVERSATION_UPDATE); - } - - @Test - public void AsConversationUpdateActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asConversationUpdateActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsTypingActivity() { - Activity activity = createActivity(); - - activity.setType("typing"); - - Activity result = activity.asTypingActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.TYPING); - } - - @Test - public void AsTypingActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asTypingActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsEndOfConversationActivity() { - Activity activity = createActivity(); - - activity.setType("endOfConversation"); - - Activity result = activity.asEndOfConversationActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.END_OF_CONVERSATION); - } - - @Test - public void AsEndOfConversationActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asEndOfConversationActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsEventActivity() { - Activity activity = createActivity(); - - activity.setType("event"); - - Activity result = activity.asEventActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.EVENT); - } - - @Test - public void AsEventActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asEventActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsInvokeActivity() { - Activity activity = createActivity(); - - activity.setType("invoke"); - - Activity result = activity.asInvokeActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.INVOKE); - } - - @Test - public void AsInvokeActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asInvokeActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsMessageUpdateActivity() { - Activity activity = createActivity(); - - activity.setType("messageUpdate"); - - Activity result = activity.asMessageUpdateActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.MESSAGE_UPDATE); - } - - @Test - public void AsMessageUpdateActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asMessageUpdateActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsMessageDeleteActivity() { - Activity activity = createActivity(); - - activity.setType("messageDelete"); - - Activity result = activity.asMessageDeleteActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.MESSAGE_DELETE); - } - - @Test - public void AsMessageDeleteActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asMessageDeleteActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsMessageReactionActivity() { - Activity activity = createActivity(); - - activity.setType("messageReaction"); - - Activity result = activity.asMessageReactionActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.MESSAGE_REACTION); - } - - @Test - public void AsMessageReactionActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asMessageReactionActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsSuggestionActivity() { - Activity activity = createActivity(); - - activity.setType("suggestion"); - - Activity result = activity.asSuggestionActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.SUGGESTION); - } - - @Test - public void AsSuggestionActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asSuggestionActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsTraceActivity() { - Activity activity = createActivity(); - - activity.setType("trace"); - - Activity result = activity.asTraceActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.TRACE); - } - - @Test - public void AsTraceActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asTraceActivity(); - - Assert.assertEquals(result, null); - } - - @Test - public void AsHandoffActivity() { - Activity activity = createActivity(); - - activity.setType("handoff"); - - Activity result = activity.asHandoffActivity(); - - Assert.assertEquals(result.getType(), ActivityTypes.HANDOFF); - } - - @Test - public void AsHandoffActivityIsNull() { - Activity activity = createActivity(); - - activity.setType("message"); - - Activity result = activity.asHandoffActivity(); - - Assert.assertEquals(result, null); - } - @Test public void HasContentIsFalseWhenActivityTextHasNoContent() { Activity activity = createActivity();