From 5328175f8f07f7e8780a0d4ae54a4ec3e9074c25 Mon Sep 17 00:00:00 2001 From: Milton Reder Date: Fri, 7 Feb 2025 13:52:22 -0500 Subject: [PATCH] LMS Object Cleanup (#77) * change default site object name to Moodle LMS * use util for LMS site obj * add LMS course to common data, breaking almost everything * amend tests to account for hidden course ID 1 * semantically order all json keys since they got sorted anyhow --- src/transformer/events/core/badge_awarded.php | 13 +- src/transformer/events/core/badge_revoked.php | 11 +- src/transformer/utils/get_activity/site.php | 2 +- tests/common/data.json | 29 +-- tests/common/statement.json | 4 +- .../user_achieved_badge/data.json | 51 ++--- .../user_achieved_badge/event.json | 10 +- .../user_achieved_badge/statements.json | 68 +++---- .../user_forfeited_badge/data.json | 30 +-- .../user_forfeited_badge/event.json | 8 +- .../user_forfeited_badge/statements.json | 48 ++--- tests/core/badge_updated/data.json | 6 +- tests/core/badge_updated/event.json | 10 +- tests/core/badge_updated/statements.json | 36 ++-- .../badge_viewed/user_viewed_badge/data.json | 4 +- .../badge_viewed/user_viewed_badge/event.json | 14 +- .../user_viewed_badge/statements.json | 16 +- .../user_created_calendar_event/data.json | 15 +- .../user_created_calendar_event/event.json | 8 +- .../statements.json | 40 ++-- .../user_deleted_calendar_event/data.json | 15 +- .../user_deleted_calendar_event/event.json | 8 +- .../statements.json | 40 ++-- .../user_updated_calendar_event/data.json | 15 +- .../user_updated_calendar_event/event.json | 8 +- .../statements.json | 40 ++-- .../event.json | 14 +- .../statements.json | 24 +-- .../event.json | 10 +- .../statements.json | 6 +- .../event.json | 14 +- .../statements.json | 20 +- tests/core/course_category_created/data.json | 25 +-- tests/core/course_category_created/event.json | 6 +- .../course_category_created/statements.json | 44 ++-- .../completing_existing_course/data.json | 7 - .../completing_existing_course/event.json | 8 +- .../statements.json | 36 ++-- .../course_completed/send_jisc_data/data.json | 19 +- .../send_jisc_data/event.json | 10 +- .../send_jisc_data/statements.json | 48 ++--- .../core/course_completion_updated/data.json | 7 - .../core/course_completion_updated/event.json | 8 +- .../course_completion_updated/statements.json | 44 ++-- .../creating_new_course/data.json | 7 - .../creating_new_course/event.json | 10 +- .../creating_new_course/statements.json | 18 +- .../completing_existing_module/data.json | 8 +- .../completing_existing_module/event.json | 8 +- .../statements.json | 68 +++---- .../uncompleting_existing_module/data.json | 8 +- .../uncompleting_existing_module/event.json | 8 +- .../statements.json | 60 +++--- .../creating_new_course_module/data.json | 8 +- .../creating_new_course_module/event.json | 10 +- .../statements.json | 42 ++-- .../data.json | 7 - .../event.json | 8 +- .../statements.json | 48 ++--- .../new_course_section_created/data.json | 14 +- .../new_course_section_created/event.json | 8 +- .../statements.json | 28 +-- .../updating_existing_course/data.json | 7 - .../updating_existing_course/event.json | 10 +- .../updating_existing_course/statements.json | 18 +- .../viewing_existing_course/data.json | 7 - .../viewing_existing_course/event.json | 8 +- .../viewing_existing_course/statements.json | 36 ++-- .../creating_new_group/event.json | 8 +- .../creating_new_group/statements.json | 32 +-- .../existing_group_deleted/event.json | 8 +- .../existing_group_deleted/statements.json | 22 +- .../new_group_member_added/data.json | 12 +- .../new_group_member_added/event.json | 10 +- .../new_group_member_added/statements.json | 46 ++--- .../existing_group_member_removed/data.json | 12 +- .../existing_group_member_removed/event.json | 10 +- .../statements.json | 46 ++--- .../new_group_message_sent/data.json | 20 +- .../new_group_message_sent/event.json | 8 +- .../new_group_message_sent/statements.json | 50 ++--- .../message_sent/user_sent_message/data.json | 22 +- .../message_sent/user_sent_message/event.json | 10 +- .../user_sent_message/statements.json | 4 +- .../user_viewed_message/data.json | 22 +- .../user_viewed_message/event.json | 10 +- .../user_viewed_message/statements.json | 42 ++-- .../note_created/user_created_note/data.json | 12 +- .../note_created/user_created_note/event.json | 10 +- .../user_created_note/statements.json | 20 +- .../note_updated/user_updated_note/data.json | 16 +- .../note_updated/user_updated_note/event.json | 10 +- .../user_updated_note/statements.json | 20 +- .../notes_viewed/user_viewed_notes/data.json | 12 +- .../notes_viewed/user_viewed_notes/event.json | 10 +- .../user_viewed_notes/statements.json | 16 +- .../new_question_created/data.json | 6 +- .../new_question_created/event.json | 8 +- .../new_question_created/statements.json | 44 ++-- .../new_questions_imported/event.json | 10 +- .../new_questions_imported/statements.json | 30 +-- .../user_viewed_search_results/event.json | 8 +- .../statements.json | 20 +- .../existing_user_created/data.json | 7 - .../existing_user_created/event.json | 8 +- .../existing_user_created/statements.json | 36 ++-- .../user_created/send_jisc_data/data.json | 19 +- .../user_created/send_jisc_data/event.json | 10 +- .../send_jisc_data/statements.json | 42 ++-- .../existing_user_enrolled/event.json | 12 +- .../existing_user_enrolled/statements.json | 52 ++--- .../event.json | 12 +- .../statements.json | 52 ++--- .../user_resumed_course/event.json | 12 +- .../user_resumed_course/statements.json | 52 ++--- .../user_suspended_course/event.json | 12 +- .../user_suspended_course/statements.json | 52 ++--- .../existing_user_loggedin/event.json | 10 +- .../existing_user_loggedin/statements.json | 20 +- .../existing_user_loggedinas/event.json | 10 +- .../existing_user_loggedinas/statements.json | 30 +-- .../existing_user_loggedout/event.json | 8 +- .../existing_user_loggedout/statements.json | 20 +- tests/core_h5p/course_module_viewed/data.json | 8 +- .../core_h5p/course_module_viewed/event.json | 8 +- .../course_module_viewed/statements.json | 60 +++--- .../data.json | 42 ++-- .../event.json | 10 +- .../statements.json | 100 ++++----- .../data.json | 34 ++-- .../event.json | 10 +- .../statements.json | 98 ++++----- .../existing_assignment_submitted/data.json | 8 +- .../existing_assignment_submitted/event.json | 10 +- .../statements.json | 68 +++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../user_viewed_feedback/data.json | 24 +-- .../user_viewed_feedback/event.json | 10 +- .../user_viewed_feedback/statements.json | 62 +++--- tests/mod_assign/submission_locked/data.json | 8 +- tests/mod_assign/submission_locked/event.json | 12 +- .../submission_locked/statements.json | 82 ++++---- .../mod_assign/submission_unlocked/data.json | 8 +- .../mod_assign/submission_unlocked/event.json | 12 +- .../submission_unlocked/statements.json | 82 ++++---- tests/mod_assign/submission_viewed/data.json | 8 +- tests/mod_assign/submission_viewed/event.json | 12 +- .../submission_viewed/statements.json | 82 ++++---- .../activity_management_viewed/data.json | 8 +- .../activity_management_viewed/event.json | 10 +- .../statements.json | 60 +++--- .../live_session/data.json | 8 +- .../live_session/event.json | 10 +- .../live_session/statements.json | 60 +++--- .../meeting_created/data.json | 8 +- .../meeting_created/event.json | 10 +- .../meeting_created/statements.json | 60 +++--- .../meeting_ended/data.json | 8 +- .../meeting_ended/event.json | 10 +- .../meeting_ended/statements.json | 60 +++--- .../meeting_joined/data.json | 8 +- .../meeting_joined/event.json | 10 +- .../meeting_joined/statements.json | 60 +++--- .../meeting_left/data.json | 8 +- .../meeting_left/event.json | 10 +- .../meeting_left/statements.json | 60 +++--- .../recording_deleted/data.json | 8 +- .../recording_deleted/event.json | 10 +- .../recording_deleted/statements.json | 60 +++--- .../recording_edited/data.json | 8 +- .../recording_edited/event.json | 10 +- .../recording_edited/statements.json | 60 +++--- .../recording_imported/data.json | 8 +- .../recording_imported/event.json | 10 +- .../recording_imported/statements.json | 60 +++--- .../recording_protected/data.json | 8 +- .../recording_protected/event.json | 10 +- .../recording_protected/statements.json | 60 +++--- .../recording_published/data.json | 8 +- .../recording_published/event.json | 10 +- .../recording_published/statements.json | 60 +++--- .../recording_unprotected/data.json | 8 +- .../recording_unprotected/event.json | 10 +- .../recording_unprotected/statements.json | 60 +++--- .../recording_unpublished/data.json | 8 +- .../recording_unpublished/event.json | 10 +- .../recording_unpublished/statements.json | 60 +++--- .../recording_viewed/data.json | 8 +- .../recording_viewed/event.json | 10 +- .../recording_viewed/statements.json | 60 +++--- tests/mod_book/chapter_created/data.json | 18 +- tests/mod_book/chapter_created/event.json | 8 +- .../mod_book/chapter_created/statements.json | 30 +-- .../data.json | 24 +-- .../event.json | 10 +- .../statements.json | 76 +++---- .../data.json | 18 +- .../event.json | 10 +- .../statements.json | 68 +++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- tests/mod_choice/answer_created/data.json | 20 +- tests/mod_choice/answer_created/event.json | 8 +- .../mod_choice/answer_created/statements.json | 50 ++--- .../existing_module/data.json | 20 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 80 ++++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_booking_cancelled/data.json | 8 +- .../existing_booking_cancelled/event.json | 10 +- .../statements.json | 60 +++--- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_signup_success/data.json | 8 +- .../existing_signup_success/event.json | 10 +- .../existing_signup_success/statements.json | 60 +++--- .../existing_attendance_taken/data.json | 50 ++--- .../existing_attendance_taken/event.json | 10 +- .../existing_attendance_taken/statements.json | 82 ++++---- .../viewing_feedback/data.json | 8 +- .../viewing_feedback/event.json | 10 +- .../viewing_feedback/statements.json | 60 +++--- .../response_submitted/multichoice/data.json | 28 +-- .../response_submitted/multichoice/event.json | 10 +- .../multichoice/statements.json | 152 +++++++------- .../multichoicerated/data.json | 28 +-- .../multichoicerated/event.json | 10 +- .../multichoicerated/statements.json | 154 +++++++------- .../response_submitted/no_items/data.json | 16 +- .../response_submitted/no_items/event.json | 10 +- .../no_items/statements.json | 60 +++--- .../response_submitted/numerical/data.json | 28 +-- .../response_submitted/numerical/event.json | 10 +- .../numerical/statements.json | 144 ++++++------- .../response_submitted/textarea/data.json | 24 +-- .../response_submitted/textarea/event.json | 10 +- .../textarea/statements.json | 132 ++++++------ .../textarea_anon/data.json | 24 +-- .../textarea_anon/event.json | 10 +- .../textarea_anon/statements.json | 132 ++++++------ .../response_submitted/textfield/data.json | 24 +-- .../response_submitted/textfield/event.json | 10 +- .../textfield/statements.json | 132 ++++++------ .../response_submitted/unknown_typ/data.json | 26 +-- .../response_submitted/unknown_typ/event.json | 10 +- .../unknown_typ/statements.json | 60 +++--- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- tests/mod_forum/discussion_created/data.json | 12 +- tests/mod_forum/discussion_created/event.json | 10 +- .../discussion_created/statements.json | 64 +++--- .../discussion_subcription_created/data.json | 12 +- .../discussion_subcription_created/event.json | 10 +- .../statements.json | 64 +++--- .../discussion_subcription_deleted/data.json | 12 +- .../discussion_subcription_deleted/event.json | 10 +- .../statements.json | 64 +++--- .../existing_discussion_viewed/data.json | 12 +- .../existing_discussion_viewed/event.json | 10 +- .../statements.json | 64 +++--- tests/mod_forum/post_created/data.json | 14 +- tests/mod_forum/post_created/event.json | 10 +- tests/mod_forum/post_created/statements.json | 72 +++---- tests/mod_forum/post_deleted/data.json | 14 +- tests/mod_forum/post_deleted/event.json | 10 +- tests/mod_forum/post_deleted/statements.json | 64 +++--- tests/mod_forum/post_updated/data.json | 14 +- tests/mod_forum/post_updated/event.json | 10 +- tests/mod_forum/post_updated/statements.json | 72 +++---- .../mod_forum/subscription_created/data.json | 12 +- .../mod_forum/subscription_created/event.json | 10 +- .../subscription_created/statements.json | 60 +++--- .../mod_forum/subscription_deleted/data.json | 12 +- .../mod_forum/subscription_deleted/event.json | 10 +- .../subscription_deleted/statements.json | 60 +++--- .../existing_report_viewed/data.json | 7 - .../existing_report_viewed/event.json | 10 +- .../existing_report_viewed/statements.json | 54 ++--- .../data.json | 7 - .../event.json | 10 +- .../statements.json | 40 ++-- tests/mod_glossary/comment_created/data.json | 12 +- tests/mod_glossary/comment_created/event.json | 12 +- .../comment_created/statements.json | 76 +++---- tests/mod_glossary/comment_deleted/data.json | 14 +- tests/mod_glossary/comment_deleted/event.json | 12 +- .../comment_deleted/statements.json | 72 +++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- tests/mod_glossary/entry_viewed/data.json | 14 +- tests/mod_glossary/entry_viewed/event.json | 10 +- .../mod_glossary/entry_viewed/statements.json | 68 +++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../mod_lesson/content_page_viewed/data.json | 12 +- .../mod_lesson/content_page_viewed/event.json | 10 +- .../content_page_viewed/statements.json | 64 +++--- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- tests/mod_lesson/essay_assessed/data.json | 34 ++-- tests/mod_lesson/essay_assessed/event.json | 10 +- .../mod_lesson/essay_assessed/statements.json | 100 ++++----- tests/mod_lesson/lesson_ended/data.json | 32 +-- tests/mod_lesson/lesson_ended/event.json | 10 +- tests/mod_lesson/lesson_ended/statements.json | 88 ++++---- tests/mod_lesson/lesson_restarted/data.json | 10 +- tests/mod_lesson/lesson_restarted/event.json | 10 +- .../lesson_restarted/statements.json | 68 +++---- tests/mod_lesson/lesson_resumed/data.json | 10 +- tests/mod_lesson/lesson_resumed/event.json | 10 +- .../mod_lesson/lesson_resumed/statements.json | 68 +++---- tests/mod_lesson/lesson_started/data.json | 10 +- tests/mod_lesson/lesson_started/event.json | 10 +- .../mod_lesson/lesson_started/statements.json | 68 +++---- .../question_answered/choice/data.json | 34 ++-- .../question_answered/choice/event.json | 10 +- .../question_answered/choice/statements.json | 86 ++++---- .../question_answered/essay/data.json | 34 ++-- .../question_answered/essay/event.json | 10 +- .../question_answered/essay/statements.json | 76 +++---- .../question_answered/matching/data.json | 38 ++-- .../question_answered/matching/event.json | 10 +- .../matching/statements.json | 82 ++++---- .../question_answered/numerical/data.json | 34 ++-- .../question_answered/numerical/event.json | 10 +- .../numerical/statements.json | 82 ++++---- .../question_answered/shortanswer/data.json | 34 ++-- .../question_answered/shortanswer/event.json | 10 +- .../shortanswer/statements.json | 82 ++++---- .../question_answered/truefalse/data.json | 34 ++-- .../question_answered/truefalse/event.json | 10 +- .../truefalse/statements.json | 86 ++++---- .../question_viewed/choice/data.json | 30 +-- .../question_viewed/choice/event.json | 10 +- .../question_viewed/choice/statements.json | 78 +++---- .../question_viewed/essay/data.json | 22 +- .../question_viewed/essay/event.json | 10 +- .../question_viewed/essay/statements.json | 70 +++---- .../question_viewed/matching/data.json | 34 ++-- .../question_viewed/matching/event.json | 10 +- .../question_viewed/matching/statements.json | 74 +++---- .../question_viewed/numerical/data.json | 24 +-- .../question_viewed/numerical/event.json | 10 +- .../question_viewed/numerical/statements.json | 74 +++---- .../question_viewed/shortanswer/data.json | 24 +-- .../question_viewed/shortanswer/event.json | 10 +- .../shortanswer/statements.json | 74 +++---- .../question_viewed/truefalse/data.json | 30 +-- .../question_viewed/truefalse/event.json | 10 +- .../question_viewed/truefalse/statements.json | 78 +++---- .../existing_module/data.json | 8 +- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../all_responses_viewed/event.json | 10 +- .../all_responses_viewed/statements.json | 64 +++--- .../attempt_resumed/event.json | 10 +- .../attempt_resumed/statements.json | 60 +++--- .../attempt_saved/event.json | 10 +- .../attempt_saved/statements.json | 60 +++--- .../attempt_submitted/event.json | 10 +- .../attempt_submitted/statements.json | 60 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../mod_quiz/attempt_becameoverdue/data.json | 14 +- .../mod_quiz/attempt_becameoverdue/event.json | 10 +- .../attempt_becameoverdue/statements.json | 64 +++--- .../existing_attempt_reviewed/data.json | 26 +-- .../existing_attempt_reviewed/event.json | 12 +- .../existing_attempt_reviewed/statements.json | 82 ++++---- .../existing_attempt_started/data.json | 14 +- .../existing_attempt_started/event.json | 10 +- .../existing_attempt_started/statements.json | 64 +++--- .../attempt_submitted/essay/data.json | 64 +++--- .../attempt_submitted/essay/event.json | 10 +- .../attempt_submitted/essay/statements.json | 168 ++++++++-------- .../essay_null_response/data.json | 64 +++--- .../essay_null_response/event.json | 10 +- .../essay_null_response/statements.json | 168 ++++++++-------- .../attempt_submitted/gapselect/data.json | 84 ++++---- .../attempt_submitted/gapselect/event.json | 10 +- .../gapselect/statements.json | 184 ++++++++--------- .../attempt_submitted/match/data.json | 92 ++++----- .../attempt_submitted/match/event.json | 10 +- .../attempt_submitted/match/statements.json | 190 +++++++++--------- .../attempt_submitted/multichoice/data.json | 84 ++++---- .../attempt_submitted/multichoice/event.json | 10 +- .../multichoice/statements.json | 176 ++++++++-------- .../multichoice_withchoices/data.json | 68 +++---- .../multichoice_withchoices/event.json | 10 +- .../multichoice_withchoices/statements.json | 190 +++++++++--------- .../multichoiceset/data.json | 84 ++++---- .../multichoiceset/event.json | 10 +- .../multichoiceset/statements.json | 176 ++++++++-------- .../multichoiceset_withchoices/data.json | 84 ++++---- .../multichoiceset_withchoices/event.json | 10 +- .../statements.json | 190 +++++++++--------- .../attempt_submitted/no_questions/data.json | 48 ++--- .../attempt_submitted/no_questions/event.json | 10 +- .../no_questions/statements.json | 86 ++++---- .../attempt_submitted/numerical/data.json | 76 +++---- .../attempt_submitted/numerical/event.json | 10 +- .../numerical/statements.json | 180 ++++++++--------- .../attempt_submitted/randomsamatch/data.json | 84 ++++---- .../randomsamatch/event.json | 10 +- .../randomsamatch/statements.json | 188 ++++++++--------- .../attempt_submitted/shortanswer/data.json | 64 +++--- .../attempt_submitted/shortanswer/event.json | 10 +- .../shortanswer/statements.json | 168 ++++++++-------- .../attempt_submitted/truefalse/data.json | 80 ++++---- .../attempt_submitted/truefalse/event.json | 10 +- .../truefalse/statements.json | 180 ++++++++--------- .../attempt_submitted/unknown_qtype/data.json | 64 +++--- .../unknown_qtype/event.json | 10 +- .../unknown_qtype/statements.json | 86 ++++---- .../attempt_viewed/existing_module/data.json | 14 +- .../attempt_viewed/existing_module/event.json | 10 +- .../existing_module/statements.json | 64 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../question_manually_graded/data.json | 50 ++--- .../question_manually_graded/event.json | 14 +- .../question_manually_graded/statements.json | 100 ++++----- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../existing_sco_launched/event.json | 8 +- .../existing_sco_launched/statements.json | 64 +++--- .../existing_scoreraw_submitted/data.json | 12 +- .../existing_scoreraw_submitted/event.json | 8 +- .../statements.json | 78 +++---- .../existing_status_submitted/data.json | 4 +- .../existing_status_submitted/event.json | 8 +- .../existing_status_submitted/statements.json | 64 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 64 +++--- tests/mod_survey/report_viewed/event.json | 11 +- .../mod_survey/report_viewed/statements.json | 72 +++---- .../mod_survey/response_submitted/event.json | 11 +- .../response_submitted/statements.json | 64 +++--- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- tests/mod_wiki/comment_created/data.json | 22 +- tests/mod_wiki/comment_created/event.json | 10 +- .../mod_wiki/comment_created/statements.json | 82 ++++---- tests/mod_wiki/comment_deleted/data.json | 12 +- tests/mod_wiki/comment_deleted/event.json | 10 +- .../mod_wiki/comment_deleted/statements.json | 84 ++++---- tests/mod_wiki/comments_viewed/data.json | 22 +- tests/mod_wiki/comments_viewed/event.json | 10 +- .../mod_wiki/comments_viewed/statements.json | 76 +++---- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 64 +++--- tests/mod_wiki/page_viewed/data.json | 12 +- tests/mod_wiki/page_viewed/event.json | 10 +- tests/mod_wiki/page_viewed/statements.json | 72 +++---- .../existing_module/event.json | 8 +- .../existing_module/statements.json | 60 +++--- .../certificate_issued/data.json | 14 +- .../certificate_issued/event.json | 12 +- .../certificate_issued/statements.json | 38 ++-- .../certificate_revoked/event.json | 12 +- .../certificate_revoked/statements.json | 38 ++-- .../certificate_verified/data.json | 14 +- .../certificate_verified/event.json | 12 +- .../certificate_verified/statements.json | 24 +-- tests/tool_usertours/tour_ended/event.json | 8 +- .../tool_usertours/tour_ended/statements.json | 30 +-- .../existing_program/event.json | 6 +- .../existing_program/statements.json | 34 ++-- 488 files changed, 8287 insertions(+), 8336 deletions(-) diff --git a/src/transformer/events/core/badge_awarded.php b/src/transformer/events/core/badge_awarded.php index 58e24192a..f742acc8a 100644 --- a/src/transformer/events/core/badge_awarded.php +++ b/src/transformer/events/core/badge_awarded.php @@ -74,16 +74,9 @@ function badge_awarded(array $config, \stdClass $event) { ...utils\get_context_base($config, $event, $lang, $course), 'instructor' => $awarder, 'contextActivities' => [ - 'category' => [[ - 'id' => $config['app_url'], - 'objectType' => 'Activity', - 'definition' => [ - 'name' => [ - 'en' => 'EDLM Moodle LMS' - ], - 'type' => 'http://id.tincanapi.com/activitytype/lms' - ] - ]], + 'category' => [ + utils\get_activity\site($config), + ], ], 'extensions' => array_merge(utils\extensions\base($config, $event, $course),[ 'https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method' => ($manual ? 'Manual' : 'Automatic')]) diff --git a/src/transformer/events/core/badge_revoked.php b/src/transformer/events/core/badge_revoked.php index 96440220f..dcdfb8001 100644 --- a/src/transformer/events/core/badge_revoked.php +++ b/src/transformer/events/core/badge_revoked.php @@ -59,14 +59,9 @@ function badge_revoked(array $config, \stdClass $event) { ...utils\get_context_base($config, $event, $lang, $course), 'instructor' =>$revoker, 'contextActivities'=> [ - 'category' => [[ - 'id' => $config['app_url'], - 'objectType' => 'Activity', - 'definition' => [ - 'name' => ['en'=> 'EDLM Moodle LMS'], - 'type' => 'http://id.tincanapi.com/activitytype/lms' - ] - ]] + 'category' => [ + utils\get_activity\site($config), + ], ], 'extensions' => array_merge(utils\extensions\base($config, $event, $course),[ 'https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method' => 'Manual']) diff --git a/src/transformer/utils/get_activity/site.php b/src/transformer/utils/get_activity/site.php index 2333a6a1d..d5ea875f7 100644 --- a/src/transformer/utils/get_activity/site.php +++ b/src/transformer/utils/get_activity/site.php @@ -37,7 +37,7 @@ function site(array $config) { $repo = $config['repo']; $site = $repo->read_record_by_id('course', 1); - $sitename = $site->fullname ? $site->fullname : 'A Moodle site'; + $sitename = $site->fullname ? $site->fullname : 'Moodle LMS'; $sitelang = utils\get_course_lang($site); return [ diff --git a/tests/common/data.json b/tests/common/data.json index ce4a00b4a..728a53c93 100644 --- a/tests/common/data.json +++ b/tests/common/data.json @@ -1,32 +1,37 @@ { - "user": [ + "course": [ { "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", + "lang": "en" } ], - "course": [ + "course_modules": [ { "id": 1, - "fullname": "test_name", - "lang": "en" + "course": 2, + "instance": 1, + "module": 1, + "section": 1 } ], "course_sections": [ { "id": 1, - "course": 1, + "course": 2, "section": 0 } ], - "course_modules": [ + "user": [ { "id": 1, - "course": 1, - "module": 1, - "instance": 1, - "section": 1 + "firstname": "test_fullname", + "email": "test@test.com" } ] } diff --git a/tests/common/statement.json b/tests/common/statement.json index a90151b3e..dbfa0db7c 100644 --- a/tests/common/statement.json +++ b/tests/common/statement.json @@ -1,8 +1,8 @@ { - "timestamp": "2015-06-10T14:31:41.000Z", "context": { "language": "en", "platform": "Moodle", "registration": "58028332-2277-5b51-a632-7836992917ea" - } + }, + "timestamp": "2015-06-10T14:31:41.000Z" } diff --git a/tests/core/badge_awarded/user_achieved_badge/data.json b/tests/core/badge_awarded/user_achieved_badge/data.json index 407eee357..a3116a0d1 100644 --- a/tests/core/badge_awarded/user_achieved_badge/data.json +++ b/tests/core/badge_awarded/user_achieved_badge/data.json @@ -1,43 +1,48 @@ { - "user": [ + "badge": [ { + "courseid": 2, "id": 1, - "firstname": "test_recipient_firstname", - "lastname": "test_recipient_lastname", - "email": "recipient@test.com", - "username": "recipient" - }, + "name": "test_badgename", + "description": "test badge description", + "message": "you got the test badge!", + "type": 2, + "version": "1.0" + } + ], + "badge_manual_award": [ { "id": 2, - "firstname": "test_awarder_firstname", - "lastname": "test_awarder_lastname", - "email": "awarder@test.com", - "username": "awarder" + "issuerid": 2 } ], "course": [ { "id": 1, - "fullname": "test_course_name", + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", "lang": "en", - "summary": "test_course_summary" + "summary": "test_summary" } ], - "badge": [ + "user": [ { "id": 1, - "name": "test_badgename", - "description": "test badge description", - "type": 2, - "courseid": 1, - "version": "1.0", - "message": "you got the test badge!" - } - ], - "badge_manual_award": [ + "firstname": "test_recipient_firstname", + "lastname": "test_recipient_lastname", + "username": "recipient", + "email": "recipient@test.com" + }, { "id": 2, - "issuerid": 2 + "firstname": "test_awarder_firstname", + "lastname": "test_awarder_lastname", + "username": "awarder", + "email": "awarder@test.com" } ] } diff --git a/tests/core/badge_awarded/user_achieved_badge/event.json b/tests/core/badge_awarded/user_achieved_badge/event.json index 17cd4b02f..e67f86888 100644 --- a/tests/core/badge_awarded/user_achieved_badge/event.json +++ b/tests/core/badge_awarded/user_achieved_badge/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "eventname": "\\core\\event\\badge_awarded", - "timecreated": 1433946701, - "relateduserid": 1, - "courseid": 1, "objectid": 1, + "relateduserid": 1, + "eventname": "\\core\\event\\badge_awarded", + "objecttable": "badge", "other": "a:1:{s:13:\"badgeissuedid\";i:2;}", - "objecttable": "badge" + "timecreated": 1433946701 } diff --git a/tests/core/badge_awarded/user_achieved_badge/statements.json b/tests/core/badge_awarded/user_achieved_badge/statements.json index b3e8cd070..6e54239e5 100644 --- a/tests/core/badge_awarded/user_achieved_badge/statements.json +++ b/tests/core/badge_awarded/user_achieved_badge/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_recipient_firstname test_recipient_lastname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_recipient_firstname test_recipient_lastname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/achieved", @@ -16,70 +16,70 @@ "object": { "id": "http://www.example.org/badges/overview.php?id=1", "definition": { - "name": { - "en": "test_badgename" - }, "description": { "en": "test badge description" }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge", "extensions": { "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-type": "Course", "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-version": "1.0" - } + }, + "name": { + "en": "test_badgename" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge" }, "objectType": "Activity" }, - "result": { - "response": "you got the test badge!" - }, "context": { - "language": "en", - "instructor": { - "name": "test_awarder_firstname test_awarder_lastname", - "account": { - "homePage": "http://www.example.org", - "name": "2" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", - "objectType": "Activity", "definition": { "name": { - "en": "EDLM Moodle LMS" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" - } + }, + "objectType": "Activity" } ], "parent": [ { - "id": "http://www.example.org/course/view.php?id=1", - "objectType": "Activity", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "name": { - "en": "test_course_name" - }, "description": { - "en": "test_course_summary" + "en": "test_summary" + }, + "name": { + "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" - } + }, + "objectType": "Activity" } ] }, "extensions": { - "https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method": "Manual", "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\badge_awarded", "event_name": "\\core\\event\\badge_awarded", - "event_function": "\\src\\transformer\\events\\core\\badge_awarded" - } - } + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method": "Manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "2" + }, + "name": "test_awarder_firstname test_awarder_lastname" + }, + "language": "en" + }, + "result": { + "response": "you got the test badge!" } } ] diff --git a/tests/core/badge_revoked/user_forfeited_badge/data.json b/tests/core/badge_revoked/user_forfeited_badge/data.json index fffa9fc53..a69942c11 100644 --- a/tests/core/badge_revoked/user_forfeited_badge/data.json +++ b/tests/core/badge_revoked/user_forfeited_badge/data.json @@ -1,29 +1,29 @@ { + "badge": [ + { + "courseid": null, + "id": 1, + "name": "test_badgename", + "description": "test badge description", + "message": "you got the test badge!", + "type": 1, + "version": "1.0" + } + ], "user": [ { "id": 1, "firstname": "test_revoker_firstname", "lastname": "test_revoker_lastname", - "email": "revoker@test.com", - "username": "revoker" + "username": "revoker", + "email": "revoker@test.com" }, { "id": 2, "firstname": "test_recipient_firstname", "lastname": "test_recipient_lastname", - "email": "recipient@test.com", - "username": "recipient" - } - ], - "badge": [ - { - "id": 1, - "name": "test_badgename", - "description": "test badge description", - "type": 1, - "courseid": null, - "version": "1.0", - "message": "you got the test badge!" + "username": "recipient", + "email": "recipient@test.com" } ] } diff --git a/tests/core/badge_revoked/user_forfeited_badge/event.json b/tests/core/badge_revoked/user_forfeited_badge/event.json index 714afdab0..cfe2eb3d3 100644 --- a/tests/core/badge_revoked/user_forfeited_badge/event.json +++ b/tests/core/badge_revoked/user_forfeited_badge/event.json @@ -1,9 +1,9 @@ { "id": 1, - "eventname": "\\core\\event\\badge_revoked", - "relateduserid": 2, - "timecreated": 1433946701, "objectid": 1, + "relateduserid": 2, "userid": 1, - "objecttable": "badge" + "eventname": "\\core\\event\\badge_revoked", + "objecttable": "badge", + "timecreated": 1433946701 } diff --git a/tests/core/badge_revoked/user_forfeited_badge/statements.json b/tests/core/badge_revoked/user_forfeited_badge/statements.json index 84c03df3e..3a6b048d7 100644 --- a/tests/core/badge_revoked/user_forfeited_badge/statements.json +++ b/tests/core/badge_revoked/user_forfeited_badge/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_recipient_firstname test_recipient_lastname", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_recipient_firstname test_recipient_lastname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/forfeited", @@ -16,52 +16,52 @@ "object": { "id": "http://www.example.org/badges/overview.php?id=1", "definition": { - "name": { - "en": "test_badgename" - }, "description": { "en": "test badge description" }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge", "extensions": { "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-type": "Global", "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-version": "1.0" - } + }, + "name": { + "en": "test_badgename" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge" }, "objectType": "Activity" }, "context": { - "language": "en", - "instructor": { - "name": "test_revoker_firstname test_revoker_lastname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", - "objectType": "Activity", "definition": { "name": { - "en": "EDLM Moodle LMS" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" - } + }, + "objectType": "Activity" } ] }, "extensions": { - "https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method": "Manual", "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\badge_revoked", "event_name": "\\core\\event\\badge_revoked", - "event_function": "\\src\\transformer\\events\\core\\badge_revoked" - } - } + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/v1/concepts/context-extensions/badge-assignment-method": "Manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_revoker_firstname test_revoker_lastname" + }, + "language": "en" } } ] diff --git a/tests/core/badge_updated/data.json b/tests/core/badge_updated/data.json index cb48874a4..7fd2b7845 100644 --- a/tests/core/badge_updated/data.json +++ b/tests/core/badge_updated/data.json @@ -1,13 +1,13 @@ { "badge": [ { + "courseid": 2, "id": 1, "name": "test_badgename", "description": "test badge description", + "message": "you got the test badge!", "type": 2, - "courseid": 1, - "version": "1.0", - "message": "you got the test badge!" + "version": "1.0" } ], "badge_manual_award": [ diff --git a/tests/core/badge_updated/event.json b/tests/core/badge_updated/event.json index e68948989..d7035af65 100644 --- a/tests/core/badge_updated/event.json +++ b/tests/core/badge_updated/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "eventname": "\\core\\event\\badge_updated", - "timecreated": 1433946701, + "objectid": 1, "relateduserid": 1, - "courseid": 1, "userid": 1, - "objectid": 1, - "objecttable": "badge" + "eventname": "\\core\\event\\badge_updated", + "objecttable": "badge", + "timecreated": 1433946701 } diff --git a/tests/core/badge_updated/statements.json b/tests/core/badge_updated/statements.json index b741ca9aa..c2f16eb68 100644 --- a/tests/core/badge_updated/statements.json +++ b/tests/core/badge_updated/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/acrossx/verbs/edited", @@ -16,43 +16,42 @@ "object": { "id": "http://www.example.org/badges/overview.php?id=1", "definition": { - "name": { - "en": "test_badgename" - }, "description": { "en": "test badge description" }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge", "extensions": { "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-type": "Course", "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-version": "1.0" - } + }, + "name": { + "en": "test_badgename" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge" }, "objectType": "Activity" }, "context": { - "language": "en", "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], "parent": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -60,12 +59,13 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\badge_updated", "event_name": "\\core\\event\\badge_updated", - "event_function": "\\src\\transformer\\events\\core\\badge_updated" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "language": "en" } } ] diff --git a/tests/core/badge_viewed/user_viewed_badge/data.json b/tests/core/badge_viewed/user_viewed_badge/data.json index 7d9b39f28..cee0bb4fb 100644 --- a/tests/core/badge_viewed/user_viewed_badge/data.json +++ b/tests/core/badge_viewed/user_viewed_badge/data.json @@ -4,8 +4,8 @@ "id": 1, "name": "testbadge", "description": "badge description", - "version": "1.0", - "type": 1 + "type": 1, + "version": "1.0" } ] } diff --git a/tests/core/badge_viewed/user_viewed_badge/event.json b/tests/core/badge_viewed/user_viewed_badge/event.json index fc06cb26e..9de9f62c2 100644 --- a/tests/core/badge_viewed/user_viewed_badge/event.json +++ b/tests/core/badge_viewed/user_viewed_badge/event.json @@ -1,9 +1,9 @@ { - "courseid" : 1, - "eventname" : "\\core\\event\\badge_viewed", - "id" : 1, - "objectid" : 1, - "objecttable" : "badge", - "timecreated" : 1433946701, - "userid" : 1 + "courseid": 2, + "id": 1, + "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\badge_viewed", + "objecttable": "badge", + "timecreated": 1433946701 } diff --git a/tests/core/badge_viewed/user_viewed_badge/statements.json b/tests/core/badge_viewed/user_viewed_badge/statements.json index 2f2e50c42..2caa40127 100644 --- a/tests/core/badge_viewed/user_viewed_badge/statements.json +++ b/tests/core/badge_viewed/user_viewed_badge/statements.json @@ -16,17 +16,17 @@ "object": { "id": "http://www.example.org/badges/overview.php?id=1", "definition": { - "name": { - "en": "testbadge" - }, "description": { "en": "badge description" }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge", "extensions": { "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-type": "Global", "https://xapi.edlm/profiles/edlm-lms/v1/concepts/activity-extensions/badge-version": "1.0" - } + }, + "name": { + "en": "testbadge" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/badge" }, "objectType": "Activity" }, @@ -34,25 +34,25 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/calendar_event_created/user_created_calendar_event/data.json b/tests/core/calendar_event_created/user_created_calendar_event/data.json index a56463a3a..5a7f98ee4 100644 --- a/tests/core/calendar_event_created/user_created_calendar_event/data.json +++ b/tests/core/calendar_event_created/user_created_calendar_event/data.json @@ -1,10 +1,15 @@ { "course": [ { - "fullname": "test_course_name", "id": 1, + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", "lang": "en", - "summary": "test_course_summary" + "summary": "test_summary" } ], "event": [ @@ -15,11 +20,11 @@ ], "user": [ { - "email": "creator@test.com", - "firstname": "event_creator_firstname", "id": 1, + "firstname": "event_creator_firstname", "lastname": "event_creator_lastname", - "username": "creator" + "username": "creator", + "email": "creator@test.com" } ] } diff --git a/tests/core/calendar_event_created/user_created_calendar_event/event.json b/tests/core/calendar_event_created/user_created_calendar_event/event.json index 6316e8a5d..e16052507 100644 --- a/tests/core/calendar_event_created/user_created_calendar_event/event.json +++ b/tests/core/calendar_event_created/user_created_calendar_event/event.json @@ -1,9 +1,9 @@ { - "courseid": 1, - "eventname": "\\core\\event\\calendar_event_created", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\calendar_event_created", "objecttable": "event", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/calendar_event_created/user_created_calendar_event/statements.json b/tests/core/calendar_event_created/user_created_calendar_event/statements.json index 55ea4cf24..1f6126646 100644 --- a/tests/core/calendar_event_created/user_created_calendar_event/statements.json +++ b/tests/core/calendar_event_created/user_created_calendar_event/statements.json @@ -7,29 +7,45 @@ }, "name": "event_creator_firstname event_creator_lastname" }, + "verb": { + "id": "http://activitystrea.ms/create", + "display": { + "en": "Created" + } + }, + "object": { + "id": "http://www.example.org/calendar/view.php?id=1", + "definition": { + "name": { + "en": "test event" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" + }, + "objectType": "Activity" + }, "context": { "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_course_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { - "en": "test_course_name" + "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] @@ -42,22 +58,6 @@ "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } - }, - "object": { - "definition": { - "name": { - "en": "test event" - }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" - }, - "id": "http://www.example.org/calendar/view.php?id=1", - "objectType": "Activity" - }, - "verb": { - "display": { - "en": "Created" - }, - "id": "http://activitystrea.ms/create" } } ] diff --git a/tests/core/calendar_event_deleted/user_deleted_calendar_event/data.json b/tests/core/calendar_event_deleted/user_deleted_calendar_event/data.json index e3e8d3fdc..b2348a24b 100644 --- a/tests/core/calendar_event_deleted/user_deleted_calendar_event/data.json +++ b/tests/core/calendar_event_deleted/user_deleted_calendar_event/data.json @@ -1,19 +1,24 @@ { "course": [ { - "fullname": "test_course_name", "id": 1, + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", "lang": "en", - "summary": "test_course_summary" + "summary": "test_summary" } ], "event": [], "user": [ { - "email": "deleter@test.com", - "firstname": "event_deleter_firstname", "id": 1, - "lastname": "event_deleter_lastname" + "firstname": "event_deleter_firstname", + "lastname": "event_deleter_lastname", + "email": "deleter@test.com" } ] } diff --git a/tests/core/calendar_event_deleted/user_deleted_calendar_event/event.json b/tests/core/calendar_event_deleted/user_deleted_calendar_event/event.json index 4779cb711..7dda95a86 100644 --- a/tests/core/calendar_event_deleted/user_deleted_calendar_event/event.json +++ b/tests/core/calendar_event_deleted/user_deleted_calendar_event/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\calendar_event_deleted", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\calendar_event_deleted", "objecttable": "event", "other": "a:1:{s:4:\"name\";s:10:\"test event\";}", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/calendar_event_deleted/user_deleted_calendar_event/statements.json b/tests/core/calendar_event_deleted/user_deleted_calendar_event/statements.json index a6be183fa..e7b13411c 100644 --- a/tests/core/calendar_event_deleted/user_deleted_calendar_event/statements.json +++ b/tests/core/calendar_event_deleted/user_deleted_calendar_event/statements.json @@ -7,29 +7,45 @@ }, "name": "event_deleter_firstname event_deleter_lastname" }, + "verb": { + "id": "http://activitystrea.ms/delete", + "display": { + "en": "Deleted" + } + }, + "object": { + "id": "http://www.example.org/calendar/view.php?id=1", + "definition": { + "name": { + "en": "test event" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" + }, + "objectType": "Activity" + }, "context": { "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_course_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { - "en": "test_course_name" + "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] @@ -43,22 +59,6 @@ } }, "language": "en" - }, - "object": { - "definition": { - "name": { - "en": "test event" - }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" - }, - "id": "http://www.example.org/calendar/view.php?id=1", - "objectType": "Activity" - }, - "verb": { - "display": { - "en": "Deleted" - }, - "id": "http://activitystrea.ms/delete" } } ] diff --git a/tests/core/calendar_event_updated/user_updated_calendar_event/data.json b/tests/core/calendar_event_updated/user_updated_calendar_event/data.json index b3b356dfa..0da8c3a2b 100644 --- a/tests/core/calendar_event_updated/user_updated_calendar_event/data.json +++ b/tests/core/calendar_event_updated/user_updated_calendar_event/data.json @@ -1,10 +1,15 @@ { "course": [ { - "fullname": "test_course_name", "id": 1, + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", "lang": "en", - "summary": "test_course_summary" + "summary": "test_summary" } ], "event": [ @@ -15,11 +20,11 @@ ], "user": [ { - "email": "updater@test.com", - "firstname": "event_updater_firstname", "id": 1, + "firstname": "event_updater_firstname", "lastname": "event_updater_lastname", - "username": "updater" + "username": "updater", + "email": "updater@test.com" } ] } diff --git a/tests/core/calendar_event_updated/user_updated_calendar_event/event.json b/tests/core/calendar_event_updated/user_updated_calendar_event/event.json index d11edd5f8..0fd5759b0 100644 --- a/tests/core/calendar_event_updated/user_updated_calendar_event/event.json +++ b/tests/core/calendar_event_updated/user_updated_calendar_event/event.json @@ -1,9 +1,9 @@ { - "courseid": 1, - "eventname": "\\core\\event\\calendar_event_updated", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\calendar_event_updated", "objecttable": "event", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/calendar_event_updated/user_updated_calendar_event/statements.json b/tests/core/calendar_event_updated/user_updated_calendar_event/statements.json index ab1621b42..7991a83fd 100644 --- a/tests/core/calendar_event_updated/user_updated_calendar_event/statements.json +++ b/tests/core/calendar_event_updated/user_updated_calendar_event/statements.json @@ -7,29 +7,45 @@ }, "name": "event_updater_firstname event_updater_lastname" }, + "verb": { + "id": "https://w3id.org/xapi/acrossx/verbs/edited", + "display": { + "en": "Edited" + } + }, + "object": { + "id": "http://www.example.org/calendar/view.php?id=1", + "definition": { + "name": { + "en": "test event" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" + }, + "objectType": "Activity" + }, "context": { "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_course_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { - "en": "test_course_name" + "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] @@ -42,22 +58,6 @@ "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } - }, - "object": { - "definition": { - "name": { - "en": "test event" - }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar-event" - }, - "id": "http://www.example.org/calendar/view.php?id=1", - "objectType": "Activity" - }, - "verb": { - "display": { - "en": "Edited" - }, - "id": "https://w3id.org/xapi/acrossx/verbs/edited" } } ] diff --git a/tests/core/calendar_subscription_created/user_created_calendar_subscription/event.json b/tests/core/calendar_subscription_created/user_created_calendar_subscription/event.json index 23000b72f..b85048615 100644 --- a/tests/core/calendar_subscription_created/user_created_calendar_subscription/event.json +++ b/tests/core/calendar_subscription_created/user_created_calendar_subscription/event.json @@ -1,9 +1,9 @@ { - "courseid" : 1, - "eventname" : "\\core\\event\\calendar_subscription_created", - "id" : 1, - "objectid" : 1, - "objecttable" : "event_subscriptions", - "timecreated" : 1433946701, - "userid" : 1 + "courseid": 2, + "id": 1, + "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\calendar_subscription_created", + "objecttable": "event_subscriptions", + "timecreated": 1433946701 } diff --git a/tests/core/calendar_subscription_created/user_created_calendar_subscription/statements.json b/tests/core/calendar_subscription_created/user_created_calendar_subscription/statements.json index ea5b92c84..d642af50b 100644 --- a/tests/core/calendar_subscription_created/user_created_calendar_subscription/statements.json +++ b/tests/core/calendar_subscription_created/user_created_calendar_subscription/statements.json @@ -24,41 +24,40 @@ "objectType": "Activity" }, "context": { - "language": "en", "contextActivities": { - "other": [ + "category": [ { - "id": "http://example-cal.com/HASH", + "id": "http://www.example.org", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar", "name": { - "en": "Web Calendar" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "other": [ { + "id": "http://example-cal.com/HASH", "definition": { "name": { - "en": "test_name" + "en": "Web Calendar" }, - "type": "http://id.tincanapi.com/activitytype/lms" + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] @@ -70,7 +69,8 @@ "http://moodle.org": "1.0.0", "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "language": "en" } } ] diff --git a/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/event.json b/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/event.json index 9dc49a330..c3e1d1416 100644 --- a/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/event.json +++ b/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\calendar_subscription_deleted", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "event_subscriptions", - "timecreated": 1433946701, "userid": 1, - "action": "deleted" + "eventname": "\\core\\event\\calendar_subscription_deleted", + "action": "deleted", + "objecttable": "event_subscriptions", + "timecreated": 1433946701 } diff --git a/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/statements.json b/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/statements.json index d32a92da3..82b83f1a9 100644 --- a/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/statements.json +++ b/tests/core/calendar_subscription_deleted/user_deleted_calendar_subscription/statements.json @@ -24,25 +24,25 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/event.json b/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/event.json index d7a27f495..25c3edf61 100644 --- a/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/event.json +++ b/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/event.json @@ -1,9 +1,9 @@ { - "courseid" : 1, - "eventname" : "\\core\\event\\calendar_subscription_updated", - "id" : 1, - "objectid" : 1, - "objecttable" : "event_subscriptions", - "timecreated" : 1433946701, - "userid" : 1 + "courseid": 2, + "id": 1, + "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\calendar_subscription_updated", + "objecttable": "event_subscriptions", + "timecreated": 1433946701 } diff --git a/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/statements.json b/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/statements.json index 0f9768705..5abac976c 100644 --- a/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/statements.json +++ b/tests/core/calendar_subscription_updated/user_updated_calendar_subscription/statements.json @@ -25,39 +25,39 @@ }, "context": { "contextActivities": { - "other": [ + "category": [ { - "id": "http://example-cal.com/HASH", + "id": "http://www.example.org", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar", "name": { - "en": "Web Calendar" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "other": [ { + "id": "http://example-cal.com/HASH", "definition": { "name": { - "en": "test_name" + "en": "Web Calendar" }, - "type": "http://id.tincanapi.com/activitytype/lms" + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/calendar" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/course_category_created/data.json b/tests/core/course_category_created/data.json index ede262d75..cdc9eb132 100644 --- a/tests/core/course_category_created/data.json +++ b/tests/core/course_category_created/data.json @@ -1,18 +1,4 @@ { - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } - ], - "user": [ - { - "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" - } - ], "course_categories": [ { "id": 2, @@ -21,9 +7,16 @@ }, { "id": 3, - "parent": 2, "name": "Sub Category", - "description": "Moodle Course Sub-Category" + "description": "Moodle Course Sub-Category", + "parent": 2 + } + ], + "user": [ + { + "id": 1, + "firstname": "test_fullname", + "email": "test@test.com" } ] } diff --git a/tests/core/course_category_created/event.json b/tests/core/course_category_created/event.json index 930237626..54b294531 100644 --- a/tests/core/course_category_created/event.json +++ b/tests/core/course_category_created/event.json @@ -1,8 +1,8 @@ { "id": 1, - "objecttable": "course_categories", - "timecreated": 1433946701, "objectid": 3, + "userid": 1, "eventname": "\\core\\event\\course_category_created", - "userid": 1 + "objecttable": "course_categories", + "timecreated": 1433946701 } diff --git a/tests/core/course_category_created/statements.json b/tests/core/course_category_created/statements.json index f102a7b3a..086f00906 100644 --- a/tests/core/course_category_created/statements.json +++ b/tests/core/course_category_created/statements.json @@ -15,42 +15,42 @@ }, "object": { "id": "http://www.example.org/course/management.php?categoryid=3", - "objectType": "Activity", "definition": { - "name": { - "en": "Sub Category" - }, "description": { "en": "Moodle Course Sub-Category" }, + "name": { + "en": "Sub Category" + }, "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/course-category" - } + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/management.php?categoryid=2", - "objectType": "Activity", + "id": "http://www.example.org", "definition": { "name": { - "en": "Base Category" - }, - "description": { - "en": "Default Moodle Course Category" + "en": "test_site_fullname" }, - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/course-category" - } + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/management.php?categoryid=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", + "description": { + "en": "Default Moodle Course Category" + }, "name": { - "en": "test_name" - } + "en": "Base Category" + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/course-category" }, "objectType": "Activity" } @@ -58,10 +58,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\course_category_created", "event_name": "\\core\\event\\course_category_created", - "event_function": "\\src\\transformer\\events\\core\\course_category_created" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/course_completed/completing_existing_course/data.json b/tests/core/course_completed/completing_existing_course/data.json index 614658e31..13de62cac 100644 --- a/tests/core/course_completed/completing_existing_course/data.json +++ b/tests/core/course_completed/completing_existing_course/data.json @@ -5,12 +5,5 @@ "firstname": "test_fullname", "email": "test@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/core/course_completed/completing_existing_course/event.json b/tests/core/course_completed/completing_existing_course/event.json index e41fb4258..61d8387ab 100644 --- a/tests/core/course_completed/completing_existing_course/event.json +++ b/tests/core/course_completed/completing_existing_course/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, + "objectid": 2, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\core\\event\\course_completed", "objecttable": "course", - "objectid": 1, - "eventname": "\\core\\event\\course_completed" + "timecreated": 1433946701 } diff --git a/tests/core/course_completed/completing_existing_course/statements.json b/tests/core/course_completed/completing_existing_course/statements.json index 5ec6a8376..75977d34b 100644 --- a/tests/core/course_completed/completing_existing_course/statements.json +++ b/tests/core/course_completed/completing_existing_course/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -14,39 +14,39 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_completed", - "event_function": "\\src\\transformer\\events\\core\\course_completed" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_completed", + "event_name": "\\core\\event\\course_completed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/core/course_completed/send_jisc_data/data.json b/tests/core/course_completed/send_jisc_data/data.json index b3719b756..7c5c6f863 100644 --- a/tests/core/course_completed/send_jisc_data/data.json +++ b/tests/core/course_completed/send_jisc_data/data.json @@ -1,17 +1,22 @@ { - "user": [ + "course": [ { "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", + "shortname": "test_course_short_name", + "lang": "en" } ], - "course": [ + "user": [ { "id": 1, - "fullname": "test_name", - "lang": "en", - "shortname": "test_course_short_name" + "firstname": "test_fullname", + "email": "test@test.com" } ] } diff --git a/tests/core/course_completed/send_jisc_data/event.json b/tests/core/course_completed/send_jisc_data/event.json index f8682bf19..0d1935be2 100644 --- a/tests/core/course_completed/send_jisc_data/event.json +++ b/tests/core/course_completed/send_jisc_data/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, + "objectid": 2, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "course", - "objectid": 1, "eventname": "\\core\\event\\course_completed", - "ip": "127.0.0.1" + "ip": "127.0.0.1", + "objecttable": "course", + "timecreated": 1433946701 } diff --git a/tests/core/course_completed/send_jisc_data/statements.json b/tests/core/course_completed/send_jisc_data/statements.json index b21a41572..27fd087d2 100644 --- a/tests/core/course_completed/send_jisc_data/statements.json +++ b/tests/core/course_completed/send_jisc_data/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -14,45 +14,45 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_completed", - "event_function": "\\src\\transformer\\events\\core\\course_completed" - }, - "http://xapi.jisc.ac.uk/sessionId": "test_session_id", - "http://id.tincanapi.com/extension/ip-address": "127.0.0.1", - "http://xapi.jisc.ac.uk/statementCat": "VLE", - "http://xapi.jisc.ac.uk/courseArea": { - "http://xapi.jisc.ac.uk/vle_mod_id": "test_course_short_name" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://id.tincanapi.com/extension/ip-address": "127.0.0.1", + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_completed", + "event_name": "\\core\\event\\course_completed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "http://xapi.jisc.ac.uk/courseArea": { + "http://xapi.jisc.ac.uk/vle_mod_id": "test_course_short_name" + }, + "http://xapi.jisc.ac.uk/sessionId": "test_session_id", + "http://xapi.jisc.ac.uk/statementCat": "VLE" + }, + "language": "en" } } ] diff --git a/tests/core/course_completion_updated/data.json b/tests/core/course_completion_updated/data.json index 11cebcfb4..13de62cac 100644 --- a/tests/core/course_completion_updated/data.json +++ b/tests/core/course_completion_updated/data.json @@ -1,11 +1,4 @@ { - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } - ], "user": [ { "id": 1, diff --git a/tests/core/course_completion_updated/event.json b/tests/core/course_completion_updated/event.json index 85686ea46..e54a20a3c 100644 --- a/tests/core/course_completion_updated/event.json +++ b/tests/core/course_completion_updated/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, - "objecttable": null, - "timecreated": 1433946701, "objectid": null, - "eventname": "\\core\\event\\course_completion_updated", "userid": 1, - "courseid": 1 + "eventname": "\\core\\event\\course_completion_updated", + "objecttable": null, + "timecreated": 1433946701 } diff --git a/tests/core/course_completion_updated/statements.json b/tests/core/course_completion_updated/statements.json index a71f476b4..15dd64039 100644 --- a/tests/core/course_completion_updated/statements.json +++ b/tests/core/course_completion_updated/statements.json @@ -14,49 +14,49 @@ } }, "object": { - "id": "http://www.example.org/course/completion.php?id=1", - "objectType": "Activity", + "id": "http://www.example.org/course/completion.php?id=2", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/course-completion-criteria", "name": { "en": "test_name Completion Criteria" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/course-completion-criteria" + }, + "objectType": "Activity" }, "context": { - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_completion_updated", - "event_function": "\\src\\transformer\\events\\core\\course_completion_updated" - } - }, "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_completion_updated", + "event_name": "\\core\\event\\course_completion_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } } } } diff --git a/tests/core/course_created/creating_new_course/data.json b/tests/core/course_created/creating_new_course/data.json index 11cebcfb4..13de62cac 100644 --- a/tests/core/course_created/creating_new_course/data.json +++ b/tests/core/course_created/creating_new_course/data.json @@ -1,11 +1,4 @@ { - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } - ], "user": [ { "id": 1, diff --git a/tests/core/course_created/creating_new_course/event.json b/tests/core/course_created/creating_new_course/event.json index da06075a3..77e7803ac 100644 --- a/tests/core/course_created/creating_new_course/event.json +++ b/tests/core/course_created/creating_new_course/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, - "objecttable": "course", - "timecreated": 1433946701, - "objectid": 1, - "courseid": 1, + "objectid": 2, + "userid": 1, "eventname": "\\core\\event\\course_created", - "userid": 1 + "objecttable": "course", + "timecreated": 1433946701 } diff --git a/tests/core/course_created/creating_new_course/statements.json b/tests/core/course_created/creating_new_course/statements.json index 3fe22844d..de12cb9af 100644 --- a/tests/core/course_created/creating_new_course/statements.json +++ b/tests/core/course_created/creating_new_course/statements.json @@ -14,12 +14,12 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, @@ -29,10 +29,10 @@ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } @@ -40,10 +40,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\course_created", "event_name": "\\core\\event\\course_created", - "event_function": "\\src\\transformer\\events\\core\\course_created" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/course_module_completion_update/completing_existing_module/data.json b/tests/core/course_module_completion_update/completing_existing_module/data.json index 1183172e7..659a77ea2 100644 --- a/tests/core/course_module_completion_update/completing_existing_module/data.json +++ b/tests/core/course_module_completion_update/completing_existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "book": [ { "id": 1, - "name": "book" + "name": "test_book_name" } ], - "book": [ + "modules": [ { "id": 1, - "name": "test_book_name" + "name": "book" } ] } diff --git a/tests/core/course_module_completion_update/completing_existing_module/event.json b/tests/core/course_module_completion_update/completing_existing_module/event.json index 2be1bab43..afa5d2e6e 100644 --- a/tests/core/course_module_completion_update/completing_existing_module/event.json +++ b/tests/core/course_module_completion_update/completing_existing_module/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\core\\event\\course_module_completion_updated", - "other": "a:3:{s:13:\"relateduserid\";i:1;s:10:\"overrideby\";N;s:15:\"completionstate\";i:2;}" + "other": "a:3:{s:13:\"relateduserid\";i:1;s:10:\"overrideby\";N;s:15:\"completionstate\";i:2;}", + "timecreated": 1433946701 } diff --git a/tests/core/course_module_completion_update/completing_existing_module/statements.json b/tests/core/course_module_completion_update/completing_existing_module/statements.json index 48ab87ebb..63e36fcdf 100644 --- a/tests/core/course_module_completion_update/completing_existing_module/statements.json +++ b/tests/core/course_module_completion_update/completing_existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,63 +16,63 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_book_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, - "result": { - "completion": true, - "success": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_module_completion_updated", - "event_function": "\\src\\transformer\\events\\core\\course_module_completion_updated" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_module_completion_updated", + "event_name": "\\core\\event\\course_module_completion_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "success": true } } ] diff --git a/tests/core/course_module_completion_update/uncompleting_existing_module/data.json b/tests/core/course_module_completion_update/uncompleting_existing_module/data.json index 1183172e7..659a77ea2 100644 --- a/tests/core/course_module_completion_update/uncompleting_existing_module/data.json +++ b/tests/core/course_module_completion_update/uncompleting_existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "book": [ { "id": 1, - "name": "book" + "name": "test_book_name" } ], - "book": [ + "modules": [ { "id": 1, - "name": "test_book_name" + "name": "book" } ] } diff --git a/tests/core/course_module_completion_update/uncompleting_existing_module/event.json b/tests/core/course_module_completion_update/uncompleting_existing_module/event.json index 51e1af8b6..6902b9600 100644 --- a/tests/core/course_module_completion_update/uncompleting_existing_module/event.json +++ b/tests/core/course_module_completion_update/uncompleting_existing_module/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\core\\event\\course_module_completion_updated", - "other": "a:3:{s:13:\"relateduserid\";i:1;s:10:\"overrideby\";N;s:15:\"completionstate\";i:0;}" + "other": "a:3:{s:13:\"relateduserid\";i:1;s:10:\"overrideby\";N;s:15:\"completionstate\";i:0;}", + "timecreated": 1433946701 } diff --git a/tests/core/course_module_completion_update/uncompleting_existing_module/statements.json b/tests/core/course_module_completion_update/uncompleting_existing_module/statements.json index b5973a162..e5b43c53f 100644 --- a/tests/core/course_module_completion_update/uncompleting_existing_module/statements.json +++ b/tests/core/course_module_completion_update/uncompleting_existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/uncompleted", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_book_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_module_completion_updated", - "event_function": "\\src\\transformer\\events\\core\\course_module_completion_updated" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_module_completion_updated", + "event_name": "\\core\\event\\course_module_completion_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/core/course_module_created/creating_new_course_module/data.json b/tests/core/course_module_created/creating_new_course_module/data.json index 1183172e7..659a77ea2 100644 --- a/tests/core/course_module_created/creating_new_course_module/data.json +++ b/tests/core/course_module_created/creating_new_course_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "book": [ { "id": 1, - "name": "book" + "name": "test_book_name" } ], - "book": [ + "modules": [ { "id": 1, - "name": "test_book_name" + "name": "book" } ] } diff --git a/tests/core/course_module_created/creating_new_course_module/event.json b/tests/core/course_module_created/creating_new_course_module/event.json index 9be749c52..7d41ce454 100644 --- a/tests/core/course_module_created/creating_new_course_module/event.json +++ b/tests/core/course_module_created/creating_new_course_module/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "objecttable": "course_modules", - "timecreated": 1433946701, "objectid": 1, - "courseid": 1, - "eventname": "\\core\\event\\course_module_created", "userid": 1, - "contextinstanceid": 1 + "eventname": "\\core\\event\\course_module_created", + "objecttable": "course_modules", + "timecreated": 1433946701 } diff --git a/tests/core/course_module_created/creating_new_course_module/statements.json b/tests/core/course_module_created/creating_new_course_module/statements.json index 1a1ac4e9c..d147c9036 100644 --- a/tests/core/course_module_created/creating_new_course_module/statements.json +++ b/tests/core/course_module_created/creating_new_course_module/statements.json @@ -16,45 +16,45 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_book_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, "context": { "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -62,10 +62,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\course_module_created", "event_name": "\\core\\event\\course_module_created", - "event_function": "\\src\\transformer\\events\\core\\course_module_created" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/data.json b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/data.json index 614658e31..13de62cac 100644 --- a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/data.json +++ b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/data.json @@ -5,12 +5,5 @@ "firstname": "test_fullname", "email": "test@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/event.json b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/event.json index 38bf55d64..3822de300 100644 --- a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/event.json +++ b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, + "objectid": null, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\core\\event\\course_resources_list_viewed", "objecttable": null, - "objectid": null, - "eventname": "\\core\\event\\course_resources_list_viewed" + "timecreated": 1433946701 } diff --git a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/statements.json b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/statements.json index 1413b08e1..2688f6ccb 100644 --- a/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/statements.json +++ b/tests/core/course_resources_list_viewed/existing_course_resources_list_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -14,51 +14,51 @@ } }, "object": { - "id": "http://www.example.org/course/resources.php?id=1", + "id": "http://www.example.org/course/resources.php?id=2", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/webpage", "name": { "en": "test_name Resources" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/webpage" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_resources_list_viewed", - "event_function": "\\src\\transformer\\events\\core\\course_resources_list_viewed" - } - }, "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_resources_list_viewed", + "event_name": "\\core\\event\\course_resources_list_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/core/course_section_created/new_course_section_created/data.json b/tests/core/course_section_created/new_course_section_created/data.json index 06f647d74..380365ced 100644 --- a/tests/core/course_section_created/new_course_section_created/data.json +++ b/tests/core/course_section_created/new_course_section_created/data.json @@ -6,19 +6,19 @@ "lang": "en" } ], - "user": [ + "course_sections": [ { "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" + "name": null, + "course": 2, + "section": 5 } ], - "course_sections": [ + "user": [ { "id": 1, - "course": 1, - "section": 5, - "name": null + "firstname": "test_fullname", + "email": "test@test.com" } ] } diff --git a/tests/core/course_section_created/new_course_section_created/event.json b/tests/core/course_section_created/new_course_section_created/event.json index 1b6ca0523..aa648a469 100644 --- a/tests/core/course_section_created/new_course_section_created/event.json +++ b/tests/core/course_section_created/new_course_section_created/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, - "objecttable": "course_sections", - "timecreated": 1433946701, "objectid": 1, - "eventname": "\\core\\event\\course_section_created", "userid": 1, - "courseid": 1 + "eventname": "\\core\\event\\course_section_created", + "objecttable": "course_sections", + "timecreated": 1433946701 } diff --git a/tests/core/course_section_created/new_course_section_created/statements.json b/tests/core/course_section_created/new_course_section_created/statements.json index 60e67cd8e..950f18a66 100644 --- a/tests/core/course_section_created/new_course_section_created/statements.json +++ b/tests/core/course_section_created/new_course_section_created/statements.json @@ -15,36 +15,36 @@ }, "object": { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 5" }, "type": "http://id.tincanapi.com/activitytype/section" - } + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -52,10 +52,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\course_section_created", "event_name": "\\core\\event\\course_section_created", - "event_function": "\\src\\transformer\\events\\core\\course_section_created" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/course_updated/updating_existing_course/data.json b/tests/core/course_updated/updating_existing_course/data.json index 11cebcfb4..13de62cac 100644 --- a/tests/core/course_updated/updating_existing_course/data.json +++ b/tests/core/course_updated/updating_existing_course/data.json @@ -1,11 +1,4 @@ { - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } - ], "user": [ { "id": 1, diff --git a/tests/core/course_updated/updating_existing_course/event.json b/tests/core/course_updated/updating_existing_course/event.json index d77ecfdd1..b66d28bed 100644 --- a/tests/core/course_updated/updating_existing_course/event.json +++ b/tests/core/course_updated/updating_existing_course/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, - "objecttable": "course", - "timecreated": 1433946701, - "objectid": 1, - "courseid": 1, + "objectid": 2, + "userid": 1, "eventname": "\\core\\event\\course_updated", - "userid": 1 + "objecttable": "course", + "timecreated": 1433946701 } diff --git a/tests/core/course_updated/updating_existing_course/statements.json b/tests/core/course_updated/updating_existing_course/statements.json index 964e42b66..4600737d5 100644 --- a/tests/core/course_updated/updating_existing_course/statements.json +++ b/tests/core/course_updated/updating_existing_course/statements.json @@ -14,12 +14,12 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, @@ -29,10 +29,10 @@ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } @@ -40,10 +40,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\course_updated", "event_name": "\\core\\event\\course_updated", - "event_function": "\\src\\transformer\\events\\core\\course_updated" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/course_viewed/viewing_existing_course/data.json b/tests/core/course_viewed/viewing_existing_course/data.json index 614658e31..13de62cac 100644 --- a/tests/core/course_viewed/viewing_existing_course/data.json +++ b/tests/core/course_viewed/viewing_existing_course/data.json @@ -5,12 +5,5 @@ "firstname": "test_fullname", "email": "test@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/core/course_viewed/viewing_existing_course/event.json b/tests/core/course_viewed/viewing_existing_course/event.json index 07290c53f..a25eec68e 100644 --- a/tests/core/course_viewed/viewing_existing_course/event.json +++ b/tests/core/course_viewed/viewing_existing_course/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, + "objectid": 2, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\core\\event\\course_viewed", "objecttable": "course", - "objectid": 1, - "eventname": "\\core\\event\\course_viewed" + "timecreated": 1433946701 } diff --git a/tests/core/course_viewed/viewing_existing_course/statements.json b/tests/core/course_viewed/viewing_existing_course/statements.json index e2490c903..e6ccd8246 100644 --- a/tests/core/course_viewed/viewing_existing_course/statements.json +++ b/tests/core/course_viewed/viewing_existing_course/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -14,39 +14,39 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\course_viewed", - "event_function": "\\src\\transformer\\events\\core\\course_viewed" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\course_viewed", + "event_name": "\\core\\event\\course_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/core/group_created/creating_new_group/event.json b/tests/core/group_created/creating_new_group/event.json index a10a75825..97659e06f 100644 --- a/tests/core/group_created/creating_new_group/event.json +++ b/tests/core/group_created/creating_new_group/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, - "objecttable": "groups", - "timecreated": 1433946701, "objectid": 1, - "courseid": 1, + "userid": 1, "eventname": "\\core\\event\\group_created", - "userid": 1 + "objecttable": "groups", + "timecreated": 1433946701 } diff --git a/tests/core/group_created/creating_new_group/statements.json b/tests/core/group_created/creating_new_group/statements.json index 8ad4c3133..0da6c845e 100644 --- a/tests/core/group_created/creating_new_group/statements.json +++ b/tests/core/group_created/creating_new_group/statements.json @@ -15,36 +15,36 @@ }, "object": { "id": "http://www.example.org/group/index.php?id=1", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group", "name": { "en": "test_name" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group" + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -52,10 +52,10 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\group_created", "event_name": "\\core\\event\\group_created", - "event_function": "\\src\\transformer\\events\\core\\group_created" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } } diff --git a/tests/core/group_deleted/existing_group_deleted/event.json b/tests/core/group_deleted/existing_group_deleted/event.json index e1e7e3378..6e13005be 100644 --- a/tests/core/group_deleted/existing_group_deleted/event.json +++ b/tests/core/group_deleted/existing_group_deleted/event.json @@ -1,9 +1,9 @@ { - "courseid": 1, - "eventname": "\\core\\event\\group_deleted", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\group_deleted", "objecttable": "groups", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/group_deleted/existing_group_deleted/statements.json b/tests/core/group_deleted/existing_group_deleted/statements.json index dc95ee5ea..1fadbedf1 100644 --- a/tests/core/group_deleted/existing_group_deleted/statements.json +++ b/tests/core/group_deleted/existing_group_deleted/statements.json @@ -15,33 +15,33 @@ }, "object": { "id": "http://www.example.org/group/index.php?id=1", - "objectType": "Activity", "definition": { "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group" - } + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } diff --git a/tests/core/group_member_added/new_group_member_added/data.json b/tests/core/group_member_added/new_group_member_added/data.json index a58cca882..07a4c2718 100644 --- a/tests/core/group_member_added/new_group_member_added/data.json +++ b/tests/core/group_member_added/new_group_member_added/data.json @@ -1,4 +1,10 @@ { + "groups": [ + { + "id": 1, + "name": "test_name" + } + ], "user": [ { "id": 1, @@ -10,11 +16,5 @@ "firstname": "test_fullname2", "email": "test2@test.com" } - ], - "groups": [ - { - "id": 1, - "name": "test_name" - } ] } diff --git a/tests/core/group_member_added/new_group_member_added/event.json b/tests/core/group_member_added/new_group_member_added/event.json index b0d97e497..a15fd631d 100644 --- a/tests/core/group_member_added/new_group_member_added/event.json +++ b/tests/core/group_member_added/new_group_member_added/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "objecttable": "groups", - "timecreated": 1433946701, "objectid": 1, - "courseid": 1, - "eventname": "\\core\\event\\group_member_added", + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\group_member_added", + "objecttable": "groups", + "timecreated": 1433946701 } diff --git a/tests/core/group_member_added/new_group_member_added/statements.json b/tests/core/group_member_added/new_group_member_added/statements.json index 277e751bd..101a40fe6 100644 --- a/tests/core/group_member_added/new_group_member_added/statements.json +++ b/tests/core/group_member_added/new_group_member_added/statements.json @@ -15,43 +15,36 @@ }, "object": { "id": "http://www.example.org/group/index.php?id=1", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group", "name": { "en": "test_name" - } - } - }, - "context": { - "instructor": { - "account": { - "homePage": "http://www.example.org", - "name": "1" }, - "name": "test_fullname1" + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group" }, + "objectType": "Activity" + }, + "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -59,11 +52,18 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\group_member_added", "event_name": "\\core\\event\\group_member_added", - "event_function": "\\src\\transformer\\events\\core\\group_member_added" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" } } } diff --git a/tests/core/group_member_removed/existing_group_member_removed/data.json b/tests/core/group_member_removed/existing_group_member_removed/data.json index a58cca882..07a4c2718 100644 --- a/tests/core/group_member_removed/existing_group_member_removed/data.json +++ b/tests/core/group_member_removed/existing_group_member_removed/data.json @@ -1,4 +1,10 @@ { + "groups": [ + { + "id": 1, + "name": "test_name" + } + ], "user": [ { "id": 1, @@ -10,11 +16,5 @@ "firstname": "test_fullname2", "email": "test2@test.com" } - ], - "groups": [ - { - "id": 1, - "name": "test_name" - } ] } diff --git a/tests/core/group_member_removed/existing_group_member_removed/event.json b/tests/core/group_member_removed/existing_group_member_removed/event.json index 4ac35312c..8bebc5d5e 100644 --- a/tests/core/group_member_removed/existing_group_member_removed/event.json +++ b/tests/core/group_member_removed/existing_group_member_removed/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "objecttable": "groups", - "timecreated": 1433946701, "objectid": 1, - "courseid": 1, - "eventname": "\\core\\event\\group_member_removed", + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\group_member_removed", + "objecttable": "groups", + "timecreated": 1433946701 } diff --git a/tests/core/group_member_removed/existing_group_member_removed/statements.json b/tests/core/group_member_removed/existing_group_member_removed/statements.json index feb4493b8..e758c06ff 100644 --- a/tests/core/group_member_removed/existing_group_member_removed/statements.json +++ b/tests/core/group_member_removed/existing_group_member_removed/statements.json @@ -15,43 +15,36 @@ }, "object": { "id": "http://www.example.org/group/index.php?id=1", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group", "name": { "en": "test_name" - } - } - }, - "context": { - "instructor": { - "account": { - "homePage": "http://www.example.org", - "name": "1" }, - "name": "test_fullname1" + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group" }, + "objectType": "Activity" + }, + "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -59,11 +52,18 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\group_member_removed", "event_name": "\\core\\event\\group_member_removed", - "event_function": "\\src\\transformer\\events\\core\\group_member_removed" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" } } } diff --git a/tests/core/group_message_sent/new_group_message_sent/data.json b/tests/core/group_message_sent/new_group_message_sent/data.json index 2fa2ffd06..a0c061fb2 100644 --- a/tests/core/group_message_sent/new_group_message_sent/data.json +++ b/tests/core/group_message_sent/new_group_message_sent/data.json @@ -1,17 +1,15 @@ { "groups": [ { + "courseid": 2, "id": 1, - "name": "test_name", - "courseid": 1 + "name": "test_name" } ], - "messages": [ + "groups_members": [ { - "id": 1, - "subject": "test_message_subject", - "fullmessage": "test_message_body", - "conversationid": 1 + "groupid": 1, + "userid": 1 } ], "message_conversations": [ @@ -20,10 +18,12 @@ "itemid": 1 } ], - "groups_members": [ + "messages": [ { - "groupid": 1, - "userid": 1 + "conversationid": 1, + "id": 1, + "fullmessage": "test_message_body", + "subject": "test_message_subject" } ] } diff --git a/tests/core/group_message_sent/new_group_message_sent/event.json b/tests/core/group_message_sent/new_group_message_sent/event.json index d73534937..56da1ecd6 100644 --- a/tests/core/group_message_sent/new_group_message_sent/event.json +++ b/tests/core/group_message_sent/new_group_message_sent/event.json @@ -1,9 +1,9 @@ { - "courseid": 1, - "eventname": "\\core\\event\\group_message_sent", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\group_message_sent", "objecttable": "messages", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/group_message_sent/new_group_message_sent/statements.json b/tests/core/group_message_sent/new_group_message_sent/statements.json index 991b9d384..da101aff3 100644 --- a/tests/core/group_message_sent/new_group_message_sent/statements.json +++ b/tests/core/group_message_sent/new_group_message_sent/statements.json @@ -8,58 +8,58 @@ "name": "test_fullname" }, "verb": { + "id": "http://activitystrea.ms/send", "display": { "en": "Sent" - }, - "id": "http://activitystrea.ms/send" + } }, "object": { "id": "http://www.example.org/message?id=1", - "objectType": "Activity", "definition": { - "name": { - "en": "test_message_subject" - }, "description": { "en": "test_message_body" }, + "name": { + "en": "test_message_subject" + }, "type": "http://id.tincanapi.com/activitytype/chat-message" - } + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "grouping": [ + "category": [ { - "id": "http://www.example.org/group/index.php?id=1", - "objectType": "Activity", + "id": "http://www.example.org", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group", "name": { - "en": "test_name" - } - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" } ], - "parent": [ + "grouping": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/group/index.php?id=1", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/group" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -73,8 +73,6 @@ "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" }, "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/to": { - "name": "test_name", - "objectType": "Group", "member": [ { "account": { @@ -83,7 +81,9 @@ }, "name": "test_fullname" } - ] + ], + "name": "test_name", + "objectType": "Group" } } } diff --git a/tests/core/message_sent/user_sent_message/data.json b/tests/core/message_sent/user_sent_message/data.json index dd1047304..6b4938d87 100644 --- a/tests/core/message_sent/user_sent_message/data.json +++ b/tests/core/message_sent/user_sent_message/data.json @@ -1,25 +1,25 @@ { + "messages": [ + { + "id": 1, + "fullmessage": "hi there!(messagetext)", + "subject": "hi there(subject)" + } + ], "user": [ { "id": 1, "firstname": "sender", "lastname": "senderson", - "email": "sender@example.com", - "username": "sender" + "username": "sender", + "email": "sender@example.com" }, { "id": 2, "firstname": "receiver", "lastname": "receiverson", - "email": "receiver@example.com", - "username": "receiver" - } - ], - "messages": [ - { - "id": 1, - "fullmessage": "hi there!(messagetext)", - "subject": "hi there(subject)" + "username": "receiver", + "email": "receiver@example.com" } ] } diff --git a/tests/core/message_sent/user_sent_message/event.json b/tests/core/message_sent/user_sent_message/event.json index eba3864e9..fa489c6cb 100644 --- a/tests/core/message_sent/user_sent_message/event.json +++ b/tests/core/message_sent/user_sent_message/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\message_sent", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "messages", - "timecreated": 1433946701, + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\message_sent", + "objecttable": "messages", + "timecreated": 1433946701 } diff --git a/tests/core/message_sent/user_sent_message/statements.json b/tests/core/message_sent/user_sent_message/statements.json index 83c98111d..63cc48ea9 100644 --- a/tests/core/message_sent/user_sent_message/statements.json +++ b/tests/core/message_sent/user_sent_message/statements.json @@ -33,7 +33,7 @@ "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, @@ -42,7 +42,7 @@ ], "parent": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" diff --git a/tests/core/message_viewed/user_viewed_message/data.json b/tests/core/message_viewed/user_viewed_message/data.json index dd1047304..6b4938d87 100644 --- a/tests/core/message_viewed/user_viewed_message/data.json +++ b/tests/core/message_viewed/user_viewed_message/data.json @@ -1,25 +1,25 @@ { + "messages": [ + { + "id": 1, + "fullmessage": "hi there!(messagetext)", + "subject": "hi there(subject)" + } + ], "user": [ { "id": 1, "firstname": "sender", "lastname": "senderson", - "email": "sender@example.com", - "username": "sender" + "username": "sender", + "email": "sender@example.com" }, { "id": 2, "firstname": "receiver", "lastname": "receiverson", - "email": "receiver@example.com", - "username": "receiver" - } - ], - "messages": [ - { - "id": 1, - "fullmessage": "hi there!(messagetext)", - "subject": "hi there(subject)" + "username": "receiver", + "email": "receiver@example.com" } ] } diff --git a/tests/core/message_viewed/user_viewed_message/event.json b/tests/core/message_viewed/user_viewed_message/event.json index feb3aa550..0d712a3ad 100644 --- a/tests/core/message_viewed/user_viewed_message/event.json +++ b/tests/core/message_viewed/user_viewed_message/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\message_viewed", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "messages", - "timecreated": 1433946701, + "relateduserid": 1, "userid": 2, - "relateduserid": 1 + "eventname": "\\core\\event\\message_viewed", + "objecttable": "messages", + "timecreated": 1433946701 } diff --git a/tests/core/message_viewed/user_viewed_message/statements.json b/tests/core/message_viewed/user_viewed_message/statements.json index eaa23e77d..573458cad 100644 --- a/tests/core/message_viewed/user_viewed_message/statements.json +++ b/tests/core/message_viewed/user_viewed_message/statements.json @@ -7,6 +7,25 @@ }, "name": "receiver receiverson" }, + "verb": { + "id": "http://id.tincanapi.com/verb/viewed", + "display": { + "en": "Viewed" + } + }, + "object": { + "id": "http://www.example.org/message?id=1", + "definition": { + "description": { + "en": "hi there!(messagetext)" + }, + "name": { + "en": "hi there(subject)" + }, + "type": "http://id.tincanapi.com/activitytype/chat-message" + }, + "objectType": "Activity" + }, "context": { "contextActivities": { "category": [ @@ -14,7 +33,7 @@ "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, @@ -23,7 +42,7 @@ ], "parent": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" @@ -50,25 +69,6 @@ } }, "language": "en" - }, - "object": { - "id": "http://www.example.org/message?id=1", - "definition": { - "description": { - "en": "hi there!(messagetext)" - }, - "name": { - "en": "hi there(subject)" - }, - "type": "http://id.tincanapi.com/activitytype/chat-message" - }, - "objectType": "Activity" - }, - "verb": { - "id": "http://id.tincanapi.com/verb/viewed", - "display": { - "en": "Viewed" - } } } ] diff --git a/tests/core/note_created/user_created_note/data.json b/tests/core/note_created/user_created_note/data.json index 7b0e98471..0abd3de7d 100644 --- a/tests/core/note_created/user_created_note/data.json +++ b/tests/core/note_created/user_created_note/data.json @@ -2,22 +2,22 @@ "post": [ { "id": 1, - "subject": "no subject", - "content": "here is a note" + "content": "here is a note", + "subject": "no subject" } ], "user": [ { "id": 1, - "email": "author@test.com", "firstname": "note_author_firstname", - "lastname": "note_author_lastname" + "lastname": "note_author_lastname", + "email": "author@test.com" }, { "id": 2, - "email": "subject@test.com", "firstname": "note_subject_firstname", - "lastname": "note_subject_lastname" + "lastname": "note_subject_lastname", + "email": "subject@test.com" } ] } diff --git a/tests/core/note_created/user_created_note/event.json b/tests/core/note_created/user_created_note/event.json index 72a487d70..0bb255d00 100644 --- a/tests/core/note_created/user_created_note/event.json +++ b/tests/core/note_created/user_created_note/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\note_created", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "post", - "timecreated": 1433946701, + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\note_created", + "objecttable": "post", + "timecreated": 1433946701 } diff --git a/tests/core/note_created/user_created_note/statements.json b/tests/core/note_created/user_created_note/statements.json index 403944308..b58b70769 100644 --- a/tests/core/note_created/user_created_note/statements.json +++ b/tests/core/note_created/user_created_note/statements.json @@ -16,23 +16,23 @@ "object": { "id": "http://www.example.org/notes/view.php?id=1", "definition": { - "name": { - "en": "no subject" - }, "description": { "en": "here is a note" }, - "type": "http://activitystrea.ms/note", "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-type": "course", "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-subject": { "account": { "homePage": "http://www.example.org", "name": "2" }, "name": "note_subject_firstname note_subject_lastname" - } - } + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-type": "course" + }, + "name": { + "en": "no subject" + }, + "type": "http://activitystrea.ms/note" }, "objectType": "Activity" }, @@ -40,25 +40,25 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/note_updated/user_updated_note/data.json b/tests/core/note_updated/user_updated_note/data.json index 9e30d0cf4..989d161b9 100644 --- a/tests/core/note_updated/user_updated_note/data.json +++ b/tests/core/note_updated/user_updated_note/data.json @@ -2,22 +2,22 @@ "post": [ { "id": 1, - "subject": "a note title", - "content": "contents of a note" + "content": "contents of a note", + "subject": "a note title" } ], "user": [ { - "email": "editor@test.com", - "firstname": "note_editor_firstname", "id": 1, - "lastname": "note_editor_lastname" + "firstname": "note_editor_firstname", + "lastname": "note_editor_lastname", + "email": "editor@test.com" }, { - "email": "editor@test.com", - "firstname": "note_subject_firstname", "id": 2, - "lastname": "note_subject_lastname" + "firstname": "note_subject_firstname", + "lastname": "note_subject_lastname", + "email": "editor@test.com" } ] } diff --git a/tests/core/note_updated/user_updated_note/event.json b/tests/core/note_updated/user_updated_note/event.json index 34e8be33c..ec8617560 100644 --- a/tests/core/note_updated/user_updated_note/event.json +++ b/tests/core/note_updated/user_updated_note/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\note_updated", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "post", - "timecreated": 1433946701, + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\note_updated", + "objecttable": "post", + "timecreated": 1433946701 } diff --git a/tests/core/note_updated/user_updated_note/statements.json b/tests/core/note_updated/user_updated_note/statements.json index c153a7160..f00e462e6 100644 --- a/tests/core/note_updated/user_updated_note/statements.json +++ b/tests/core/note_updated/user_updated_note/statements.json @@ -16,23 +16,23 @@ "object": { "id": "http://www.example.org/notes/view.php?id=1", "definition": { - "name": { - "en": "a note title" - }, - "type": "http://activitystrea.ms/note", "description": { "en": "contents of a note" }, "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-type": "course", "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-subject": { "account": { "homePage": "http://www.example.org", "name": "2" }, "name": "note_subject_firstname note_subject_lastname" - } - } + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-type": "course" + }, + "name": { + "en": "a note title" + }, + "type": "http://activitystrea.ms/note" }, "objectType": "Activity" }, @@ -40,25 +40,25 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/notes_viewed/user_viewed_notes/data.json b/tests/core/notes_viewed/user_viewed_notes/data.json index ecf3fa4c5..542e4e2ed 100644 --- a/tests/core/notes_viewed/user_viewed_notes/data.json +++ b/tests/core/notes_viewed/user_viewed_notes/data.json @@ -1,16 +1,16 @@ { "user": [ { - "email": "viewer@test.com", - "firstname": "notes_viewer_firstname", "id": 1, - "lastname": "notes_viewer_lastname" + "firstname": "notes_viewer_firstname", + "lastname": "notes_viewer_lastname", + "email": "viewer@test.com" }, { - "email": "subject@test.com", - "firstname": "notes_subject_firstname", "id": 2, - "lastname": "notes_subject_lastname" + "firstname": "notes_subject_firstname", + "lastname": "notes_subject_lastname", + "email": "subject@test.com" } ] } diff --git a/tests/core/notes_viewed/user_viewed_notes/event.json b/tests/core/notes_viewed/user_viewed_notes/event.json index 1a9cb40b3..ded2466b6 100644 --- a/tests/core/notes_viewed/user_viewed_notes/event.json +++ b/tests/core/notes_viewed/user_viewed_notes/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\notes_viewed", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "post", - "timecreated": 1433946701, + "relateduserid": 2, "userid": 1, - "relateduserid": 2 + "eventname": "\\core\\event\\notes_viewed", + "objecttable": "post", + "timecreated": 1433946701 } diff --git a/tests/core/notes_viewed/user_viewed_notes/statements.json b/tests/core/notes_viewed/user_viewed_notes/statements.json index f0b03205a..e5430fbac 100644 --- a/tests/core/notes_viewed/user_viewed_notes/statements.json +++ b/tests/core/notes_viewed/user_viewed_notes/statements.json @@ -16,10 +16,6 @@ "object": { "id": "http://www.example.org/notes/index.php", "definition": { - "name": { - "en": "Notes" - }, - "type": "https://w3id.org/xapi/acrossx/activities/webpage", "extensions": { "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/note-subject": { "account": { @@ -28,7 +24,11 @@ }, "name": "notes_subject_firstname notes_subject_lastname" } - } + }, + "name": { + "en": "Notes" + }, + "type": "https://w3id.org/xapi/acrossx/activities/webpage" }, "objectType": "Activity" }, @@ -36,25 +36,25 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], "parent": [ { + "id": "http://www.example.org/course/view.php?id=2", "definition": { "name": { "en": "test_name" }, "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, - "id": "http://www.example.org/course/view.php?id=1", "objectType": "Activity" } ] diff --git a/tests/core/question_created/new_question_created/data.json b/tests/core/question_created/new_question_created/data.json index 86ff914fc..a3cb0c423 100644 --- a/tests/core/question_created/new_question_created/data.json +++ b/tests/core/question_created/new_question_created/data.json @@ -2,22 +2,22 @@ "question": [ { "id": 1, - "qtype": "truefalse", "name": "True or False?", + "qtype": "truefalse", "questiontext": "

Is the sky blue?

" } ], "question_answers": [ { "id": 1, - "fraction": 1.0, "answer": "True", + "fraction": 1.0, "question": 1 }, { "id": 2, - "fraction": 0.0, "answer": "False", + "fraction": 0.0, "question": 1 } ] diff --git a/tests/core/question_created/new_question_created/event.json b/tests/core/question_created/new_question_created/event.json index e16203a9e..ed747adb8 100644 --- a/tests/core/question_created/new_question_created/event.json +++ b/tests/core/question_created/new_question_created/event.json @@ -1,9 +1,9 @@ { - "courseid": 1, - "eventname": "\\core\\event\\question_created", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\core\\event\\question_created", "objecttable": "question", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/core/question_created/new_question_created/statements.json b/tests/core/question_created/new_question_created/statements.json index be8a28c05..597a5ae35 100644 --- a/tests/core/question_created/new_question_created/statements.json +++ b/tests/core/question_created/new_question_created/statements.json @@ -1,60 +1,60 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { + "id": "http://activitystrea.ms/create", "display": { "en": "Created" - }, - "id": "http://activitystrea.ms/create" + } }, "object": { "id": "http://www.example.org/question?id=1", "definition": { - "name": { - "en": "True or False?" - }, - "description": { - "en": "Is the sky blue?" - }, - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "interactionType": "true-false", "correctResponsesPattern": [ "true" ], + "description": { + "en": "Is the sky blue?" + }, "extensions": { "https://xapi.edlm/profiles/edlm-lms/concepts/activity-extensions/moodle-question-type": "truefalse" - } + }, + "interactionType": "true-false", + "name": { + "en": "True or False?" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } diff --git a/tests/core/questions_imported/new_questions_imported/event.json b/tests/core/questions_imported/new_questions_imported/event.json index a1c3da99f..e85765f5e 100644 --- a/tests/core/questions_imported/new_questions_imported/event.json +++ b/tests/core/questions_imported/new_questions_imported/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\core\\event\\questions_imported", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": null, - "timecreated": 1433946701, "userid": 1, - "other": "a:2:{s:6:\"format\";s:3:\"xml\";s:10:\"categoryid\";s:2:\"10\";}" + "eventname": "\\core\\event\\questions_imported", + "objecttable": null, + "other": "a:2:{s:6:\"format\";s:3:\"xml\";s:10:\"categoryid\";s:2:\"10\";}", + "timecreated": 1433946701 } diff --git a/tests/core/questions_imported/new_questions_imported/statements.json b/tests/core/questions_imported/new_questions_imported/statements.json index 6be099a19..0e80c8462 100644 --- a/tests/core/questions_imported/new_questions_imported/statements.json +++ b/tests/core/questions_imported/new_questions_imported/statements.json @@ -8,43 +8,43 @@ "name": "test_fullname" }, "verb": { + "id": "http://adlnet.gov/expapi/verbs/imported", "display": { "en": "Imported" - }, - "id": "http://adlnet.gov/expapi/verbs/imported" + } }, "object": { "id": "http://www.example.org/question/bank/importquestions/import.php", - "objectType": "Activity", "definition": { - "type": "http://adlnet.gov/expapi/activities/file", "name": { "en": "Questions in xml format" - } - } + }, + "type": "http://adlnet.gov/expapi/activities/file" + }, + "objectType": "Activity" }, "context": { "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } diff --git a/tests/core/search_results_viewed/user_viewed_search_results/event.json b/tests/core/search_results_viewed/user_viewed_search_results/event.json index 7c5cf6e1c..429aabdb2 100644 --- a/tests/core/search_results_viewed/user_viewed_search_results/event.json +++ b/tests/core/search_results_viewed/user_viewed_search_results/event.json @@ -1,10 +1,10 @@ { "courseid": null, - "eventname": "\\core\\event\\search_results_viewed", "id": 1, "objectid": null, - "objecttable": null, - "timecreated": 1433946701, "userid": 1, - "other": "a:7:{s:1:\"q\";s:5:\"query\";s:4:\"page\";i:0;s:5:\"title\";s:0:\"\";s:7:\"areaids\";a:0:{}s:9:\"courseids\";a:0:{}s:9:\"timestart\";i:0;s:7:\"timeend\";i:0;}" + "eventname": "\\core\\event\\search_results_viewed", + "objecttable": null, + "other": "a:7:{s:1:\"q\";s:5:\"query\";s:4:\"page\";i:0;s:5:\"title\";s:0:\"\";s:7:\"areaids\";a:0:{}s:9:\"courseids\";a:0:{}s:9:\"timestart\";i:0;s:7:\"timeend\";i:0;}", + "timecreated": 1433946701 } diff --git a/tests/core/search_results_viewed/user_viewed_search_results/statements.json b/tests/core/search_results_viewed/user_viewed_search_results/statements.json index b5d184931..618b6756d 100644 --- a/tests/core/search_results_viewed/user_viewed_search_results/statements.json +++ b/tests/core/search_results_viewed/user_viewed_search_results/statements.json @@ -15,16 +15,13 @@ }, "object": { "id": "http://www.example.org/search/index.php", - "objectType": "Activity", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/webpage", "name": { "en": "Global Search" - } - } - }, - "result": { - "response": "query" + }, + "type": "https://w3id.org/xapi/acrossx/activities/webpage" + }, + "objectType": "Activity" }, "context": { "contextActivities": { @@ -32,10 +29,10 @@ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } @@ -49,6 +46,9 @@ "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } } + }, + "result": { + "response": "query" } } ] diff --git a/tests/core/user_created/existing_user_created/data.json b/tests/core/user_created/existing_user_created/data.json index 614658e31..13de62cac 100644 --- a/tests/core/user_created/existing_user_created/data.json +++ b/tests/core/user_created/existing_user_created/data.json @@ -5,12 +5,5 @@ "firstname": "test_fullname", "email": "test@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/core/user_created/existing_user_created/event.json b/tests/core/user_created/existing_user_created/event.json index a9ed6e03f..01df2a120 100644 --- a/tests/core/user_created/existing_user_created/event.json +++ b/tests/core/user_created/existing_user_created/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\core\\event\\user_created", "objecttable": "user", - "objectid": 1, - "eventname": "\\core\\event\\user_created" + "timecreated": 1433946701 } diff --git a/tests/core/user_created/existing_user_created/statements.json b/tests/core/user_created/existing_user_created/statements.json index 5e4020eb7..d5ae29467 100644 --- a/tests/core/user_created/existing_user_created/statements.json +++ b/tests/core/user_created/existing_user_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/registered", @@ -16,37 +16,37 @@ "object": { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_created", - "event_function": "\\src\\transformer\\events\\core\\user_created" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_created", + "event_name": "\\core\\event\\user_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/core/user_created/send_jisc_data/data.json b/tests/core/user_created/send_jisc_data/data.json index b3719b756..7c5c6f863 100644 --- a/tests/core/user_created/send_jisc_data/data.json +++ b/tests/core/user_created/send_jisc_data/data.json @@ -1,17 +1,22 @@ { - "user": [ + "course": [ { "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" + "fullname": "test_site_fullname", + "lang": "en" + }, + { + "id": 2, + "fullname": "test_name", + "shortname": "test_course_short_name", + "lang": "en" } ], - "course": [ + "user": [ { "id": 1, - "fullname": "test_name", - "lang": "en", - "shortname": "test_course_short_name" + "firstname": "test_fullname", + "email": "test@test.com" } ] } diff --git a/tests/core/user_created/send_jisc_data/event.json b/tests/core/user_created/send_jisc_data/event.json index c5828b1a7..20d79e8b5 100644 --- a/tests/core/user_created/send_jisc_data/event.json +++ b/tests/core/user_created/send_jisc_data/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "user", "objectid": 1, + "relateduserid": 1, "eventname": "\\core\\event\\user_created", - "ip": "127.0.0.1" + "ip": "127.0.0.1", + "objecttable": "user", + "timecreated": 1433946701 } diff --git a/tests/core/user_created/send_jisc_data/statements.json b/tests/core/user_created/send_jisc_data/statements.json index 416857ca0..e6123cd90 100644 --- a/tests/core/user_created/send_jisc_data/statements.json +++ b/tests/core/user_created/send_jisc_data/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/registered", @@ -16,40 +16,40 @@ "object": { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_created", - "event_function": "\\src\\transformer\\events\\core\\user_created" - }, - "http://xapi.jisc.ac.uk/sessionId": "test_session_id", - "http://id.tincanapi.com/extension/ip-address": "127.0.0.1", - "http://xapi.jisc.ac.uk/statementCat": "VLE" - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://id.tincanapi.com/extension/ip-address": "127.0.0.1", + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_created", + "event_name": "\\core\\event\\user_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "http://xapi.jisc.ac.uk/sessionId": "test_session_id", + "http://xapi.jisc.ac.uk/statementCat": "VLE" + }, + "language": "en" } } ] diff --git a/tests/core/user_enrolment_created/existing_user_enrolled/event.json b/tests/core/user_enrolment_created/existing_user_enrolled/event.json index f0e9e8ea4..60455090f 100644 --- a/tests/core/user_enrolment_created/existing_user_enrolled/event.json +++ b/tests/core/user_enrolment_created/existing_user_enrolled/event.json @@ -1,11 +1,11 @@ { + "courseid": 2, "id": 1, - "userid": 1, - "relateduserid": 2, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "user_enrolments", "objectid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\core\\event\\user_enrolment_created", - "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}" + "objecttable": "user_enrolments", + "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}", + "timecreated": 1433946701 } diff --git a/tests/core/user_enrolment_created/existing_user_enrolled/statements.json b/tests/core/user_enrolment_created/existing_user_enrolled/statements.json index c5bceb01b..600391d18 100644 --- a/tests/core/user_enrolment_created/existing_user_enrolled/statements.json +++ b/tests/core/user_enrolment_created/existing_user_enrolled/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/enrolled", @@ -14,47 +14,47 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual", - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_enrolment_created", - "event_function": "\\src\\transformer\\events\\core\\user_enrolment_created" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_enrolment_created", + "event_name": "\\core\\event\\user_enrolment_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/event.json b/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/event.json index 6b4d92275..c14e52840 100644 --- a/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/event.json +++ b/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/event.json @@ -1,11 +1,11 @@ { - "courseid": 1, - "eventname": "\\core\\event\\user_enrolment_deleted", + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "user_enrolments", - "timecreated": 1433946701, - "userid": 1, "relateduserid": 2, - "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}" + "userid": 1, + "eventname": "\\core\\event\\user_enrolment_deleted", + "objecttable": "user_enrolments", + "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}", + "timecreated": 1433946701 } diff --git a/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/statements.json b/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/statements.json index 9634f55af..b622c6ad0 100644 --- a/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/statements.json +++ b/tests/core/user_enrolment_deleted/existing_user_enrolment_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "http://activitystrea.ms/leave", @@ -14,47 +14,47 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual", - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_enrolment_deleted", - "event_function": "\\src\\transformer\\events\\core\\user_enrolment_deleted" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_enrolment_deleted", + "event_name": "\\core\\event\\user_enrolment_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/core/user_enrolment_updated/user_resumed_course/event.json b/tests/core/user_enrolment_updated/user_resumed_course/event.json index 710673801..adaf0a751 100644 --- a/tests/core/user_enrolment_updated/user_resumed_course/event.json +++ b/tests/core/user_enrolment_updated/user_resumed_course/event.json @@ -1,11 +1,11 @@ { + "courseid": 2, "id": 1, - "userid": 1, - "relateduserid": 2, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "user_enrolments", "objectid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\core\\event\\user_enrolment_updated", - "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}" + "objecttable": "user_enrolments", + "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}", + "timecreated": 1433946701 } diff --git a/tests/core/user_enrolment_updated/user_resumed_course/statements.json b/tests/core/user_enrolment_updated/user_resumed_course/statements.json index a982ebf9f..1d9da704c 100644 --- a/tests/core/user_enrolment_updated/user_resumed_course/statements.json +++ b/tests/core/user_enrolment_updated/user_resumed_course/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/resumed", @@ -14,47 +14,47 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual", - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_enrolment_updated", - "event_function": "\\src\\transformer\\events\\core\\user_enrolment_updated" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_enrolment_updated", + "event_name": "\\core\\event\\user_enrolment_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/core/user_enrolment_updated/user_suspended_course/event.json b/tests/core/user_enrolment_updated/user_suspended_course/event.json index 710673801..adaf0a751 100644 --- a/tests/core/user_enrolment_updated/user_suspended_course/event.json +++ b/tests/core/user_enrolment_updated/user_suspended_course/event.json @@ -1,11 +1,11 @@ { + "courseid": 2, "id": 1, - "userid": 1, - "relateduserid": 2, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "user_enrolments", "objectid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\core\\event\\user_enrolment_updated", - "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}" + "objecttable": "user_enrolments", + "other": "a:1:{s:5:\"enrol\";s:6:\"manual\";}", + "timecreated": 1433946701 } diff --git a/tests/core/user_enrolment_updated/user_suspended_course/statements.json b/tests/core/user_enrolment_updated/user_suspended_course/statements.json index c315e5cf0..cecce8493 100644 --- a/tests/core/user_enrolment_updated/user_suspended_course/statements.json +++ b/tests/core/user_enrolment_updated/user_suspended_course/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/suspended", @@ -14,47 +14,47 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual", - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_enrolment_updated", - "event_function": "\\src\\transformer\\events\\core\\user_enrolment_updated" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_enrolment_updated", + "event_name": "\\core\\event\\user_enrolment_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://xapi.edlm/profiles/edlm-lms/concepts/context-extensions/enrolment-type": "manual" + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/core/user_loggedin/existing_user_loggedin/event.json b/tests/core/user_loggedin/existing_user_loggedin/event.json index c534c0b39..64731b18f 100644 --- a/tests/core/user_loggedin/existing_user_loggedin/event.json +++ b/tests/core/user_loggedin/existing_user_loggedin/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "userid": 1, + "objectid": 1, "relateduserid": null, - "courseid": 1, - "timecreated": 1433946701, + "userid": 1, + "eventname": "\\core\\event\\user_loggedin", "objecttable": "course", - "objectid": 1, - "eventname": "\\core\\event\\user_loggedin" + "timecreated": 1433946701 } diff --git a/tests/core/user_loggedin/existing_user_loggedin/statements.json b/tests/core/user_loggedin/existing_user_loggedin/statements.json index 8976449d9..6bee27375 100644 --- a/tests/core/user_loggedin/existing_user_loggedin/statements.json +++ b/tests/core/user_loggedin/existing_user_loggedin/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/login", @@ -16,23 +16,23 @@ "object": { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" }, "context": { - "language": "en", "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\user_loggedin", "event_name": "\\core\\event\\user_loggedin", - "event_function": "\\src\\transformer\\events\\core\\user_loggedin" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "language": "en" } } ] diff --git a/tests/core/user_loggedinas/existing_user_loggedinas/event.json b/tests/core/user_loggedinas/existing_user_loggedinas/event.json index 4c845dd61..8b28bec13 100644 --- a/tests/core/user_loggedinas/existing_user_loggedinas/event.json +++ b/tests/core/user_loggedinas/existing_user_loggedinas/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "userid": 1, + "objectid": 1, "relateduserid": 2, - "courseid": 1, - "timecreated": 1433946701, + "userid": 1, + "eventname": "\\core\\event\\user_loggedinas", "objecttable": "user", - "objectid": 1, - "eventname": "\\core\\event\\user_loggedinas" + "timecreated": 1433946701 } diff --git a/tests/core/user_loggedinas/existing_user_loggedinas/statements.json b/tests/core/user_loggedinas/existing_user_loggedinas/statements.json index 9b4ac83cc..611fde06e 100644 --- a/tests/core/user_loggedinas/existing_user_loggedinas/statements.json +++ b/tests/core/user_loggedinas/existing_user_loggedinas/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/login", @@ -16,30 +16,30 @@ "object": { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" }, "context": { - "language": "en", "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\core\\user_loggedin", + "event_name": "\\core\\event\\user_loggedinas", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/as": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } - }, - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core\\event\\user_loggedinas", - "event_function": "\\src\\transformer\\events\\core\\user_loggedin" + }, + "name": "test_fullname2" } - } + }, + "language": "en" } } ] diff --git a/tests/core/user_loggedout/existing_user_loggedout/event.json b/tests/core/user_loggedout/existing_user_loggedout/event.json index 36b34b41a..96f2b5fa7 100644 --- a/tests/core/user_loggedout/existing_user_loggedout/event.json +++ b/tests/core/user_loggedout/existing_user_loggedout/event.json @@ -1,9 +1,9 @@ { + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\core\\event\\user_loggedout", "objecttable": "course", - "objectid": 1, - "eventname": "\\core\\event\\user_loggedout" + "timecreated": 1433946701 } diff --git a/tests/core/user_loggedout/existing_user_loggedout/statements.json b/tests/core/user_loggedout/existing_user_loggedout/statements.json index 2ec5c0ca0..c870c60a8 100644 --- a/tests/core/user_loggedout/existing_user_loggedout/statements.json +++ b/tests/core/user_loggedout/existing_user_loggedout/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/logout", @@ -16,23 +16,23 @@ "object": { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" }, "context": { - "language": "en", "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\core\\user_loggedout", "event_name": "\\core\\event\\user_loggedout", - "event_function": "\\src\\transformer\\events\\core\\user_loggedout" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "language": "en" } } ] diff --git a/tests/core_h5p/course_module_viewed/data.json b/tests/core_h5p/course_module_viewed/data.json index d68be86e6..586adad33 100644 --- a/tests/core_h5p/course_module_viewed/data.json +++ b/tests/core_h5p/course_module_viewed/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "h5pactivity": [ { "id": 1, - "name": "h5pactivity" + "name": "test_name" } ], - "h5pactivity": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "h5pactivity" } ] } diff --git a/tests/core_h5p/course_module_viewed/event.json b/tests/core_h5p/course_module_viewed/event.json index b3b0172fb..6f9f8e44f 100644 --- a/tests/core_h5p/course_module_viewed/event.json +++ b/tests/core_h5p/course_module_viewed/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\core_h5p\\event\\h5p_viewed" + "eventname": "\\core_h5p\\event\\h5p_viewed", + "timecreated": 1433946701 } diff --git a/tests/core_h5p/course_module_viewed/statements.json b/tests/core_h5p/course_module_viewed/statements.json index c19e4c4f7..53e6bbd2d 100644 --- a/tests/core_h5p/course_module_viewed/statements.json +++ b/tests/core_h5p/course_module_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/h5pactivity/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/media", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/media" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\core_h5p\\event\\h5p_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\core_h5p\\event\\h5p_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/data.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/data.json index 792f10383..9bc612ee4 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/data.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/data.json @@ -1,46 +1,34 @@ { - "user": [ - { - "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" - }, - { - "id": 2, - "firstname": "test2_fullname", - "email": "test2@test.com" - } - ], "assign": [ { "id": 1, "name": "test_name" } ], - "grade": [ + "assignfeedback_comments": [ { "id": 1, - "userid": 2, "assignment": 1, + "commenttext": "test_comment_text", "grade": 1 } ], - "assignfeedback_comments": [ + "grade": [ { "id": 1, + "userid": 2, "assignment": 1, - "grade": 1, - "commenttext": "test_comment_text" + "grade": 1 } ], "grade_items": [ { "id": 1, - "itemmodule": "assign", - "iteminstance": 1, - "grademin": 0, "grademax": 2, - "gradepass": 1 + "grademin": 0, + "gradepass": 1, + "iteminstance": 1, + "itemmodule": "assign" } ], "modules": [ @@ -48,5 +36,17 @@ "id": 1, "name": "assign" } + ], + "user": [ + { + "id": 1, + "firstname": "test_fullname", + "email": "test@test.com" + }, + { + "id": 2, + "firstname": "test2_fullname", + "email": "test2@test.com" + } ] } diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/event.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/event.json index 490ae6308..796142c50 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/event.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_assign\\event\\submission_graded", "objecttable": "grade", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_assign\\event\\submission_graded" + "timecreated": 1433946701 } diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/statements.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/statements.json index d80afd47a..167da1b65 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/statements.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test2_fullname", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test2_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/scored", @@ -15,87 +15,87 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } - }, - "result": { - "score": { - "raw": 1.0, - "min": 0.0, - "max": 2.0, - "scaled": 0.0 + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" }, - "success": true, - "response": "test_comment_text" + "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\submission_graded", - "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_graded" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_graded", + "event_name": "\\mod_assign\\event\\submission_graded", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname" + }, + "language": "en" + }, + "result": { + "response": "test_comment_text", + "score": { + "max": 2.0, + "min": 0.0, + "raw": 1.0, + "scaled": 0.0 + }, + "success": true } } ] diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/data.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/data.json index 64de30ccb..d6c898277 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/data.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/data.json @@ -1,22 +1,11 @@ { - "user": [ - { - "id": 1, - "firstname": "test_fullname", - "email": "test@test.com" - }, - { - "id": 2, - "firstname": "test2_fullname", - "email": "test2@test.com" - } - ], "assign": [ { "id": 1, "name": "test_name" } ], + "assignfeedback_comments": [], "grade": [ { "id": 1, @@ -25,15 +14,14 @@ "grade": 1 } ], - "assignfeedback_comments": [], "grade_items": [ { "id": 1, - "itemmodule": "assign", - "iteminstance": 1, - "grademin": 0, "grademax": 2, - "gradepass": 1 + "grademin": 0, + "gradepass": 1, + "iteminstance": 1, + "itemmodule": "assign" } ], "modules": [ @@ -41,5 +29,17 @@ "id": 1, "name": "assign" } + ], + "user": [ + { + "id": 1, + "firstname": "test_fullname", + "email": "test@test.com" + }, + { + "id": 2, + "firstname": "test2_fullname", + "email": "test2@test.com" + } ] } diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/event.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/event.json index 490ae6308..796142c50 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/event.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_assign\\event\\submission_graded", "objecttable": "grade", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_assign\\event\\submission_graded" + "timecreated": 1433946701 } diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/statements.json b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/statements.json index e0dd6c392..4de786634 100644 --- a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/statements.json +++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test2_fullname", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test2_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/scored", @@ -15,86 +15,86 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } - }, - "result": { - "score": { - "raw": 1.0, - "min": 0.0, - "max": 2.0, - "scaled": 0.0 + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" }, - "success": true + "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\submission_graded", - "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_graded" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_graded", + "event_name": "\\mod_assign\\event\\submission_graded", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname" + }, + "language": "en" + }, + "result": { + "score": { + "max": 2.0, + "min": 0.0, + "raw": 1.0, + "scaled": 0.0 + }, + "success": true } } ] diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json index cd911388d..3edbed4fe 100644 --- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json +++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/data.json @@ -1,14 +1,14 @@ { - "assign_submission": [ + "assign": [ { "id": 1, - "assignment": 1 + "name": "test_name" } ], - "assign": [ + "assign_submission": [ { "id": 1, - "name": "test_name" + "assignment": 1 } ], "modules": [ diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json index 95b4f8c37..1d3272f19 100644 --- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json +++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_assign\\event\\assessable_submitted", "objecttable": "assignment_submissions", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_assign\\event\\assessable_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json index 9555bb673..c62b64b71 100644 --- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json +++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -15,70 +15,70 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" + }, + "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\assessable_submitted", - "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_submitted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\assignment_submitted", + "event_name": "\\mod_assign\\event\\assessable_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_assign/course_module_viewed/existing_module/data.json b/tests/mod_assign/course_module_viewed/existing_module/data.json index 92a47ecc5..8fc74245a 100644 --- a/tests/mod_assign/course_module_viewed/existing_module/data.json +++ b/tests/mod_assign/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "assign": [ { "id": 1, - "name": "assign" + "name": "test_name" } ], - "assign": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "assign" } ] } diff --git a/tests/mod_assign/course_module_viewed/existing_module/event.json b/tests/mod_assign/course_module_viewed/existing_module/event.json index b0dd18e3f..0e7b877b3 100644 --- a/tests/mod_assign/course_module_viewed/existing_module/event.json +++ b/tests/mod_assign/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_assign\\event\\course_module_viewed" + "eventname": "\\mod_assign\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_assign/course_module_viewed/existing_module/statements.json b/tests/mod_assign/course_module_viewed/existing_module/statements.json index 0194c9cf1..96efabad3 100644 --- a/tests/mod_assign/course_module_viewed/existing_module/statements.json +++ b/tests/mod_assign/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_assign\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_assign/feedback_viewed/user_viewed_feedback/data.json b/tests/mod_assign/feedback_viewed/user_viewed_feedback/data.json index 41a8a5985..7166e0342 100644 --- a/tests/mod_assign/feedback_viewed/user_viewed_feedback/data.json +++ b/tests/mod_assign/feedback_viewed/user_viewed_feedback/data.json @@ -1,20 +1,14 @@ { - "assign_grades": [ + "assign": [ { "id": 1, - "grader": 2 + "name": "test_name" } ], - "user": [ + "assign_grades": [ { "id": 1, - "firstname": "test_fullname1", - "email": "test1@test.com" - }, - { - "id": 2, - "firstname": "test_fullname2", - "email": "test2@test.com" + "grader": 2 } ], "modules": [ @@ -23,10 +17,16 @@ "name": "assign" } ], - "assign": [ + "user": [ { "id": 1, - "name": "test_name" + "firstname": "test_fullname1", + "email": "test1@test.com" + }, + { + "id": 2, + "firstname": "test_fullname2", + "email": "test2@test.com" } ] } diff --git a/tests/mod_assign/feedback_viewed/user_viewed_feedback/event.json b/tests/mod_assign/feedback_viewed/user_viewed_feedback/event.json index 24905420d..288c9dd12 100644 --- a/tests/mod_assign/feedback_viewed/user_viewed_feedback/event.json +++ b/tests/mod_assign/feedback_viewed/user_viewed_feedback/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, - "eventname": "\\mod_assign\\event\\feedback_viewed", + "contextinstanceid": 1, + "courseid": 2, "id": 1, "objectid": 1, - "objecttable": "assign_grades", - "timecreated": 1433946701, "userid": 1, - "contextinstanceid": 1 + "eventname": "\\mod_assign\\event\\feedback_viewed", + "objecttable": "assign_grades", + "timecreated": 1433946701 } diff --git a/tests/mod_assign/feedback_viewed/user_viewed_feedback/statements.json b/tests/mod_assign/feedback_viewed/user_viewed_feedback/statements.json index b66ea1fce..5a6c712d5 100644 --- a/tests/mod_assign/feedback_viewed/user_viewed_feedback/statements.json +++ b/tests/mod_assign/feedback_viewed/user_viewed_feedback/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -15,63 +15,56 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#feedback", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_name Feedback" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" + }, + "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_fullname2", - "account": { - "homePage": "http://www.example.org", - "name": "2" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -85,6 +78,13 @@ "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "2" + }, + "name": "test_fullname2" + }, "language": "en" } } diff --git a/tests/mod_assign/submission_locked/data.json b/tests/mod_assign/submission_locked/data.json index b9dd218b4..28115c02f 100644 --- a/tests/mod_assign/submission_locked/data.json +++ b/tests/mod_assign/submission_locked/data.json @@ -1,14 +1,14 @@ { - "assign_submission": [ + "assign": [ { "id": 1, - "assignment": 1 + "name": "test_name" } ], - "assign": [ + "assign_submission": [ { "id": 1, - "name": "test_name" + "assignment": 1 } ], "modules": [ diff --git a/tests/mod_assign/submission_locked/event.json b/tests/mod_assign/submission_locked/event.json index 93198d51b..18dac8800 100644 --- a/tests/mod_assign/submission_locked/event.json +++ b/tests/mod_assign/submission_locked/event.json @@ -1,12 +1,12 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "assign", "objectid": 1, - "contextinstanceid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\mod_assign\\event\\submission_locked", "action": "locked", - "relateduserid": 2 + "objecttable": "assign", + "timecreated": 1433946701 } diff --git a/tests/mod_assign/submission_locked/statements.json b/tests/mod_assign/submission_locked/statements.json index b620dc886..7d2cba7f6 100644 --- a/tests/mod_assign/submission_locked/statements.json +++ b/tests/mod_assign/submission_locked/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/locked", @@ -15,77 +15,77 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } - }, - "context": { - "language": "en", - "extensions": { - "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { - "name": "test_fullname2", - "account": { - "homePage": "http://www.example.org", - "name": "2" - } }, - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\submission_locked", - "event_function": "\\src\\transformer\\events\\mod_assign\\submission_locked" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" }, + "objectType": "Activity" + }, + "context": { "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\submission_locked", + "event_name": "\\mod_assign\\event\\submission_locked", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { + "account": { + "homePage": "http://www.example.org", + "name": "2" + }, + "name": "test_fullname2" + } + }, + "language": "en" } } ] diff --git a/tests/mod_assign/submission_unlocked/data.json b/tests/mod_assign/submission_unlocked/data.json index b9dd218b4..28115c02f 100644 --- a/tests/mod_assign/submission_unlocked/data.json +++ b/tests/mod_assign/submission_unlocked/data.json @@ -1,14 +1,14 @@ { - "assign_submission": [ + "assign": [ { "id": 1, - "assignment": 1 + "name": "test_name" } ], - "assign": [ + "assign_submission": [ { "id": 1, - "name": "test_name" + "assignment": 1 } ], "modules": [ diff --git a/tests/mod_assign/submission_unlocked/event.json b/tests/mod_assign/submission_unlocked/event.json index 3d48c680b..47ec8487b 100644 --- a/tests/mod_assign/submission_unlocked/event.json +++ b/tests/mod_assign/submission_unlocked/event.json @@ -1,12 +1,12 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "assign", "objectid": 1, - "contextinstanceid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\mod_assign\\event\\submission_unlocked", "action": "unlocked", - "relateduserid": 2 + "objecttable": "assign", + "timecreated": 1433946701 } diff --git a/tests/mod_assign/submission_unlocked/statements.json b/tests/mod_assign/submission_unlocked/statements.json index 2033546e2..adb939c5f 100644 --- a/tests/mod_assign/submission_unlocked/statements.json +++ b/tests/mod_assign/submission_unlocked/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/unlocked", @@ -15,77 +15,77 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } - }, - "context": { - "language": "en", - "extensions": { - "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { - "name": "test_fullname2", - "account": { - "homePage": "http://www.example.org", - "name": "2" - } }, - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\submission_unlocked", - "event_function": "\\src\\transformer\\events\\mod_assign\\submission_locked" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" }, + "objectType": "Activity" + }, + "context": { "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\submission_locked", + "event_name": "\\mod_assign\\event\\submission_unlocked", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { + "account": { + "homePage": "http://www.example.org", + "name": "2" + }, + "name": "test_fullname2" + } + }, + "language": "en" } } ] diff --git a/tests/mod_assign/submission_viewed/data.json b/tests/mod_assign/submission_viewed/data.json index b9dd218b4..28115c02f 100644 --- a/tests/mod_assign/submission_viewed/data.json +++ b/tests/mod_assign/submission_viewed/data.json @@ -1,14 +1,14 @@ { - "assign_submission": [ + "assign": [ { "id": 1, - "assignment": 1 + "name": "test_name" } ], - "assign": [ + "assign_submission": [ { "id": 1, - "name": "test_name" + "assignment": 1 } ], "modules": [ diff --git a/tests/mod_assign/submission_viewed/event.json b/tests/mod_assign/submission_viewed/event.json index b32faec61..43181bcab 100644 --- a/tests/mod_assign/submission_viewed/event.json +++ b/tests/mod_assign/submission_viewed/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "assign", "objectid": 1, - "contextinstanceid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\mod_assign\\event\\submission_viewed", - "relateduserid": 2 + "objecttable": "assign", + "timecreated": 1433946701 } diff --git a/tests/mod_assign/submission_viewed/statements.json b/tests/mod_assign/submission_viewed/statements.json index 1e58a1cb2..4bbebe2af 100644 --- a/tests/mod_assign/submission_viewed/statements.json +++ b/tests/mod_assign/submission_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -15,77 +15,77 @@ }, "object": { "id": "http://www.example.org/mod/assign/view.php?id=1#submission", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission", "name": { "en": "test_name Submission" - } - } - }, - "context": { - "language": "en", - "extensions": { - "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { - "name": "test_fullname2", - "account": { - "homePage": "http://www.example.org", - "name": "2" - } }, - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_assign\\event\\submission_viewed", - "event_function": "\\src\\transformer\\events\\mod_assign\\submission_viewed" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/submission" }, + "objectType": "Activity" + }, + "context": { "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/assign/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/assignment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_assign\\submission_viewed", + "event_name": "\\mod_assign\\event\\submission_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { + "account": { + "homePage": "http://www.example.org", + "name": "2" + }, + "name": "test_fullname2" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/activity_management_viewed/data.json b/tests/mod_bigbluebuttonbn/activity_management_viewed/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/activity_management_viewed/data.json +++ b/tests/mod_bigbluebuttonbn/activity_management_viewed/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/activity_management_viewed/event.json b/tests/mod_bigbluebuttonbn/activity_management_viewed/event.json index dd96e039f..57972e8d8 100644 --- a/tests/mod_bigbluebuttonbn/activity_management_viewed/event.json +++ b/tests/mod_bigbluebuttonbn/activity_management_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\activity_management_viewed", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\activity_management_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/activity_management_viewed/statements.json b/tests/mod_bigbluebuttonbn/activity_management_viewed/statements.json index b4e9c6508..74f6f8817 100644 --- a/tests/mod_bigbluebuttonbn/activity_management_viewed/statements.json +++ b/tests/mod_bigbluebuttonbn/activity_management_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\activity_management_viewed", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\activity_management_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\activity_management_viewed", + "event_name": "\\mod_bigbluebuttonbn\\event\\activity_management_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/live_session/data.json b/tests/mod_bigbluebuttonbn/live_session/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/live_session/data.json +++ b/tests/mod_bigbluebuttonbn/live_session/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/live_session/event.json b/tests/mod_bigbluebuttonbn/live_session/event.json index 04641164b..480235824 100644 --- a/tests/mod_bigbluebuttonbn/live_session/event.json +++ b/tests/mod_bigbluebuttonbn/live_session/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\live_session_event", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\live_session_event" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/live_session/statements.json b/tests/mod_bigbluebuttonbn/live_session/statements.json index 2ba0c4384..5abb78fc3 100644 --- a/tests/mod_bigbluebuttonbn/live_session/statements.json +++ b/tests/mod_bigbluebuttonbn/live_session/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/live", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\live_session_event", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\live_session" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\live_session", + "event_name": "\\mod_bigbluebuttonbn\\event\\live_session_event", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/meeting_created/data.json b/tests/mod_bigbluebuttonbn/meeting_created/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/meeting_created/data.json +++ b/tests/mod_bigbluebuttonbn/meeting_created/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/meeting_created/event.json b/tests/mod_bigbluebuttonbn/meeting_created/event.json index 6e181aa6d..3ddfd97fd 100644 --- a/tests/mod_bigbluebuttonbn/meeting_created/event.json +++ b/tests/mod_bigbluebuttonbn/meeting_created/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_created", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_created" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/meeting_created/statements.json b/tests/mod_bigbluebuttonbn/meeting_created/statements.json index cfce61bfd..bbe4bab04 100644 --- a/tests/mod_bigbluebuttonbn/meeting_created/statements.json +++ b/tests/mod_bigbluebuttonbn/meeting_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/create", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_created", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_created", + "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/meeting_ended/data.json b/tests/mod_bigbluebuttonbn/meeting_ended/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/meeting_ended/data.json +++ b/tests/mod_bigbluebuttonbn/meeting_ended/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/meeting_ended/event.json b/tests/mod_bigbluebuttonbn/meeting_ended/event.json index aa629120f..0d4795786 100644 --- a/tests/mod_bigbluebuttonbn/meeting_ended/event.json +++ b/tests/mod_bigbluebuttonbn/meeting_ended/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_ended", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_ended" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/meeting_ended/statements.json b/tests/mod_bigbluebuttonbn/meeting_ended/statements.json index 0e777e304..53068b4d4 100644 --- a/tests/mod_bigbluebuttonbn/meeting_ended/statements.json +++ b/tests/mod_bigbluebuttonbn/meeting_ended/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/adjourned", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_ended", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_ended" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_ended", + "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_ended", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/meeting_joined/data.json b/tests/mod_bigbluebuttonbn/meeting_joined/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/meeting_joined/data.json +++ b/tests/mod_bigbluebuttonbn/meeting_joined/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/meeting_joined/event.json b/tests/mod_bigbluebuttonbn/meeting_joined/event.json index a9b71d966..e65d3acfc 100644 --- a/tests/mod_bigbluebuttonbn/meeting_joined/event.json +++ b/tests/mod_bigbluebuttonbn/meeting_joined/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_joined", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_joined" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/meeting_joined/statements.json b/tests/mod_bigbluebuttonbn/meeting_joined/statements.json index 53f30ad00..ad6eb6038 100644 --- a/tests/mod_bigbluebuttonbn/meeting_joined/statements.json +++ b/tests/mod_bigbluebuttonbn/meeting_joined/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/join", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_joined", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_joined" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_joined", + "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_joined", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/meeting_left/data.json b/tests/mod_bigbluebuttonbn/meeting_left/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/meeting_left/data.json +++ b/tests/mod_bigbluebuttonbn/meeting_left/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/meeting_left/event.json b/tests/mod_bigbluebuttonbn/meeting_left/event.json index c34b8a26b..9fcad42f2 100644 --- a/tests/mod_bigbluebuttonbn/meeting_left/event.json +++ b/tests/mod_bigbluebuttonbn/meeting_left/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_left", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\meeting_left" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/meeting_left/statements.json b/tests/mod_bigbluebuttonbn/meeting_left/statements.json index e9bc8c707..c8c9480d6 100644 --- a/tests/mod_bigbluebuttonbn/meeting_left/statements.json +++ b/tests/mod_bigbluebuttonbn/meeting_left/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/leave", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_left", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_left" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\meeting_left", + "event_name": "\\mod_bigbluebuttonbn\\event\\meeting_left", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_deleted/data.json b/tests/mod_bigbluebuttonbn/recording_deleted/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_deleted/data.json +++ b/tests/mod_bigbluebuttonbn/recording_deleted/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_deleted/event.json b/tests/mod_bigbluebuttonbn/recording_deleted/event.json index 5444ed237..935b5f031 100644 --- a/tests/mod_bigbluebuttonbn/recording_deleted/event.json +++ b/tests/mod_bigbluebuttonbn/recording_deleted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_deleted", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_deleted" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_deleted/statements.json b/tests/mod_bigbluebuttonbn/recording_deleted/statements.json index c520e242a..b763e3166 100644 --- a/tests/mod_bigbluebuttonbn/recording_deleted/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/dod-isd/verbs/deleted", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_deleted", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_deleted", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_edited/data.json b/tests/mod_bigbluebuttonbn/recording_edited/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_edited/data.json +++ b/tests/mod_bigbluebuttonbn/recording_edited/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_edited/event.json b/tests/mod_bigbluebuttonbn/recording_edited/event.json index 5444ed237..935b5f031 100644 --- a/tests/mod_bigbluebuttonbn/recording_edited/event.json +++ b/tests/mod_bigbluebuttonbn/recording_edited/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_deleted", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_deleted" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_edited/statements.json b/tests/mod_bigbluebuttonbn/recording_edited/statements.json index c520e242a..b763e3166 100644 --- a/tests/mod_bigbluebuttonbn/recording_edited/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_edited/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/dod-isd/verbs/deleted", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_deleted", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_deleted", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_imported/data.json b/tests/mod_bigbluebuttonbn/recording_imported/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_imported/data.json +++ b/tests/mod_bigbluebuttonbn/recording_imported/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_imported/event.json b/tests/mod_bigbluebuttonbn/recording_imported/event.json index 2d79b9501..9b8fb14fb 100644 --- a/tests/mod_bigbluebuttonbn/recording_imported/event.json +++ b/tests/mod_bigbluebuttonbn/recording_imported/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_imported", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_imported" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_imported/statements.json b/tests/mod_bigbluebuttonbn/recording_imported/statements.json index c3793bea6..b36959d59 100644 --- a/tests/mod_bigbluebuttonbn/recording_imported/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_imported/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/imported", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_imported", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_imported" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_imported", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_imported", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_protected/data.json b/tests/mod_bigbluebuttonbn/recording_protected/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_protected/data.json +++ b/tests/mod_bigbluebuttonbn/recording_protected/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_protected/event.json b/tests/mod_bigbluebuttonbn/recording_protected/event.json index 40b8acaf9..e4bca90bb 100644 --- a/tests/mod_bigbluebuttonbn/recording_protected/event.json +++ b/tests/mod_bigbluebuttonbn/recording_protected/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_protected", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_protected" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_protected/statements.json b/tests/mod_bigbluebuttonbn/recording_protected/statements.json index 3c9bfbfc1..e5625ed94 100644 --- a/tests/mod_bigbluebuttonbn/recording_protected/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_protected/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/secured", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_protected", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_protected" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_protected", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_protected", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_published/data.json b/tests/mod_bigbluebuttonbn/recording_published/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_published/data.json +++ b/tests/mod_bigbluebuttonbn/recording_published/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_published/event.json b/tests/mod_bigbluebuttonbn/recording_published/event.json index 1bd031bbd..1634a44dc 100644 --- a/tests/mod_bigbluebuttonbn/recording_published/event.json +++ b/tests/mod_bigbluebuttonbn/recording_published/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_published", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_published" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_published/statements.json b/tests/mod_bigbluebuttonbn/recording_published/statements.json index 691328d63..32b3fe11f 100644 --- a/tests/mod_bigbluebuttonbn/recording_published/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_published/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/dod-isd/verbs/published", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_published", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_published" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_published", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_published", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_unprotected/data.json b/tests/mod_bigbluebuttonbn/recording_unprotected/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_unprotected/data.json +++ b/tests/mod_bigbluebuttonbn/recording_unprotected/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_unprotected/event.json b/tests/mod_bigbluebuttonbn/recording_unprotected/event.json index 83cd51474..efba7e5c9 100644 --- a/tests/mod_bigbluebuttonbn/recording_unprotected/event.json +++ b/tests/mod_bigbluebuttonbn/recording_unprotected/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_unprotected", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_unprotected" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_unprotected/statements.json b/tests/mod_bigbluebuttonbn/recording_unprotected/statements.json index af740043d..425cb43f4 100644 --- a/tests/mod_bigbluebuttonbn/recording_unprotected/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_unprotected/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/unsecured", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_unprotected", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_unprotected" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_unprotected", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_unprotected", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_unpublished/data.json b/tests/mod_bigbluebuttonbn/recording_unpublished/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_unpublished/data.json +++ b/tests/mod_bigbluebuttonbn/recording_unpublished/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_unpublished/event.json b/tests/mod_bigbluebuttonbn/recording_unpublished/event.json index f065b60b8..2b5f8422f 100644 --- a/tests/mod_bigbluebuttonbn/recording_unpublished/event.json +++ b/tests/mod_bigbluebuttonbn/recording_unpublished/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_unpublished", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_unpublished" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_unpublished/statements.json b/tests/mod_bigbluebuttonbn/recording_unpublished/statements.json index 97c500209..eb987749c 100644 --- a/tests/mod_bigbluebuttonbn/recording_unpublished/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_unpublished/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/retract", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_unpublished", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_unpublished" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_unpublished", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_unpublished", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_bigbluebuttonbn/recording_viewed/data.json b/tests/mod_bigbluebuttonbn/recording_viewed/data.json index ad97bc94c..3c5c87afa 100644 --- a/tests/mod_bigbluebuttonbn/recording_viewed/data.json +++ b/tests/mod_bigbluebuttonbn/recording_viewed/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "bigbluebuttonbn": [ { "id": 1, - "name": "bigbluebuttonbn" + "name": "test_bigbluebuttonbn_name" } ], - "bigbluebuttonbn": [ + "modules": [ { "id": 1, - "name": "test_bigbluebuttonbn_name" + "name": "bigbluebuttonbn" } ] } diff --git a/tests/mod_bigbluebuttonbn/recording_viewed/event.json b/tests/mod_bigbluebuttonbn/recording_viewed/event.json index a8315a719..9f0e1aa5f 100644 --- a/tests/mod_bigbluebuttonbn/recording_viewed/event.json +++ b/tests/mod_bigbluebuttonbn/recording_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_bigbluebuttonbn\\event\\recording_viewed", "objecttable": "bigbluebuttonbn", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_bigbluebuttonbn\\event\\recording_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_bigbluebuttonbn/recording_viewed/statements.json b/tests/mod_bigbluebuttonbn/recording_viewed/statements.json index e28982f4a..7a091cb8e 100644 --- a/tests/mod_bigbluebuttonbn/recording_viewed/statements.json +++ b/tests/mod_bigbluebuttonbn/recording_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/bigbluebuttonbn/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/meeting", "name": { "en": "test_bigbluebuttonbn_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/meeting" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_bigbluebuttonbn\\event\\recording_viewed", - "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_bigbluebuttonbn\\recording_viewed", + "event_name": "\\mod_bigbluebuttonbn\\event\\recording_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_book/chapter_created/data.json b/tests/mod_book/chapter_created/data.json index ce17a3c3e..046e4ff7b 100644 --- a/tests/mod_book/chapter_created/data.json +++ b/tests/mod_book/chapter_created/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "book" - } - ], "book": [ { "id": 1, @@ -13,12 +7,18 @@ ], "book_chapters": [ { - "id": 1, "bookid": "1", + "id": 1, + "content": "

test_book_chapter_content

", "pagenum": "1", "subchapter": "0", - "title": "test_book_chapter_title", - "content": "

test_book_chapter_content

" + "title": "test_book_chapter_title" + } + ], + "modules": [ + { + "id": 1, + "name": "book" } ] } diff --git a/tests/mod_book/chapter_created/event.json b/tests/mod_book/chapter_created/event.json index b325e4e82..64d3ce76d 100644 --- a/tests/mod_book/chapter_created/event.json +++ b/tests/mod_book/chapter_created/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, "contextinstanceid": 1, - "eventname": "\\mod_book\\event\\chapter_created", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\mod_book\\event\\chapter_created", "objecttable": "book_chapters", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/mod_book/chapter_created/statements.json b/tests/mod_book/chapter_created/statements.json index e15edde97..617d21dee 100644 --- a/tests/mod_book/chapter_created/statements.json +++ b/tests/mod_book/chapter_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/create", @@ -16,13 +16,13 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1&chapterid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/chapter", + "description": { + "en": "test_book_chapter_content" + }, "name": { "en": "test_book_chapter_title" }, - "description": { - "en": "test_book_chapter_content" - } + "type": "http://id.tincanapi.com/activitytype/chapter" }, "objectType": "Activity" }, @@ -30,13 +30,13 @@ "contextActivities": { "category": [ { + "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, - "id": "http://www.example.org", "objectType": "Activity" } ], @@ -44,30 +44,30 @@ { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } + }, + "objectType": "Activity" }, { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/data.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/data.json index ceaa5fc7a..7134a5429 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/data.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "book" - } - ], "book": [ { "id": 1, @@ -13,20 +7,26 @@ ], "book_chapters": [ { - "id": 1, "bookid": 1, + "id": 1, + "content": "

test_parent_content

", "pagenum": 1, "subchapter": 0, - "title": "test_parent_name", - "content": "

test_parent_content

" + "title": "test_parent_name" }, { - "id": 2, "bookid": 1, + "id": 2, + "content": "

test_book_chapter_content

", "pagenum": 2, "subchapter": 1, - "title": "test_book_chapter_title", - "content": "

test_book_chapter_content

" + "title": "test_book_chapter_title" + } + ], + "modules": [ + { + "id": 1, + "name": "book" } ] } diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/event.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/event.json index 99d591432..c88eb6fe7 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/event.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 2, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_book\\event\\chapter_viewed", "objecttable": "book_chapters", - "objectid": 2, - "contextinstanceid": 1, - "eventname": "\\mod_book\\event\\chapter_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/statements.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/statements.json index e0e8872b1..d56e5c0cf 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/statements.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,85 +16,85 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1&chapterid=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/chapter", + "description": { + "en": "test_book_chapter_content" + }, "name": { "en": "test_book_chapter_title" }, - "description": { - "en": "test_book_chapter_content" - } + "type": "http://id.tincanapi.com/activitytype/chapter" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_book\\event\\chapter_viewed", - "event_function": "\\src\\transformer\\events\\mod_book\\chapter_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/book/view.php?id=1&chapterid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/chapter", + "description": { + "en": "test_parent_content" + }, "name": { "en": "test_parent_name" }, - "description": { - "en": "test_parent_content" - } + "type": "http://id.tincanapi.com/activitytype/chapter" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_book_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_book\\chapter_viewed", + "event_name": "\\mod_book\\event\\chapter_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/data.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/data.json index 8fd012ba3..be2e4ee6d 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/data.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "book" - } - ], "book": [ { "id": 1, @@ -13,12 +7,18 @@ ], "book_chapters": [ { - "id": 1, "bookid": "1", + "id": 1, + "content": "

test_book_chapter_content

", "pagenum": "1", "subchapter": "0", - "title": "test_book_chapter_title", - "content": "

test_book_chapter_content

" + "title": "test_book_chapter_title" + } + ], + "modules": [ + { + "id": 1, + "name": "book" } ] } diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/event.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/event.json index dd1e42e40..d2436d94b 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/event.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_book\\event\\chapter_viewed", "objecttable": "book_chapters", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_book\\event\\chapter_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/statements.json b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/statements.json index 32f84ef17..f4de8aa46 100644 --- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/statements.json +++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,72 +16,72 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1&chapterid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/chapter", + "description": { + "en": "test_book_chapter_content" + }, "name": { "en": "test_book_chapter_title" }, - "description": { - "en": "test_book_chapter_content" - } + "type": "http://id.tincanapi.com/activitytype/chapter" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_book\\event\\chapter_viewed", - "event_function": "\\src\\transformer\\events\\mod_book\\chapter_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_book_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_book\\chapter_viewed", + "event_name": "\\mod_book\\event\\chapter_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_book/course_module_viewed/existing_module/data.json b/tests/mod_book/course_module_viewed/existing_module/data.json index b0a4b39c1..847c76f86 100644 --- a/tests/mod_book/course_module_viewed/existing_module/data.json +++ b/tests/mod_book/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "book": [ { "id": 1, - "name": "book" + "name": "test_name" } ], - "book": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "book" } ] } diff --git a/tests/mod_book/course_module_viewed/existing_module/event.json b/tests/mod_book/course_module_viewed/existing_module/event.json index 37b282b60..387061150 100644 --- a/tests/mod_book/course_module_viewed/existing_module/event.json +++ b/tests/mod_book/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_book\\event\\course_module_viewed" + "eventname": "\\mod_book\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_book/course_module_viewed/existing_module/statements.json b/tests/mod_book/course_module_viewed/existing_module/statements.json index 6272d7c87..60f386b4b 100644 --- a/tests/mod_book/course_module_viewed/existing_module/statements.json +++ b/tests/mod_book/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/book/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/book", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/book" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_book\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_book\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_chat/course_module_viewed/existing_module/data.json b/tests/mod_chat/course_module_viewed/existing_module/data.json index 1fdb6b1c0..d7aee7980 100644 --- a/tests/mod_chat/course_module_viewed/existing_module/data.json +++ b/tests/mod_chat/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "chat": [ { "id": 1, - "name": "chat" + "name": "test_name" } ], - "chat": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "chat" } ] } diff --git a/tests/mod_chat/course_module_viewed/existing_module/event.json b/tests/mod_chat/course_module_viewed/existing_module/event.json index 486aa04e2..21fe64aed 100644 --- a/tests/mod_chat/course_module_viewed/existing_module/event.json +++ b/tests/mod_chat/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_chat\\event\\course_module_viewed" + "eventname": "\\mod_chat\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_chat/course_module_viewed/existing_module/statements.json b/tests/mod_chat/course_module_viewed/existing_module/statements.json index 5192d2698..40f921d73 100644 --- a/tests/mod_chat/course_module_viewed/existing_module/statements.json +++ b/tests/mod_chat/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/chat/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/chat-channel", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/chat-channel" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_chat\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_chat\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_choice/answer_created/data.json b/tests/mod_choice/answer_created/data.json index 71d43c049..9baaa0eca 100644 --- a/tests/mod_choice/answer_created/data.json +++ b/tests/mod_choice/answer_created/data.json @@ -1,34 +1,34 @@ { - "modules": [ + "choice": [ { "id": 1, - "name": "choice" + "name": "To be or not to be?", + "intro": "

That is the question.

" } ], - "choice": [ + "choice_answers": [ { + "choiceid": 1, "id": 1, - "name": "To be or not to be?", - "intro": "

That is the question.

" + "optionid": 1 } ], "choice_options": [ { - "id": 2, "choiceid": 1, + "id": 2, "text": "Not to be" }, { - "id": 1, "choiceid": 1, + "id": 1, "text": "To be" } ], - "choice_answers": [ + "modules": [ { "id": 1, - "choiceid": 1, - "optionid": 1 + "name": "choice" } ] } diff --git a/tests/mod_choice/answer_created/event.json b/tests/mod_choice/answer_created/event.json index 1e24970d0..fbe7dea65 100644 --- a/tests/mod_choice/answer_created/event.json +++ b/tests/mod_choice/answer_created/event.json @@ -1,10 +1,10 @@ { - "courseid": 1, "contextinstanceid": 1, - "eventname": "\\mod_choice\\event\\answer_created", + "courseid": 2, "id": 1, "objectid": 1, + "userid": 1, + "eventname": "\\mod_choice\\event\\answer_created", "objecttable": "choice_answers", - "timecreated": 1433946701, - "userid": 1 + "timecreated": 1433946701 } diff --git a/tests/mod_choice/answer_created/statements.json b/tests/mod_choice/answer_created/statements.json index 04a5c0285..2f45bcab1 100644 --- a/tests/mod_choice/answer_created/statements.json +++ b/tests/mod_choice/answer_created/statements.json @@ -8,25 +8,14 @@ "name": "test_fullname" }, "verb": { + "id": "http://adlnet.gov/expapi/verbs/answered", "display": { "en": "Answered" - }, - "id": "http://adlnet.gov/expapi/verbs/answered" + } }, "object": { "id": "http://www.example.org/mod/choice/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "To be or not to be?" - }, - "description": { - "en": "That is the question." - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "to-be[,]not-to-be" - ], "choices": [ { "id": "to-be", @@ -40,23 +29,31 @@ "en": "Not to be" } } - ] + ], + "correctResponsesPattern": [ + "to-be[,]not-to-be" + ], + "description": { + "en": "That is the question." + }, + "interactionType": "choice", + "name": { + "en": "To be or not to be?" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "To be" - }, "context": { "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } @@ -64,21 +61,21 @@ "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } + }, + "objectType": "Activity" }, { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } @@ -93,6 +90,9 @@ } }, "language": "en" + }, + "result": { + "response": "To be" } } ] diff --git a/tests/mod_choice/course_module_viewed/existing_module/data.json b/tests/mod_choice/course_module_viewed/existing_module/data.json index e38bf7d5f..fc6db066a 100644 --- a/tests/mod_choice/course_module_viewed/existing_module/data.json +++ b/tests/mod_choice/course_module_viewed/existing_module/data.json @@ -1,34 +1,34 @@ { - "modules": [ + "choice": [ { "id": 1, - "name": "choice" + "name": "To be or not to be?", + "intro": "

That is the question.

" } ], - "choice": [ + "choice_answers": [ { + "choiceid": 1, "id": 1, - "name": "To be or not to be?", - "intro": "

That is the question.

" + "optionid": 1 } ], "choice_options": [ { - "id": 1, "choiceid": 1, + "id": 1, "text": "To be" }, { - "id": 2, "choiceid": 1, + "id": 2, "text": "Not to be" } ], - "choice_answers": [ + "modules": [ { "id": 1, - "choiceid": 1, - "optionid": 1 + "name": "choice" } ] } diff --git a/tests/mod_choice/course_module_viewed/existing_module/event.json b/tests/mod_choice/course_module_viewed/existing_module/event.json index cbe892108..06f6c0389 100644 --- a/tests/mod_choice/course_module_viewed/existing_module/event.json +++ b/tests/mod_choice/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_choice\\event\\course_module_viewed" + "eventname": "\\mod_choice\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_choice/course_module_viewed/existing_module/statements.json b/tests/mod_choice/course_module_viewed/existing_module/statements.json index 85c022222..b8e1a94d2 100644 --- a/tests/mod_choice/course_module_viewed/existing_module/statements.json +++ b/tests/mod_choice/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,17 +16,6 @@ "object": { "id": "http://www.example.org/mod/choice/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "To be or not to be?" - }, - "description": { - "en": "That is the question." - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "to-be[,]not-to-be" - ], "choices": [ { "id": "to-be", @@ -40,56 +29,67 @@ "en": "Not to be" } } - ] + ], + "correctResponsesPattern": [ + "to-be[,]not-to-be" + ], + "description": { + "en": "That is the question." + }, + "interactionType": "choice", + "name": { + "en": "To be or not to be?" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_choice\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_choice\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_data/course_module_viewed/existing_module/data.json b/tests/mod_data/course_module_viewed/existing_module/data.json index 67160e65b..4b6e502a5 100644 --- a/tests/mod_data/course_module_viewed/existing_module/data.json +++ b/tests/mod_data/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "data": [ { "id": 1, - "name": "data" + "name": "test_name" } ], - "data": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "data" } ] } diff --git a/tests/mod_data/course_module_viewed/existing_module/event.json b/tests/mod_data/course_module_viewed/existing_module/event.json index 11d5220d9..78379e47c 100644 --- a/tests/mod_data/course_module_viewed/existing_module/event.json +++ b/tests/mod_data/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_data\\event\\course_module_viewed" + "eventname": "\\mod_data\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_data/course_module_viewed/existing_module/statements.json b/tests/mod_data/course_module_viewed/existing_module/statements.json index 48be9aa76..612eb052c 100644 --- a/tests/mod_data/course_module_viewed/existing_module/statements.json +++ b/tests/mod_data/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/data/view.php?id=1", "definition": { - "type": "http://xapi.org.au/contentprofile/activitytype/database", "name": { "en": "test_name" - } + }, + "type": "http://xapi.org.au/contentprofile/activitytype/database" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_data\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_data\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/data.json b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/data.json index 574fb9954..91e18efd1 100644 --- a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/data.json +++ b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "facetoface": [ { "id": 1, - "name": "facetoface" + "name": "test_facetoface_name" } ], - "facetoface": [ + "modules": [ { "id": 1, - "name": "test_facetoface_name" + "name": "facetoface" } ] } diff --git a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/event.json b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/event.json index db9216904..8fa817ecc 100644 --- a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/event.json +++ b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_facetoface\\event\\cancel_booking", "objecttable": "facetoface", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_facetoface\\event\\cancel_booking" + "timecreated": 1433946701 } diff --git a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/statements.json b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/statements.json index 1d6719b9a..bd73e7d09 100644 --- a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/statements.json +++ b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/unregistered", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/facetoface/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion", "name": { "en": "test_facetoface_name" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_facetoface\\event\\cancel_booking", - "event_function": "\\src\\transformer\\events\\mod_facetoface\\cancel_booking" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_facetoface\\cancel_booking", + "event_name": "\\mod_facetoface\\event\\cancel_booking", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_facetoface/course_module_viewed/existing_module/data.json b/tests/mod_facetoface/course_module_viewed/existing_module/data.json index 4f0f7392d..feefbf040 100644 --- a/tests/mod_facetoface/course_module_viewed/existing_module/data.json +++ b/tests/mod_facetoface/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "facetoface": [ { "id": 1, - "name": "facetoface" + "name": "test_name" } ], - "facetoface": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "facetoface" } ] } diff --git a/tests/mod_facetoface/course_module_viewed/existing_module/event.json b/tests/mod_facetoface/course_module_viewed/existing_module/event.json index cf838704f..16e1cccdf 100644 --- a/tests/mod_facetoface/course_module_viewed/existing_module/event.json +++ b/tests/mod_facetoface/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_facetoface\\event\\course_module_viewed" + "eventname": "\\mod_facetoface\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_facetoface/course_module_viewed/existing_module/statements.json b/tests/mod_facetoface/course_module_viewed/existing_module/statements.json index 330f11bcd..e9684e50b 100644 --- a/tests/mod_facetoface/course_module_viewed/existing_module/statements.json +++ b/tests/mod_facetoface/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/facetoface/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_facetoface\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_facetoface\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_facetoface/signup_success/existing_signup_success/data.json b/tests/mod_facetoface/signup_success/existing_signup_success/data.json index 574fb9954..91e18efd1 100644 --- a/tests/mod_facetoface/signup_success/existing_signup_success/data.json +++ b/tests/mod_facetoface/signup_success/existing_signup_success/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "facetoface": [ { "id": 1, - "name": "facetoface" + "name": "test_facetoface_name" } ], - "facetoface": [ + "modules": [ { "id": 1, - "name": "test_facetoface_name" + "name": "facetoface" } ] } diff --git a/tests/mod_facetoface/signup_success/existing_signup_success/event.json b/tests/mod_facetoface/signup_success/existing_signup_success/event.json index d0302ddcb..5336a1d1a 100644 --- a/tests/mod_facetoface/signup_success/existing_signup_success/event.json +++ b/tests/mod_facetoface/signup_success/existing_signup_success/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_facetoface\\event\\signup_success", "objecttable": "facetoface", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_facetoface\\event\\signup_success" + "timecreated": 1433946701 } diff --git a/tests/mod_facetoface/signup_success/existing_signup_success/statements.json b/tests/mod_facetoface/signup_success/existing_signup_success/statements.json index 242ce6ee3..3e2958e4e 100644 --- a/tests/mod_facetoface/signup_success/existing_signup_success/statements.json +++ b/tests/mod_facetoface/signup_success/existing_signup_success/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/registered", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/facetoface/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion", "name": { "en": "test_facetoface_name" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_facetoface\\event\\signup_success", - "event_function": "\\src\\transformer\\events\\mod_facetoface\\signup_success" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_facetoface\\signup_success", + "event_name": "\\mod_facetoface\\event\\signup_success", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_facetoface/take_attendance/existing_attendance_taken/data.json b/tests/mod_facetoface/take_attendance/existing_attendance_taken/data.json index 1d91030df..30d31b9a6 100644 --- a/tests/mod_facetoface/take_attendance/existing_attendance_taken/data.json +++ b/tests/mod_facetoface/take_attendance/existing_attendance_taken/data.json @@ -1,22 +1,4 @@ { - "user": [ - { - "id": 1, - "firstname": "test_instructor_name", - "email": "instructor@test.com" - }, - { - "id": 2, - "firstname": "test_attendee_name", - "email": "attendee@test.com" - } - ], - "modules": [ - { - "id": 1, - "name": "facetoface" - } - ], "facetoface": [ { "id": 1, @@ -29,27 +11,45 @@ "facetoface": 1 } ], - "facetoface_signups": [ + "facetoface_sessions_dates": [ { "id": 1, "sessionid": 1, - "userid": 2 + "timefinish": 123123123, + "timestart": 123123123 } ], - "facetoface_sessions_dates": [ + "facetoface_signups": [ { "id": 1, "sessionid": 1, - "timestart": 123123123, - "timefinish": 123123123 + "userid": 2 } ], "facetoface_signups_status": [ { "id": 1, "signupid": 1, - "timecreated": 123123123, - "statuscode": 100 + "statuscode": 100, + "timecreated": 123123123 + } + ], + "modules": [ + { + "id": 1, + "name": "facetoface" + } + ], + "user": [ + { + "id": 1, + "firstname": "test_instructor_name", + "email": "instructor@test.com" + }, + { + "id": 2, + "firstname": "test_attendee_name", + "email": "attendee@test.com" } ] } diff --git a/tests/mod_facetoface/take_attendance/existing_attendance_taken/event.json b/tests/mod_facetoface/take_attendance/existing_attendance_taken/event.json index 3f89bfefb..06ae28217 100644 --- a/tests/mod_facetoface/take_attendance/existing_attendance_taken/event.json +++ b/tests/mod_facetoface/take_attendance/existing_attendance_taken/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_facetoface\\event\\take_attendance", "objecttable": "facetoface", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_facetoface\\event\\take_attendance" + "timecreated": 1433946701 } diff --git a/tests/mod_facetoface/take_attendance/existing_attendance_taken/statements.json b/tests/mod_facetoface/take_attendance/existing_attendance_taken/statements.json index d1b586d5d..ca1746e79 100644 --- a/tests/mod_facetoface/take_attendance/existing_attendance_taken/statements.json +++ b/tests/mod_facetoface/take_attendance/existing_attendance_taken/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_attendee_name", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_attendee_name" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/attended", @@ -16,70 +16,70 @@ "object": { "id": "http://www.example.org/mod/facetoface/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion", "name": { "en": "test_facetoface_name" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/face-to-face-discussion" }, "objectType": "Activity" }, - "result": { - "duration": "PT0S", - "completion": true - }, "context": { - "language": "en", - "instructor": { - "name": "test_instructor_name", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_facetoface\\event\\take_attendance", - "event_function": "\\src\\transformer\\events\\mod_facetoface\\take_attendance" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_facetoface\\take_attendance", + "event_name": "\\mod_facetoface\\event\\take_attendance", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_instructor_name" + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT0S" } } ] diff --git a/tests/mod_feedback/course_module_viewed/viewing_feedback/data.json b/tests/mod_feedback/course_module_viewed/viewing_feedback/data.json index 78c432ac1..d5f88b86b 100644 --- a/tests/mod_feedback/course_module_viewed/viewing_feedback/data.json +++ b/tests/mod_feedback/course_module_viewed/viewing_feedback/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_name" } ], - "feedback": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "feedback" } ] } diff --git a/tests/mod_feedback/course_module_viewed/viewing_feedback/event.json b/tests/mod_feedback/course_module_viewed/viewing_feedback/event.json index e82e710b1..cce9860e6 100644 --- a/tests/mod_feedback/course_module_viewed/viewing_feedback/event.json +++ b/tests/mod_feedback/course_module_viewed/viewing_feedback/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\course_module_viewed" + "userid": 1, + "eventname": "\\mod_feedback\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/course_module_viewed/viewing_feedback/statements.json b/tests/mod_feedback/course_module_viewed/viewing_feedback/statements.json index 4d9056aea..f261582cc 100644 --- a/tests/mod_feedback/course_module_viewed/viewing_feedback/statements.json +++ b/tests/mod_feedback/course_module_viewed/viewing_feedback/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_feedback\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_feedback/response_submitted/multichoice/data.json b/tests/mod_feedback/response_submitted/multichoice/data.json index 3f73c969b..2343e6842 100644 --- a/tests/mod_feedback/response_submitted/multichoice/data.json +++ b/tests/mod_feedback/response_submitted/multichoice/data.json @@ -1,38 +1,38 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", - "typ": "multichoice", - "presentation": "r>>>>>test_choice_1\n|test_choice_2\n|test_choice_3" + "feedback": 1, + "presentation": "r>>>>>test_choice_1\n|test_choice_2\n|test_choice_3", + "typ": "multichoice" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "2" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/multichoice/event.json b/tests/mod_feedback/response_submitted/multichoice/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/multichoice/event.json +++ b/tests/mod_feedback/response_submitted/multichoice/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/multichoice/statements.json b/tests/mod_feedback/response_submitted/multichoice/statements.json index a28de9abb..bba6fca04 100644 --- a/tests/mod_feedback/response_submitted/multichoice/statements.json +++ b/tests/mod_feedback/response_submitted/multichoice/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,14 +88,6 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_feedback_item" - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "test-choice-1[,]test-choice-2[,]test-choice-3" - ], "choices": [ { "id": "test-choice-1", @@ -115,73 +107,81 @@ "en": "test_choice_3" } } - ] + ], + "correctResponsesPattern": [ + "test-choice-1[,]test-choice-2[,]test-choice-3" + ], + "interactionType": "choice", + "name": { + "en": "test_feedback_item" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_choice_2", - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/choice/response": "test_choice_2" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "test_choice_2" + }, + "response": "test_choice_2" } } ] diff --git a/tests/mod_feedback/response_submitted/multichoicerated/data.json b/tests/mod_feedback/response_submitted/multichoicerated/data.json index c438629b1..a90f9027d 100644 --- a/tests/mod_feedback/response_submitted/multichoicerated/data.json +++ b/tests/mod_feedback/response_submitted/multichoicerated/data.json @@ -1,38 +1,38 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", - "typ": "multichoicerated", - "presentation": "r>>>>>3####test_choice_1|2####test_choice_2|1####test_choice_3" + "feedback": 1, + "presentation": "r>>>>>3####test_choice_1|2####test_choice_2|1####test_choice_3", + "typ": "multichoicerated" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "3" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/multichoicerated/event.json b/tests/mod_feedback/response_submitted/multichoicerated/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/multichoicerated/event.json +++ b/tests/mod_feedback/response_submitted/multichoicerated/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/multichoicerated/statements.json b/tests/mod_feedback/response_submitted/multichoicerated/statements.json index 3366d21de..d1214b601 100644 --- a/tests/mod_feedback/response_submitted/multichoicerated/statements.json +++ b/tests/mod_feedback/response_submitted/multichoicerated/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,14 +88,6 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_feedback_item" - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "test-choice-1[,]test-choice-2[,]test-choice-3" - ], "choices": [ { "id": "test-choice-1", @@ -115,74 +107,82 @@ "en": "test_choice_3" } } - ] + ], + "correctResponsesPattern": [ + "test-choice-1[,]test-choice-2[,]test-choice-3" + ], + "interactionType": "choice", + "name": { + "en": "test_feedback_item" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_choice_3", - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/moodle/feedback_item_rating": 1, - "http://learninglocker.net/xapi/cmi/choice/response": "test_choice_3" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "test_choice_3", + "http://learninglocker.net/xapi/moodle/feedback_item_rating": 1 + }, + "response": "test_choice_3" } } ] diff --git a/tests/mod_feedback/response_submitted/no_items/data.json b/tests/mod_feedback/response_submitted/no_items/data.json index 3e0cfe56b..6e5c60fef 100644 --- a/tests/mod_feedback/response_submitted/no_items/data.json +++ b/tests/mod_feedback/response_submitted/no_items/data.json @@ -1,22 +1,22 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 + "anonymous_response": 0, + "feedback": 1 } ], - "feedback": [ + "feedback_value": [], + "modules": [ { "id": 1, - "name": "test_feedback_name" + "name": "feedback" } - ], - "feedback_value": [] + ] } diff --git a/tests/mod_feedback/response_submitted/no_items/event.json b/tests/mod_feedback/response_submitted/no_items/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/no_items/event.json +++ b/tests/mod_feedback/response_submitted/no_items/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/no_items/statements.json b/tests/mod_feedback/response_submitted/no_items/statements.json index 32144c28e..3c251372f 100644 --- a/tests/mod_feedback/response_submitted/no_items/statements.json +++ b/tests/mod_feedback/response_submitted/no_items/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_feedback/response_submitted/numerical/data.json b/tests/mod_feedback/response_submitted/numerical/data.json index 7e713d163..b530b4eca 100644 --- a/tests/mod_feedback/response_submitted/numerical/data.json +++ b/tests/mod_feedback/response_submitted/numerical/data.json @@ -1,38 +1,38 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", - "typ": "numeric", - "presentation": "0|10" + "feedback": 1, + "presentation": "0|10", + "typ": "numeric" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "3" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/numerical/event.json b/tests/mod_feedback/response_submitted/numerical/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/numerical/event.json +++ b/tests/mod_feedback/response_submitted/numerical/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/numerical/statements.json b/tests/mod_feedback/response_submitted/numerical/statements.json index d961f2a38..6aacca587 100644 --- a/tests/mod_feedback/response_submitted/numerical/statements.json +++ b/tests/mod_feedback/response_submitted/numerical/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,80 +88,80 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", + "correctResponsesPattern": [ + "0[:]10" + ], + "interactionType": "numeric", "name": { "en": "test_feedback_item" }, - "interactionType": "numeric", - "correctResponsesPattern": [ - "0[:]10" - ] + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "3", - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/numeric/response": 3 - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/numeric/response": 3 + }, + "response": "3" } } ] diff --git a/tests/mod_feedback/response_submitted/textarea/data.json b/tests/mod_feedback/response_submitted/textarea/data.json index 50a185786..a1d99e353 100644 --- a/tests/mod_feedback/response_submitted/textarea/data.json +++ b/tests/mod_feedback/response_submitted/textarea/data.json @@ -1,37 +1,37 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", + "feedback": 1, "typ": "textarea" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "test_long_text_answer" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/textarea/event.json b/tests/mod_feedback/response_submitted/textarea/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/textarea/event.json +++ b/tests/mod_feedback/response_submitted/textarea/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/textarea/statements.json b/tests/mod_feedback/response_submitted/textarea/statements.json index c0ab51e79..85d74ef83 100644 --- a/tests/mod_feedback/response_submitted/textarea/statements.json +++ b/tests/mod_feedback/response_submitted/textarea/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,74 +88,74 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", + "interactionType": "long-fill-in", "name": { "en": "test_feedback_item" }, - "interactionType": "long-fill-in" + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_long_text_answer", - "completion": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "response": "test_long_text_answer" } } ] diff --git a/tests/mod_feedback/response_submitted/textarea_anon/data.json b/tests/mod_feedback/response_submitted/textarea_anon/data.json index 0ff469cd0..01ac31ab5 100644 --- a/tests/mod_feedback/response_submitted/textarea_anon/data.json +++ b/tests/mod_feedback/response_submitted/textarea_anon/data.json @@ -1,37 +1,37 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 1 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 1, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", + "feedback": 1, "typ": "textarea" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "test_long_text_answer" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/textarea_anon/event.json b/tests/mod_feedback/response_submitted/textarea_anon/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/textarea_anon/event.json +++ b/tests/mod_feedback/response_submitted/textarea_anon/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/textarea_anon/statements.json b/tests/mod_feedback/response_submitted/textarea_anon/statements.json index cb297f195..76cedc2af 100644 --- a/tests/mod_feedback/response_submitted/textarea_anon/statements.json +++ b/tests/mod_feedback/response_submitted/textarea_anon/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "Anonymous Course Participant", "account": { "homePage": "http://www.example.org", "name": "anonymous" - } + }, + "name": "Anonymous Course Participant" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "Anonymous Course Participant", "account": { "homePage": "http://www.example.org", "name": "anonymous" - } + }, + "name": "Anonymous Course Participant" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,74 +88,74 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", + "interactionType": "long-fill-in", "name": { "en": "test_feedback_item" }, - "interactionType": "long-fill-in" + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_long_text_answer", - "completion": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "response": "test_long_text_answer" } } ] diff --git a/tests/mod_feedback/response_submitted/textfield/data.json b/tests/mod_feedback/response_submitted/textfield/data.json index 8e9b958e5..cd71aae3f 100644 --- a/tests/mod_feedback/response_submitted/textfield/data.json +++ b/tests/mod_feedback/response_submitted/textfield/data.json @@ -1,37 +1,37 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", + "feedback": 1, "typ": "textfield" } ], "feedback_value": [ { "id": 1, - "item": 1, "completed": 1, + "item": 1, "value": "test_short_text_answer" } + ], + "modules": [ + { + "id": 1, + "name": "feedback" + } ] } diff --git a/tests/mod_feedback/response_submitted/textfield/event.json b/tests/mod_feedback/response_submitted/textfield/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/textfield/event.json +++ b/tests/mod_feedback/response_submitted/textfield/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/textfield/statements.json b/tests/mod_feedback/response_submitted/textfield/statements.json index b89c6133b..37835b9b4 100644 --- a/tests/mod_feedback/response_submitted/textfield/statements.json +++ b/tests/mod_feedback/response_submitted/textfield/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,68 +16,68 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -88,74 +88,74 @@ "object": { "id": "http://www.example.org/mod/feedback/edit_item.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", + "interactionType": "fill-in", "name": { "en": "test_feedback_item" }, - "interactionType": "fill-in" + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_short_text_answer", - "completion": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "response": "test_short_text_answer" } } ] diff --git a/tests/mod_feedback/response_submitted/unknown_typ/data.json b/tests/mod_feedback/response_submitted/unknown_typ/data.json index a7adc7eeb..756958564 100644 --- a/tests/mod_feedback/response_submitted/unknown_typ/data.json +++ b/tests/mod_feedback/response_submitted/unknown_typ/data.json @@ -1,36 +1,36 @@ { - "modules": [ + "feedback": [ { "id": 1, - "name": "feedback" + "name": "test_feedback_name" } ], "feedback_completed": [ { "id": 1, - "feedback": 1, - "anonymous_response": 0 - } - ], - "feedback": [ - { - "id": 1, - "name": "test_feedback_name" + "anonymous_response": 0, + "feedback": 1 } ], "feedback_item": [ { "id": 1, - "feedback": 1, "name": "test_feedback_item", + "feedback": 1, "typ": "unknown" } ], "feedback_value": [ { "id": 1, - "item": 1, - "completed": 1 + "completed": 1, + "item": 1 + } + ], + "modules": [ + { + "id": 1, + "name": "feedback" } ] } diff --git a/tests/mod_feedback/response_submitted/unknown_typ/event.json b/tests/mod_feedback/response_submitted/unknown_typ/event.json index bd62a9675..f91fa58b4 100644 --- a/tests/mod_feedback/response_submitted/unknown_typ/event.json +++ b/tests/mod_feedback/response_submitted/unknown_typ/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_feedback\\event\\response_submitted" + "userid": 1, + "eventname": "\\mod_feedback\\event\\response_submitted", + "timecreated": 1433946701 } diff --git a/tests/mod_feedback/response_submitted/unknown_typ/statements.json b/tests/mod_feedback/response_submitted/unknown_typ/statements.json index 32144c28e..3c251372f 100644 --- a/tests/mod_feedback/response_submitted/unknown_typ/statements.json +++ b/tests/mod_feedback/response_submitted/unknown_typ/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/submit", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/feedback/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback", "name": { "en": "test_feedback_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/feedback" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_feedback\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_feedback\\response_submitted\\handler", + "event_name": "\\mod_feedback\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_folder/course_module_viewed/existing_module/data.json b/tests/mod_folder/course_module_viewed/existing_module/data.json index 02e4af53b..e799108f9 100644 --- a/tests/mod_folder/course_module_viewed/existing_module/data.json +++ b/tests/mod_folder/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "folder": [ { "id": 1, - "name": "folder" + "name": "test_name" } ], - "folder": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "folder" } ] } diff --git a/tests/mod_folder/course_module_viewed/existing_module/event.json b/tests/mod_folder/course_module_viewed/existing_module/event.json index 36cd354ba..309e3fdcd 100644 --- a/tests/mod_folder/course_module_viewed/existing_module/event.json +++ b/tests/mod_folder/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_folder\\event\\course_module_viewed" + "eventname": "\\mod_folder\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_folder/course_module_viewed/existing_module/statements.json b/tests/mod_folder/course_module_viewed/existing_module/statements.json index 886128cc7..cbb79ccd2 100644 --- a/tests/mod_folder/course_module_viewed/existing_module/statements.json +++ b/tests/mod_folder/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/folder/view.php?id=1", "definition": { - "type": "http://activitystrea.ms/collection", "name": { "en": "test_name" - } + }, + "type": "http://activitystrea.ms/collection" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_folder\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_folder\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/course_module_viewed/existing_module/data.json b/tests/mod_forum/course_module_viewed/existing_module/data.json index 062023ee1..7b14e90db 100644 --- a/tests/mod_forum/course_module_viewed/existing_module/data.json +++ b/tests/mod_forum/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "forum": [ { "id": 1, - "name": "forum" + "name": "test_name" } ], - "forum": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "forum" } ] } diff --git a/tests/mod_forum/course_module_viewed/existing_module/event.json b/tests/mod_forum/course_module_viewed/existing_module/event.json index 535b8bd4d..74102e9c6 100644 --- a/tests/mod_forum/course_module_viewed/existing_module/event.json +++ b/tests/mod_forum/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_forum\\event\\course_module_viewed" + "eventname": "\\mod_forum\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_forum/course_module_viewed/existing_module/statements.json b/tests/mod_forum/course_module_viewed/existing_module/statements.json index 5d4c6f4e2..583e5317e 100644 --- a/tests/mod_forum/course_module_viewed/existing_module/statements.json +++ b/tests/mod_forum/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_forum\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/discussion_created/data.json b/tests/mod_forum/discussion_created/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/discussion_created/data.json +++ b/tests/mod_forum/discussion_created/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/discussion_created/event.json b/tests/mod_forum/discussion_created/event.json index ccecfd346..e7eea34ea 100644 --- a/tests/mod_forum/discussion_created/event.json +++ b/tests/mod_forum/discussion_created/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\discussion_created", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_forum\\event\\discussion_created" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/discussion_created/statements.json b/tests/mod_forum/discussion_created/statements.json index 756f613c9..90cf4fb15 100644 --- a/tests/mod_forum/discussion_created/statements.json +++ b/tests/mod_forum/discussion_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/create", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\discussion_created", - "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_created", + "event_name": "\\mod_forum\\event\\discussion_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/discussion_subcription_created/data.json b/tests/mod_forum/discussion_subcription_created/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/discussion_subcription_created/data.json +++ b/tests/mod_forum/discussion_subcription_created/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/discussion_subcription_created/event.json b/tests/mod_forum/discussion_subcription_created/event.json index 71e0bf2b1..43c961f0e 100644 --- a/tests/mod_forum/discussion_subcription_created/event.json +++ b/tests/mod_forum/discussion_subcription_created/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\discussion_subscription_created", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, "other": "a:2:{s:10:\"discussion\";i:1;s:7:\"forumid\";i:1;}", - "eventname": "\\mod_forum\\event\\discussion_subscription_created" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/discussion_subcription_created/statements.json b/tests/mod_forum/discussion_subcription_created/statements.json index 7789b7a81..1e72f3dc1 100644 --- a/tests/mod_forum/discussion_subcription_created/statements.json +++ b/tests/mod_forum/discussion_subcription_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/subscribed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\discussion_subscription_created", - "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_subscription_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_subscription_created", + "event_name": "\\mod_forum\\event\\discussion_subscription_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/discussion_subcription_deleted/data.json b/tests/mod_forum/discussion_subcription_deleted/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/discussion_subcription_deleted/data.json +++ b/tests/mod_forum/discussion_subcription_deleted/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/discussion_subcription_deleted/event.json b/tests/mod_forum/discussion_subcription_deleted/event.json index 5a7f9cf07..e2c1d838d 100644 --- a/tests/mod_forum/discussion_subcription_deleted/event.json +++ b/tests/mod_forum/discussion_subcription_deleted/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\discussion_subscription_deleted", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, "other": "a:2:{s:10:\"discussion\";i:1;s:7:\"forumid\";i:1;}", - "eventname": "\\mod_forum\\event\\discussion_subscription_deleted" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/discussion_subcription_deleted/statements.json b/tests/mod_forum/discussion_subcription_deleted/statements.json index 7abccede7..134968060 100644 --- a/tests/mod_forum/discussion_subcription_deleted/statements.json +++ b/tests/mod_forum/discussion_subcription_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/unsubscribed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\discussion_subscription_deleted", - "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_subscription_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_subscription_deleted", + "event_name": "\\mod_forum\\event\\discussion_subscription_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/data.json b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/data.json +++ b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/event.json b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/event.json index 0ef8b3079..c75fc7b1f 100644 --- a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/event.json +++ b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\discussion_viewed", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_forum\\event\\discussion_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/statements.json b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/statements.json index 98e354a86..91518dca3 100644 --- a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/statements.json +++ b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\discussion_viewed", - "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\discussion_viewed", + "event_name": "\\mod_forum\\event\\discussion_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/post_created/data.json b/tests/mod_forum/post_created/data.json index f6c68e850..9f4275456 100644 --- a/tests/mod_forum/post_created/data.json +++ b/tests/mod_forum/post_created/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -20,9 +14,15 @@ "forum_posts": [ { "id": 1, - "message": "
test_response_text
", "discussion": 1, + "message": "
test_response_text
", "subject": "Re: test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/post_created/event.json b/tests/mod_forum/post_created/event.json index c8d86e7fa..1b733605b 100644 --- a/tests/mod_forum/post_created/event.json +++ b/tests/mod_forum/post_created/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\post_created", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, "other": "a:3:{s:12:\"discussionid\";i:1;s:7:\"forumid\";i:2;s:9:\"forumtype\";s:7:\"general\";}", - "eventname": "\\mod_forum\\event\\post_created" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/post_created/statements.json b/tests/mod_forum/post_created/statements.json index 01f4f99df..991da93cd 100644 --- a/tests/mod_forum/post_created/statements.json +++ b/tests/mod_forum/post_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/replied", @@ -16,82 +16,82 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1#p1", "definition": { - "type": "http://id.tincanapi.com/activitytype/forum-reply", + "description": { + "en": "test_response_text" + }, "name": { "en": "Re: test_forum_discussion_name" }, - "description": { - "en": "test_response_text" - } + "type": "http://id.tincanapi.com/activitytype/forum-reply" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\post_created", - "event_function": "\\src\\transformer\\events\\mod_forum\\post_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\post_created", + "event_name": "\\mod_forum\\event\\post_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/post_deleted/data.json b/tests/mod_forum/post_deleted/data.json index f6c68e850..9f4275456 100644 --- a/tests/mod_forum/post_deleted/data.json +++ b/tests/mod_forum/post_deleted/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -20,9 +14,15 @@ "forum_posts": [ { "id": 1, - "message": "
test_response_text
", "discussion": 1, + "message": "
test_response_text
", "subject": "Re: test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/post_deleted/event.json b/tests/mod_forum/post_deleted/event.json index 41fecd439..6ac84e424 100644 --- a/tests/mod_forum/post_deleted/event.json +++ b/tests/mod_forum/post_deleted/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\post_deleted", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, "other": "a:3:{s:12:\"discussionid\";i:1;s:7:\"forumid\";i:2;s:9:\"forumtype\";s:7:\"general\";}", - "eventname": "\\mod_forum\\event\\post_deleted" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/post_deleted/statements.json b/tests/mod_forum/post_deleted/statements.json index ce833bdc0..a61a410fb 100644 --- a/tests/mod_forum/post_deleted/statements.json +++ b/tests/mod_forum/post_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/delete", @@ -21,71 +21,71 @@ "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\post_deleted", - "event_function": "\\src\\transformer\\events\\mod_forum\\post_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\post_deleted", + "event_name": "\\mod_forum\\event\\post_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/post_updated/data.json b/tests/mod_forum/post_updated/data.json index f6c68e850..9f4275456 100644 --- a/tests/mod_forum/post_updated/data.json +++ b/tests/mod_forum/post_updated/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -20,9 +14,15 @@ "forum_posts": [ { "id": 1, - "message": "
test_response_text
", "discussion": 1, + "message": "
test_response_text
", "subject": "Re: test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/post_updated/event.json b/tests/mod_forum/post_updated/event.json index b598e4ad4..1720f6d7c 100644 --- a/tests/mod_forum/post_updated/event.json +++ b/tests/mod_forum/post_updated/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\post_updated", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, "other": "a:3:{s:12:\"discussionid\";i:1;s:7:\"forumid\";i:2;s:9:\"forumtype\";s:7:\"general\";}", - "eventname": "\\mod_forum\\event\\post_updated" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/post_updated/statements.json b/tests/mod_forum/post_updated/statements.json index 31aff40d4..a55a2e232 100644 --- a/tests/mod_forum/post_updated/statements.json +++ b/tests/mod_forum/post_updated/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/acrossx/verbs/edited", @@ -16,82 +16,82 @@ "object": { "id": "http://www.example.org/mod/forum/discuss.php?d=1#p1", "definition": { - "type": "http://id.tincanapi.com/activitytype/forum-reply", + "description": { + "en": "test_response_text" + }, "name": { "en": "Re: test_forum_discussion_name" }, - "description": { - "en": "test_response_text" - } + "type": "http://id.tincanapi.com/activitytype/forum-reply" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\post_updated", - "event_function": "\\src\\transformer\\events\\mod_forum\\post_updated" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/forum/discuss.php?d=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_forum_discussion_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\post_updated", + "event_name": "\\mod_forum\\event\\post_updated", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/subscription_created/data.json b/tests/mod_forum/subscription_created/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/subscription_created/data.json +++ b/tests/mod_forum/subscription_created/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/subscription_created/event.json b/tests/mod_forum/subscription_created/event.json index 1924063d3..fb1a5df6c 100644 --- a/tests/mod_forum/subscription_created/event.json +++ b/tests/mod_forum/subscription_created/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\subscription_created", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_forum\\event\\subscription_created" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/subscription_created/statements.json b/tests/mod_forum/subscription_created/statements.json index af841b8c8..9705cbe43 100644 --- a/tests/mod_forum/subscription_created/statements.json +++ b/tests/mod_forum/subscription_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/subscribed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\subscription_created", - "event_function": "\\src\\transformer\\events\\mod_forum\\subscription_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\subscription_created", + "event_name": "\\mod_forum\\event\\subscription_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/subscription_deleted/data.json b/tests/mod_forum/subscription_deleted/data.json index dd84aa11f..8b8b179eb 100644 --- a/tests/mod_forum/subscription_deleted/data.json +++ b/tests/mod_forum/subscription_deleted/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "forum" - } - ], "forum": [ { "id": 1, @@ -16,5 +10,11 @@ "id": 1, "name": "test_forum_discussion_name" } + ], + "modules": [ + { + "id": 1, + "name": "forum" + } ] } diff --git a/tests/mod_forum/subscription_deleted/event.json b/tests/mod_forum/subscription_deleted/event.json index 53932a4cf..a918f49c7 100644 --- a/tests/mod_forum/subscription_deleted/event.json +++ b/tests/mod_forum/subscription_deleted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_forum\\event\\subscription_deleted", "objecttable": "forum", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_forum\\event\\subscription_deleted" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/subscription_deleted/statements.json b/tests/mod_forum/subscription_deleted/statements.json index fb3ad11e2..d1a0d47ce 100644 --- a/tests/mod_forum/subscription_deleted/statements.json +++ b/tests/mod_forum/subscription_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/unsubscribed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/forum/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum", "name": { "en": "test_forum_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/forum" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\subscription_deleted", - "event_function": "\\src\\transformer\\events\\mod_forum\\subscription_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\subscription_deleted", + "event_name": "\\mod_forum\\event\\subscription_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed/data.json b/tests/mod_forum/user_report_viewed/existing_report_viewed/data.json index 2ce825e6a..2a27a4b2d 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed/data.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed/data.json @@ -10,12 +10,5 @@ "firstname": "viewed_user_firstname", "email": "test2@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed/event.json b/tests/mod_forum/user_report_viewed/existing_report_viewed/event.json index 120625b34..da2305ee7 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed/event.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed/event.json @@ -1,10 +1,10 @@ { + "courseid": 2, "id": 1, - "userid": 1, + "objectid": null, "relateduserid": 2, - "courseid": 1, - "timecreated": 1433946701, + "userid": 1, + "eventname": "\\mod_forum\\event\\user_report_viewed", "objecttable": null, - "objectid": null, - "eventname": "\\mod_forum\\event\\user_report_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed/statements.json b/tests/mod_forum/user_report_viewed/existing_report_viewed/statements.json index a4841f59d..fed8db7ea 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed/statements.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "loggedin_user_firstname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "loggedin_user_firstname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -14,55 +14,55 @@ } }, "object": { + "id": "http://www.example.org/mod/forum/user.php?id=2&course=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/user-profile", + "extensions": { + "https://moodle.org/xapi/extensions/course_id": 2, + "https://moodle.org/xapi/extensions/user_id": 2 + }, "name": { "en": "forum posts of viewed_user_firstname" }, - "extensions": { - "https://moodle.org/xapi/extensions/user_id": 2, - "https://moodle.org/xapi/extensions/course_id": 1 - } + "type": "http://id.tincanapi.com/activitytype/user-profile" }, - "id": "http://www.example.org/mod/forum/user.php?id=2&course=1", "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\user_report_viewed", - "event_function": "\\src\\transformer\\events\\mod_forum\\user_report_viewed" - } - }, "contextActivities": { - "parent": [ + "category": [ { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ], - "category": [ + "parent": [ { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\user_report_viewed", + "event_name": "\\mod_forum\\event\\user_report_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/data.json b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/data.json index 2ce825e6a..2a27a4b2d 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/data.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/data.json @@ -10,12 +10,5 @@ "firstname": "viewed_user_firstname", "email": "test2@test.com" } - ], - "course": [ - { - "id": 1, - "fullname": "test_name", - "lang": "en" - } ] } diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/event.json b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/event.json index caafba106..14f278977 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/event.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/event.json @@ -1,10 +1,10 @@ { + "courseid": 0, "id": 1, - "userid": 1, + "objectid": null, "relateduserid": 2, - "courseid": 0, - "timecreated": 1433946701, + "userid": 1, + "eventname": "\\mod_forum\\event\\user_report_viewed", "objecttable": null, - "objectid": null, - "eventname": "\\mod_forum\\event\\user_report_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/statements.json b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/statements.json index b8058a060..ad223f15b 100644 --- a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/statements.json +++ b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "loggedin_user_firstname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "loggedin_user_firstname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -14,42 +14,42 @@ } }, "object": { + "id": "http://www.example.org/mod/forum/user.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/user-profile", + "extensions": { + "https://moodle.org/xapi/extensions/user_id": 2 + }, "name": { "en": "forum posts of viewed_user_firstname" }, - "extensions": { - "https://moodle.org/xapi/extensions/user_id": 2 - } + "type": "http://id.tincanapi.com/activitytype/user-profile" }, - "id": "http://www.example.org/mod/forum/user.php?id=2", "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_forum\\event\\user_report_viewed", - "event_function": "\\src\\transformer\\events\\mod_forum\\user_report_viewed" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_forum\\user_report_viewed", + "event_name": "\\mod_forum\\event\\user_report_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_glossary/comment_created/data.json b/tests/mod_glossary/comment_created/data.json index dfdd534a5..8c9fe3d6b 100644 --- a/tests/mod_glossary/comment_created/data.json +++ b/tests/mod_glossary/comment_created/data.json @@ -1,8 +1,9 @@ { - "modules": [ + "comments": [ { "id": 1, - "name": "glossary" + "itemid": 1, + "content": "test_glossary_entry_comment_content" } ], "glossary": [ @@ -13,17 +14,16 @@ ], "glossary_entries": [ { + "glossaryid": 1, "id": 1, "concept": "test_glossary_entry_name", - "glossaryid": 1, "definition": "test_glossary_entry_description" } ], - "comments": [ + "modules": [ { "id": 1, - "content": "test_glossary_entry_comment_content", - "itemid": 1 + "name": "glossary" } ] } diff --git a/tests/mod_glossary/comment_created/event.json b/tests/mod_glossary/comment_created/event.json index 50572e05b..1d8233e59 100644 --- a/tests/mod_glossary/comment_created/event.json +++ b/tests/mod_glossary/comment_created/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_glossary\\event\\comment_created", "objecttable": "comments", - "other":"a:1:{s:6:\"itemid\";i:1;}", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_glossary\\event\\comment_created" + "other": "a:1:{s:6:\"itemid\";i:1;}", + "timecreated": 1433946701 } diff --git a/tests/mod_glossary/comment_created/statements.json b/tests/mod_glossary/comment_created/statements.json index 84323dbb2..5778690ab 100644 --- a/tests/mod_glossary/comment_created/statements.json +++ b/tests/mod_glossary/comment_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/commented", @@ -16,85 +16,85 @@ "object": { "id": "http://www.example.org/mod/glossary/showentry.php?eid=1#c1", "definition": { - "type": "http://activitystrea.ms/comment", + "description": { + "en": "test_glossary_entry_comment_content" + }, "name": { "en": "RE: test_glossary_entry_name" }, - "description": { - "en": "test_glossary_entry_comment_content" - } + "type": "http://activitystrea.ms/comment" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_glossary\\event\\comment_created", - "event_function": "\\src\\transformer\\events\\mod_glossary\\comment_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/glossary/showentry.php?eid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry", + "description": { + "en": "test_glossary_entry_description" + }, "name": { "en": "test_glossary_entry_name" }, - "description": { - "en": "test_glossary_entry_description" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/glossary/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary", "name": { "en": "test_glossary_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_glossary\\comment_created", + "event_name": "\\mod_glossary\\event\\comment_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_glossary/comment_deleted/data.json b/tests/mod_glossary/comment_deleted/data.json index 7fbdd87b0..b72f386d5 100644 --- a/tests/mod_glossary/comment_deleted/data.json +++ b/tests/mod_glossary/comment_deleted/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "glossary" - } - ], "glossary": [ { "id": 1, @@ -13,10 +7,16 @@ ], "glossary_entries": [ { + "glossaryid": 1, "id": 1, "concept": "test_glossary_entry_name", - "glossaryid": 1, "definition": "test_glossary_entry_description" } + ], + "modules": [ + { + "id": 1, + "name": "glossary" + } ] } diff --git a/tests/mod_glossary/comment_deleted/event.json b/tests/mod_glossary/comment_deleted/event.json index cca69fd52..0f53965b9 100644 --- a/tests/mod_glossary/comment_deleted/event.json +++ b/tests/mod_glossary/comment_deleted/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_glossary\\event\\comment_deleted", "objecttable": "comments", - "other":"a:1:{s:6:\"itemid\";i:1;}", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_glossary\\event\\comment_deleted" + "other": "a:1:{s:6:\"itemid\";i:1;}", + "timecreated": 1433946701 } diff --git a/tests/mod_glossary/comment_deleted/statements.json b/tests/mod_glossary/comment_deleted/statements.json index 78011f5f0..43b2941ae 100644 --- a/tests/mod_glossary/comment_deleted/statements.json +++ b/tests/mod_glossary/comment_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/delete", @@ -16,82 +16,82 @@ "object": { "id": "http://www.example.org/mod/glossary/showentry.php?eid=1#c1", "definition": { - "type": "http://activitystrea.ms/comment", "name": { "en": "RE: test_glossary_entry_name" - } + }, + "type": "http://activitystrea.ms/comment" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_glossary\\event\\comment_deleted", - "event_function": "\\src\\transformer\\events\\mod_glossary\\comment_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/glossary/showentry.php?eid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry", + "description": { + "en": "test_glossary_entry_description" + }, "name": { "en": "test_glossary_entry_name" }, - "description": { - "en": "test_glossary_entry_description" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/glossary/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary", "name": { "en": "test_glossary_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_glossary\\comment_deleted", + "event_name": "\\mod_glossary\\event\\comment_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_glossary/course_module_viewed/existing_module/data.json b/tests/mod_glossary/course_module_viewed/existing_module/data.json index 4124f910a..868ac8c16 100644 --- a/tests/mod_glossary/course_module_viewed/existing_module/data.json +++ b/tests/mod_glossary/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "glossary": [ { "id": 1, - "name": "glossary" + "name": "test_name" } ], - "glossary": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "glossary" } ] } diff --git a/tests/mod_glossary/course_module_viewed/existing_module/event.json b/tests/mod_glossary/course_module_viewed/existing_module/event.json index 376f4c9f0..264e49a98 100644 --- a/tests/mod_glossary/course_module_viewed/existing_module/event.json +++ b/tests/mod_glossary/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_glossary\\event\\course_module_viewed" + "eventname": "\\mod_glossary\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_glossary/course_module_viewed/existing_module/statements.json b/tests/mod_glossary/course_module_viewed/existing_module/statements.json index 321eb5c93..b2377803c 100644 --- a/tests/mod_glossary/course_module_viewed/existing_module/statements.json +++ b/tests/mod_glossary/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/glossary/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_glossary\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_glossary\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_glossary/entry_viewed/data.json b/tests/mod_glossary/entry_viewed/data.json index 7fbdd87b0..b72f386d5 100644 --- a/tests/mod_glossary/entry_viewed/data.json +++ b/tests/mod_glossary/entry_viewed/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "glossary" - } - ], "glossary": [ { "id": 1, @@ -13,10 +7,16 @@ ], "glossary_entries": [ { + "glossaryid": 1, "id": 1, "concept": "test_glossary_entry_name", - "glossaryid": 1, "definition": "test_glossary_entry_description" } + ], + "modules": [ + { + "id": 1, + "name": "glossary" + } ] } diff --git a/tests/mod_glossary/entry_viewed/event.json b/tests/mod_glossary/entry_viewed/event.json index a74dd2f6f..3db62d890 100644 --- a/tests/mod_glossary/entry_viewed/event.json +++ b/tests/mod_glossary/entry_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_glossary\\event\\entry_viewed", "objecttable": "glossary_entries", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_glossary\\event\\entry_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_glossary/entry_viewed/statements.json b/tests/mod_glossary/entry_viewed/statements.json index e3577bb2f..367c3dd84 100644 --- a/tests/mod_glossary/entry_viewed/statements.json +++ b/tests/mod_glossary/entry_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,72 +16,72 @@ "object": { "id": "http://www.example.org/mod/glossary/showentry.php?eid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry", + "description": { + "en": "test_glossary_entry_description" + }, "name": { "en": "test_glossary_entry_name" }, - "description": { - "en": "test_glossary_entry_description" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary-entry" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_glossary\\event\\entry_viewed", - "event_function": "\\src\\transformer\\events\\mod_glossary\\entry_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/glossary/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary", "name": { "en": "test_glossary_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/glossary" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_glossary\\entry_viewed", + "event_name": "\\mod_glossary\\event\\entry_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_imscp/course_module_viewed/existing_module/data.json b/tests/mod_imscp/course_module_viewed/existing_module/data.json index 575da027e..6d946a654 100644 --- a/tests/mod_imscp/course_module_viewed/existing_module/data.json +++ b/tests/mod_imscp/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "imscp": [ { "id": 1, - "name": "imscp" + "name": "test_name" } ], - "imscp": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "imscp" } ] } diff --git a/tests/mod_imscp/course_module_viewed/existing_module/event.json b/tests/mod_imscp/course_module_viewed/existing_module/event.json index 2469345dd..aca4e215a 100644 --- a/tests/mod_imscp/course_module_viewed/existing_module/event.json +++ b/tests/mod_imscp/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_imscp\\event\\course_module_viewed" + "eventname": "\\mod_imscp\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_imscp/course_module_viewed/existing_module/statements.json b/tests/mod_imscp/course_module_viewed/existing_module/statements.json index 3cf708899..d9d3b7baa 100644 --- a/tests/mod_imscp/course_module_viewed/existing_module/statements.json +++ b/tests/mod_imscp/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/imscp/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_imscp\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_imscp\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/content_page_viewed/data.json b/tests/mod_lesson/content_page_viewed/data.json index 611ac6517..239bcba0a 100644 --- a/tests/mod_lesson/content_page_viewed/data.json +++ b/tests/mod_lesson/content_page_viewed/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -18,5 +12,11 @@ "lessonid": 1, "title": "lesson_content_page_title" } + ], + "modules": [ + { + "id": 1, + "name": "lesson" + } ] } diff --git a/tests/mod_lesson/content_page_viewed/event.json b/tests/mod_lesson/content_page_viewed/event.json index 9ae76c861..67fdfa01f 100644 --- a/tests/mod_lesson/content_page_viewed/event.json +++ b/tests/mod_lesson/content_page_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\content_page_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\content_page_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/content_page_viewed/statements.json b/tests/mod_lesson/content_page_viewed/statements.json index a4b29df13..5a98ed375 100644 --- a/tests/mod_lesson/content_page_viewed/statements.json +++ b/tests/mod_lesson/content_page_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson-content-page", "name": { "en": "lesson_content_page_title" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson-content-page" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\content_page_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\content_page_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\content_page_viewed", + "event_name": "\\mod_lesson\\event\\content_page_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/course_module_viewed/existing_module/data.json b/tests/mod_lesson/course_module_viewed/existing_module/data.json index eb5521a1e..7e8b4598d 100644 --- a/tests/mod_lesson/course_module_viewed/existing_module/data.json +++ b/tests/mod_lesson/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "lesson": [ { "id": 1, - "name": "lesson" + "name": "test_name" } ], - "lesson": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "lesson" } ] } diff --git a/tests/mod_lesson/course_module_viewed/existing_module/event.json b/tests/mod_lesson/course_module_viewed/existing_module/event.json index 1e49d002e..341d1e657 100644 --- a/tests/mod_lesson/course_module_viewed/existing_module/event.json +++ b/tests/mod_lesson/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\course_module_viewed" + "eventname": "\\mod_lesson\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/course_module_viewed/existing_module/statements.json b/tests/mod_lesson/course_module_viewed/existing_module/statements.json index b23c4a3a9..eb4aded5a 100644 --- a/tests/mod_lesson/course_module_viewed/existing_module/statements.json +++ b/tests/mod_lesson/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_lesson\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/essay_assessed/data.json b/tests/mod_lesson/essay_assessed/data.json index 29c234329..630011565 100644 --- a/tests/mod_lesson/essay_assessed/data.json +++ b/tests/mod_lesson/essay_assessed/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 10, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -34,8 +19,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "O:8:\"stdClass\":7:{s:4:\"sent\";i:0;s:6:\"graded\";i:0;s:5:\"score\";i:1;s:6:\"answer\";s:30:\"lesson_question_essay_response\";s:12:\"answerformat\";s:1:\"1\";s:8:\"response\";s:20:\"essay_grade_response\";s:14:\"responseformat\";s:1:\"1\";}", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "O:8:\"stdClass\":7:{s:4:\"sent\";i:0;s:6:\"graded\";i:0;s:5:\"score\";i:1;s:6:\"answer\";s:30:\"lesson_question_essay_response\";s:12:\"answerformat\";s:1:\"1\";s:8:\"response\";s:20:\"essay_grade_response\";s:14:\"responseformat\";s:1:\"1\";}" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 10, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/essay_assessed/event.json b/tests/mod_lesson/essay_assessed/event.json index 4f38d1c8d..8444d7c2f 100644 --- a/tests/mod_lesson/essay_assessed/event.json +++ b/tests/mod_lesson/essay_assessed/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\essay_assessed", "objecttable": "lesson_pages", "other": "a:2:{s:8:\"lessonid\";s:1:\"1\";s:9:\"attemptid\";i:1;}", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\essay_assessed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/essay_assessed/statements.json b/tests/mod_lesson/essay_assessed/statements.json index 44c1fff30..819f50aa4 100644 --- a/tests/mod_lesson/essay_assessed/statements.json +++ b/tests/mod_lesson/essay_assessed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/dod-isd/verbs/assessed", @@ -16,88 +16,88 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, "description": { "en": "lesson_question_page_contents" }, - "interactionType": "long-fill-in" + "interactionType": "long-fill-in", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "essay_grade_response", - "score": { - "min": 0, - "max": 1, - "raw": 1, - "scaled": 1 - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\essay_assessed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\essay_assessed" - }, - "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { - "name": "test_fullname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\essay_assessed", + "event_name": "\\mod_lesson\\event\\essay_assessed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + }, + "https://yetanalytics.com/profiles/prepositions/concepts/context-extensions/for": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname" + } + }, + "language": "en" + }, + "result": { + "response": "essay_grade_response", + "score": { + "max": 1, + "min": 0, + "raw": 1, + "scaled": 1 } } } diff --git a/tests/mod_lesson/lesson_ended/data.json b/tests/mod_lesson/lesson_ended/data.json index 7f2bee151..abe2ba610 100644 --- a/tests/mod_lesson/lesson_ended/data.json +++ b/tests/mod_lesson/lesson_ended/data.json @@ -1,8 +1,20 @@ { - "modules": [ + "grade_grades": [ + { + "itemid": 1, + "userid": 1, + "rawgrade": 75, + "rawgrademax": 100, + "rawgrademin": 0, + "timemodified": 1731595610 + } + ], + "grade_items": [ { "id": 1, - "name": "lesson" + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "lesson" } ], "lesson": [ @@ -12,22 +24,10 @@ "intro": "test_lesson_intro" } ], - "grade_items": [ + "modules": [ { "id": 1, - "itemmodule": "lesson", - "iteminstance": 1, - "gradepass": 50 - } - ], - "grade_grades": [ - { - "itemid": 1, - "userid": 1, - "timemodified": 1731595610, - "rawgrademin": 0, - "rawgrademax": 100, - "rawgrade": 75 + "name": "lesson" } ] } diff --git a/tests/mod_lesson/lesson_ended/event.json b/tests/mod_lesson/lesson_ended/event.json index 5745124cc..3e1748f8a 100644 --- a/tests/mod_lesson/lesson_ended/event.json +++ b/tests/mod_lesson/lesson_ended/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\lesson_ended", "objecttable": "lesson", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\lesson_ended" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/lesson_ended/statements.json b/tests/mod_lesson/lesson_ended/statements.json index 61ba7463c..9675b825b 100644 --- a/tests/mod_lesson/lesson_ended/statements.json +++ b/tests/mod_lesson/lesson_ended/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,82 +16,82 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1#lesson", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session", + "description": { + "en": "test_lesson_intro" + }, "name": { "en": "test_lesson" }, - "description": { - "en": "test_lesson_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session" }, "objectType": "Activity" }, - "result": { - "completion": true, - "success": true, - "score": { - "min": 0, - "max": 100, - "raw": 75, - "scaled": 0.5 - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\lesson_ended", - "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_ended" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_ended", + "event_name": "\\mod_lesson\\event\\lesson_ended", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "score": { + "max": 100, + "min": 0, + "raw": 75, + "scaled": 0.5 + }, + "success": true } } ] diff --git a/tests/mod_lesson/lesson_restarted/data.json b/tests/mod_lesson/lesson_restarted/data.json index ae34a1414..e0b000366 100644 --- a/tests/mod_lesson/lesson_restarted/data.json +++ b/tests/mod_lesson/lesson_restarted/data.json @@ -1,15 +1,15 @@ { - "modules": [ + "lesson": [ { "id": 1, - "name": "lesson" + "name": "test_lesson", + "intro": "test_lesson_intro" } ], - "lesson": [ + "modules": [ { "id": 1, - "name": "test_lesson", - "intro": "test_lesson_intro" + "name": "lesson" } ] } diff --git a/tests/mod_lesson/lesson_restarted/event.json b/tests/mod_lesson/lesson_restarted/event.json index 456ab37fa..0870550c8 100644 --- a/tests/mod_lesson/lesson_restarted/event.json +++ b/tests/mod_lesson/lesson_restarted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\lesson_restarted", "objecttable": "lesson", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\lesson_restarted" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/lesson_restarted/statements.json b/tests/mod_lesson/lesson_restarted/statements.json index 6b8d9f1e5..52721010c 100644 --- a/tests/mod_lesson/lesson_restarted/statements.json +++ b/tests/mod_lesson/lesson_restarted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/restarted", @@ -16,72 +16,72 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1#lesson", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session", + "description": { + "en": "test_lesson_intro" + }, "name": { "en": "test_lesson" }, - "description": { - "en": "test_lesson_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\lesson_restarted", - "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_restarted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_restarted", + "event_name": "\\mod_lesson\\event\\lesson_restarted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/lesson_resumed/data.json b/tests/mod_lesson/lesson_resumed/data.json index ae34a1414..e0b000366 100644 --- a/tests/mod_lesson/lesson_resumed/data.json +++ b/tests/mod_lesson/lesson_resumed/data.json @@ -1,15 +1,15 @@ { - "modules": [ + "lesson": [ { "id": 1, - "name": "lesson" + "name": "test_lesson", + "intro": "test_lesson_intro" } ], - "lesson": [ + "modules": [ { "id": 1, - "name": "test_lesson", - "intro": "test_lesson_intro" + "name": "lesson" } ] } diff --git a/tests/mod_lesson/lesson_resumed/event.json b/tests/mod_lesson/lesson_resumed/event.json index cc219252f..8d5739603 100644 --- a/tests/mod_lesson/lesson_resumed/event.json +++ b/tests/mod_lesson/lesson_resumed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\lesson_resumed", "objecttable": "lesson", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\lesson_resumed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/lesson_resumed/statements.json b/tests/mod_lesson/lesson_resumed/statements.json index 522bf4a55..75fe4c5cb 100644 --- a/tests/mod_lesson/lesson_resumed/statements.json +++ b/tests/mod_lesson/lesson_resumed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/resumed", @@ -16,72 +16,72 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1#lesson", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session", + "description": { + "en": "test_lesson_intro" + }, "name": { "en": "test_lesson" }, - "description": { - "en": "test_lesson_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\lesson_resumed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_resumed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_resumed", + "event_name": "\\mod_lesson\\event\\lesson_resumed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/lesson_started/data.json b/tests/mod_lesson/lesson_started/data.json index ae34a1414..e0b000366 100644 --- a/tests/mod_lesson/lesson_started/data.json +++ b/tests/mod_lesson/lesson_started/data.json @@ -1,15 +1,15 @@ { - "modules": [ + "lesson": [ { "id": 1, - "name": "lesson" + "name": "test_lesson", + "intro": "test_lesson_intro" } ], - "lesson": [ + "modules": [ { "id": 1, - "name": "test_lesson", - "intro": "test_lesson_intro" + "name": "lesson" } ] } diff --git a/tests/mod_lesson/lesson_started/event.json b/tests/mod_lesson/lesson_started/event.json index 8d17dfa71..3f54532ef 100644 --- a/tests/mod_lesson/lesson_started/event.json +++ b/tests/mod_lesson/lesson_started/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\lesson_started", "objecttable": "lesson", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\lesson_started" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/lesson_started/statements.json b/tests/mod_lesson/lesson_started/statements.json index 2d6efc1ea..c8049c480 100644 --- a/tests/mod_lesson/lesson_started/statements.json +++ b/tests/mod_lesson/lesson_started/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/start", @@ -16,72 +16,72 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1#lesson", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session", + "description": { + "en": "test_lesson_intro" + }, "name": { "en": "test_lesson" }, - "description": { - "en": "test_lesson_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/lesson-session" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\lesson_started", - "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_started" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\lesson_started", + "event_name": "\\mod_lesson\\event\\lesson_started", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_answered/choice/data.json b/tests/mod_lesson/question_answered/choice/data.json index 612b2e332..a6b6b5e03 100644 --- a/tests/mod_lesson/question_answered/choice/data.json +++ b/tests/mod_lesson/question_answered/choice/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 3, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -44,8 +29,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "a", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "a" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 3, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/choice/event.json b/tests/mod_lesson/question_answered/choice/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/choice/event.json +++ b/tests/mod_lesson/question_answered/choice/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/choice/statements.json b/tests/mod_lesson/question_answered/choice/statements.json index fa8e2c69f..c9ef9a667 100644 --- a/tests/mod_lesson/question_answered/choice/statements.json +++ b/tests/mod_lesson/question_answered/choice/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,14 +16,6 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, - "description": { - "en": "lesson_question_page_contents" - }, - "interactionType": "choice", "choices": [ { "id": "a", @@ -46,70 +38,78 @@ ], "correctResponsesPattern": [ "a[,]b" - ] + ], + "description": { + "en": "lesson_question_page_contents" + }, + "interactionType": "choice", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "success": true, - "response": "a" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "a", + "success": true } } ] diff --git a/tests/mod_lesson/question_answered/essay/data.json b/tests/mod_lesson/question_answered/essay/data.json index 9aa40d16b..6a0a9ecf1 100644 --- a/tests/mod_lesson/question_answered/essay/data.json +++ b/tests/mod_lesson/question_answered/essay/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 10, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -33,8 +18,23 @@ "pageid": 1, "userid": 1, "correct": 0, - "useranswer": "O:8:\"stdClass\":7:{s:4:\"sent\";i:0;s:6:\"graded\";i:0;s:5:\"score\";i:0;s:6:\"answer\";s:30:\"lesson_question_essay_response\";s:12:\"answerformat\";s:1:\"1\";s:8:\"response\";s:0:\"\";s:14:\"responseformat\";s:1:\"1\";}", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "O:8:\"stdClass\":7:{s:4:\"sent\";i:0;s:6:\"graded\";i:0;s:5:\"score\";i:0;s:6:\"answer\";s:30:\"lesson_question_essay_response\";s:12:\"answerformat\";s:1:\"1\";s:8:\"response\";s:0:\"\";s:14:\"responseformat\";s:1:\"1\";}" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 10, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/essay/event.json b/tests/mod_lesson/question_answered/essay/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/essay/event.json +++ b/tests/mod_lesson/question_answered/essay/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/essay/statements.json b/tests/mod_lesson/question_answered/essay/statements.json index 7a4e83227..46227fa9c 100644 --- a/tests/mod_lesson/question_answered/essay/statements.json +++ b/tests/mod_lesson/question_answered/essay/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,76 +16,76 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, "description": { "en": "lesson_question_page_contents" }, - "interactionType": "long-fill-in" + "interactionType": "long-fill-in", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "lesson_question_essay_response" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "lesson_question_essay_response" } } ] diff --git a/tests/mod_lesson/question_answered/matching/data.json b/tests/mod_lesson/question_answered/matching/data.json index 4636b3c6e..7ca0d74b0 100644 --- a/tests/mod_lesson/question_answered/matching/data.json +++ b/tests/mod_lesson/question_answered/matching/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,28 +6,19 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 5, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "id": 1, "pageid": 1, - "response": "Apple", "answer": "A", + "response": "Apple", "score": 0 }, { "id": 2, "pageid": 1, - "response": "Banana", "answer": "B", + "response": "Banana", "score": 0 } ], @@ -43,8 +28,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "Apple,Banana", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "Apple,Banana" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 5, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/matching/event.json b/tests/mod_lesson/question_answered/matching/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/matching/event.json +++ b/tests/mod_lesson/question_answered/matching/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/matching/statements.json b/tests/mod_lesson/question_answered/matching/statements.json index 9e078ebb0..f63328c7b 100644 --- a/tests/mod_lesson/question_answered/matching/statements.json +++ b/tests/mod_lesson/question_answered/matching/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,14 +16,16 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "a[.]apple[,]b[.]banana" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "matching", + "name": { + "en": "lesson_question_page_title" + }, "source": [ { "id": "a", @@ -52,72 +54,70 @@ } } ], - "correctResponsesPattern": [ - "a[.]apple[,]b[.]banana" - ] + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "success": true, - "response": "a[.]apple[,]b[.]banana" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "a[.]apple[,]b[.]banana", + "success": true } } ] diff --git a/tests/mod_lesson/question_answered/numerical/data.json b/tests/mod_lesson/question_answered/numerical/data.json index 1e887a15f..07b7f5484 100644 --- a/tests/mod_lesson/question_answered/numerical/data.json +++ b/tests/mod_lesson/question_answered/numerical/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 8, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -34,8 +19,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "23", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "23" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 8, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/numerical/event.json b/tests/mod_lesson/question_answered/numerical/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/numerical/event.json +++ b/tests/mod_lesson/question_answered/numerical/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/numerical/statements.json b/tests/mod_lesson/question_answered/numerical/statements.json index fbec7e136..9bf91a03d 100644 --- a/tests/mod_lesson/question_answered/numerical/statements.json +++ b/tests/mod_lesson/question_answered/numerical/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,80 +16,80 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "23" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "numeric", - "correctResponsesPattern": [ - "23" - ] + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "success": true, - "response": "23" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "23", + "success": true } } ] diff --git a/tests/mod_lesson/question_answered/shortanswer/data.json b/tests/mod_lesson/question_answered/shortanswer/data.json index 2f514ac4a..db97bdcbb 100644 --- a/tests/mod_lesson/question_answered/shortanswer/data.json +++ b/tests/mod_lesson/question_answered/shortanswer/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 1, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -34,8 +19,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "Thing", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "Thing" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 1, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/shortanswer/event.json b/tests/mod_lesson/question_answered/shortanswer/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/shortanswer/event.json +++ b/tests/mod_lesson/question_answered/shortanswer/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/shortanswer/statements.json b/tests/mod_lesson/question_answered/shortanswer/statements.json index e8b33f6d2..cb209ed52 100644 --- a/tests/mod_lesson/question_answered/shortanswer/statements.json +++ b/tests/mod_lesson/question_answered/shortanswer/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,80 +16,80 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "Thing" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "fill-in", - "correctResponsesPattern": [ - "Thing" - ] + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "success": true, - "response": "Thing" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "Thing", + "success": true } } ] diff --git a/tests/mod_lesson/question_answered/truefalse/data.json b/tests/mod_lesson/question_answered/truefalse/data.json index d3c59645b..949c23cb5 100644 --- a/tests/mod_lesson/question_answered/truefalse/data.json +++ b/tests/mod_lesson/question_answered/truefalse/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 2, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -39,8 +24,23 @@ "pageid": 1, "userid": 1, "correct": 1, - "useranswer": "true", - "timeseen": "1731972680" + "timeseen": "1731972680", + "useranswer": "true" + } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 2, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_answered/truefalse/event.json b/tests/mod_lesson/question_answered/truefalse/event.json index 62695efa7..c29507c29 100644 --- a/tests/mod_lesson/question_answered/truefalse/event.json +++ b/tests/mod_lesson/question_answered/truefalse/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_answered", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_answered" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_answered/truefalse/statements.json b/tests/mod_lesson/question_answered/truefalse/statements.json index 66380cc9d..800bb990c 100644 --- a/tests/mod_lesson/question_answered/truefalse/statements.json +++ b/tests/mod_lesson/question_answered/truefalse/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -16,14 +16,6 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, - "description": { - "en": "lesson_question_page_contents" - }, - "interactionType": "choice", "choices": [ { "id": "true", @@ -40,70 +32,78 @@ ], "correctResponsesPattern": [ "true" - ] + ], + "description": { + "en": "lesson_question_page_contents" + }, + "interactionType": "choice", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "success": true, - "response": "true" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_answered", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_answered", + "event_name": "\\mod_lesson\\event\\question_answered", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "true", + "success": true } } ] diff --git a/tests/mod_lesson/question_viewed/choice/data.json b/tests/mod_lesson/question_viewed/choice/data.json index f0fb297c5..53420cf54 100644 --- a/tests/mod_lesson/question_viewed/choice/data.json +++ b/tests/mod_lesson/question_viewed/choice/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 3, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -37,5 +22,20 @@ "response": "c", "score": 0 } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 3, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" + } ] } diff --git a/tests/mod_lesson/question_viewed/choice/event.json b/tests/mod_lesson/question_viewed/choice/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/choice/event.json +++ b/tests/mod_lesson/question_viewed/choice/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/choice/statements.json b/tests/mod_lesson/question_viewed/choice/statements.json index 811f3e491..2d040f712 100644 --- a/tests/mod_lesson/question_viewed/choice/statements.json +++ b/tests/mod_lesson/question_viewed/choice/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,14 +16,6 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, - "description": { - "en": "lesson_question_page_contents" - }, - "interactionType": "choice", "choices": [ { "id": "a", @@ -46,66 +38,74 @@ ], "correctResponsesPattern": [ "a[,]b" - ] + ], + "description": { + "en": "lesson_question_page_contents" + }, + "interactionType": "choice", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_viewed/essay/data.json b/tests/mod_lesson/question_viewed/essay/data.json index 569a67f61..8c7012fb2 100644 --- a/tests/mod_lesson/question_viewed/essay/data.json +++ b/tests/mod_lesson/question_viewed/essay/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,19 +6,25 @@ "intro": "test_lesson_intro" } ], + "lesson_answers": [ + { + "pageid": 1, + "score": 1 + } + ], "lesson_pages": [ { "id": 1, "lessonid": 1, + "contents": "lesson_question_page_contents", "qtype": 10, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" + "title": "lesson_question_page_title" } ], - "lesson_answers": [ + "modules": [ { - "pageid": 1, - "score": 1 + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_viewed/essay/event.json b/tests/mod_lesson/question_viewed/essay/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/essay/event.json +++ b/tests/mod_lesson/question_viewed/essay/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/essay/statements.json b/tests/mod_lesson/question_viewed/essay/statements.json index 3e95e8bb0..26b7a7a3f 100644 --- a/tests/mod_lesson/question_viewed/essay/statements.json +++ b/tests/mod_lesson/question_viewed/essay/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,73 +16,73 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, "description": { "en": "lesson_question_page_contents" }, - "interactionType": "long-fill-in" + "interactionType": "long-fill-in", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_viewed/matching/data.json b/tests/mod_lesson/question_viewed/matching/data.json index ea0736903..1a9e6ec6e 100644 --- a/tests/mod_lesson/question_viewed/matching/data.json +++ b/tests/mod_lesson/question_viewed/matching/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,27 +6,33 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 5, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, - "response": "Apple", "answer": "A", + "response": "Apple", "score": 0 }, { "pageid": 1, - "response": "Banana", "answer": "B", + "response": "Banana", "score": 0 } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 5, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" + } ] } diff --git a/tests/mod_lesson/question_viewed/matching/event.json b/tests/mod_lesson/question_viewed/matching/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/matching/event.json +++ b/tests/mod_lesson/question_viewed/matching/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/matching/statements.json b/tests/mod_lesson/question_viewed/matching/statements.json index 306f5b916..1b2520f35 100644 --- a/tests/mod_lesson/question_viewed/matching/statements.json +++ b/tests/mod_lesson/question_viewed/matching/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,14 +16,16 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "a[.]apple[,]b[.]banana" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "matching", + "name": { + "en": "lesson_question_page_title" + }, "source": [ { "id": "a", @@ -52,68 +54,66 @@ } } ], - "correctResponsesPattern": [ - "a[.]apple[,]b[.]banana" - ] + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_viewed/numerical/data.json b/tests/mod_lesson/question_viewed/numerical/data.json index 3c55d7dbd..6c12f16d0 100644 --- a/tests/mod_lesson/question_viewed/numerical/data.json +++ b/tests/mod_lesson/question_viewed/numerical/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,20 +6,26 @@ "intro": "test_lesson_intro" } ], + "lesson_answers": [ + { + "pageid": 1, + "response": "23", + "score": 1 + } + ], "lesson_pages": [ { "id": 1, "lessonid": 1, + "contents": "lesson_question_page_contents", "qtype": 8, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" + "title": "lesson_question_page_title" } ], - "lesson_answers": [ + "modules": [ { - "pageid": 1, - "response": "23", - "score": 1 + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_viewed/numerical/event.json b/tests/mod_lesson/question_viewed/numerical/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/numerical/event.json +++ b/tests/mod_lesson/question_viewed/numerical/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/numerical/statements.json b/tests/mod_lesson/question_viewed/numerical/statements.json index 70ed39ddf..9da704361 100644 --- a/tests/mod_lesson/question_viewed/numerical/statements.json +++ b/tests/mod_lesson/question_viewed/numerical/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,76 +16,76 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "23" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "numeric", - "correctResponsesPattern": [ - "23" - ] + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_viewed/shortanswer/data.json b/tests/mod_lesson/question_viewed/shortanswer/data.json index 049d1a6ae..cd081273d 100644 --- a/tests/mod_lesson/question_viewed/shortanswer/data.json +++ b/tests/mod_lesson/question_viewed/shortanswer/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,20 +6,26 @@ "intro": "test_lesson_intro" } ], + "lesson_answers": [ + { + "pageid": 1, + "response": "Thing", + "score": 1 + } + ], "lesson_pages": [ { "id": 1, "lessonid": 1, + "contents": "lesson_question_page_contents", "qtype": 1, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" + "title": "lesson_question_page_title" } ], - "lesson_answers": [ + "modules": [ { - "pageid": 1, - "response": "Thing", - "score": 1 + "id": 1, + "name": "lesson" } ] } diff --git a/tests/mod_lesson/question_viewed/shortanswer/event.json b/tests/mod_lesson/question_viewed/shortanswer/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/shortanswer/event.json +++ b/tests/mod_lesson/question_viewed/shortanswer/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/shortanswer/statements.json b/tests/mod_lesson/question_viewed/shortanswer/statements.json index 0a9673c48..0da8ef5c9 100644 --- a/tests/mod_lesson/question_viewed/shortanswer/statements.json +++ b/tests/mod_lesson/question_viewed/shortanswer/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,76 +16,76 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, + "correctResponsesPattern": [ + "Thing" + ], "description": { "en": "lesson_question_page_contents" }, "interactionType": "fill-in", - "correctResponsesPattern": [ - "Thing" - ] + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lesson/question_viewed/truefalse/data.json b/tests/mod_lesson/question_viewed/truefalse/data.json index 2da72be5b..b420f888f 100644 --- a/tests/mod_lesson/question_viewed/truefalse/data.json +++ b/tests/mod_lesson/question_viewed/truefalse/data.json @@ -1,10 +1,4 @@ { - "modules": [ - { - "id": 1, - "name": "lesson" - } - ], "lesson": [ { "id": 1, @@ -12,15 +6,6 @@ "intro": "test_lesson_intro" } ], - "lesson_pages": [ - { - "id": 1, - "lessonid": 1, - "qtype": 2, - "title": "lesson_question_page_title", - "contents": "lesson_question_page_contents" - } - ], "lesson_answers": [ { "pageid": 1, @@ -32,5 +17,20 @@ "response": "false", "score": 0 } + ], + "lesson_pages": [ + { + "id": 1, + "lessonid": 1, + "contents": "lesson_question_page_contents", + "qtype": 2, + "title": "lesson_question_page_title" + } + ], + "modules": [ + { + "id": 1, + "name": "lesson" + } ] } diff --git a/tests/mod_lesson/question_viewed/truefalse/event.json b/tests/mod_lesson/question_viewed/truefalse/event.json index cd859e703..8e20c3c18 100644 --- a/tests/mod_lesson/question_viewed/truefalse/event.json +++ b/tests/mod_lesson/question_viewed/truefalse/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_lesson\\event\\question_viewed", "objecttable": "lesson_pages", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_lesson\\event\\question_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_lesson/question_viewed/truefalse/statements.json b/tests/mod_lesson/question_viewed/truefalse/statements.json index 8da617815..307132158 100644 --- a/tests/mod_lesson/question_viewed/truefalse/statements.json +++ b/tests/mod_lesson/question_viewed/truefalse/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,14 +16,6 @@ "object": { "id": "http://www.example.org/mod/lesson/view.php?id=1&pageid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "lesson_question_page_title" - }, - "description": { - "en": "lesson_question_page_contents" - }, - "interactionType": "choice", "choices": [ { "id": "true", @@ -40,66 +32,74 @@ ], "correctResponsesPattern": [ "true" - ] + ], + "description": { + "en": "lesson_question_page_contents" + }, + "interactionType": "choice", + "name": { + "en": "lesson_question_page_title" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lesson\\event\\question_viewed", - "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/lesson/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/lesson", "name": { "en": "test_lesson" - } + }, + "type": "http://adlnet.gov/expapi/activities/lesson" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_lesson\\question_viewed", + "event_name": "\\mod_lesson\\event\\question_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_lti/course_module_viewed/existing_module/data.json b/tests/mod_lti/course_module_viewed/existing_module/data.json index 84b8199cf..abfbe42f1 100644 --- a/tests/mod_lti/course_module_viewed/existing_module/data.json +++ b/tests/mod_lti/course_module_viewed/existing_module/data.json @@ -1,14 +1,14 @@ { - "modules": [ + "lti": [ { "id": 1, - "name": "lti" + "name": "test_name" } ], - "lti": [ + "modules": [ { "id": 1, - "name": "test_name" + "name": "lti" } ] } diff --git a/tests/mod_lti/course_module_viewed/existing_module/event.json b/tests/mod_lti/course_module_viewed/existing_module/event.json index 2fc60107b..7591894e8 100644 --- a/tests/mod_lti/course_module_viewed/existing_module/event.json +++ b/tests/mod_lti/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_lti\\event\\course_module_viewed" + "eventname": "\\mod_lti\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_lti/course_module_viewed/existing_module/statements.json b/tests/mod_lti/course_module_viewed/existing_module/statements.json index a1cd74aaa..036e56a9c 100644 --- a/tests/mod_lti/course_module_viewed/existing_module/statements.json +++ b/tests/mod_lti/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/lti/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/media", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/media" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_lti\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_lti\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_page/course_module_viewed/existing_module/event.json b/tests/mod_page/course_module_viewed/existing_module/event.json index b687956da..d9e5b194f 100644 --- a/tests/mod_page/course_module_viewed/existing_module/event.json +++ b/tests/mod_page/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_page\\event\\course_module_viewed" + "eventname": "\\mod_page\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_page/course_module_viewed/existing_module/statements.json b/tests/mod_page/course_module_viewed/existing_module/statements.json index e0d51eeaa..cfa74f27e 100644 --- a/tests/mod_page/course_module_viewed/existing_module/statements.json +++ b/tests/mod_page/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/page/view.php?id=1", "definition": { - "type": "https://w3id.org/xapi/acrossx/activities/page", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/acrossx/activities/page" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_page\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_page\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_questionnaire/all_responses_viewed/event.json b/tests/mod_questionnaire/all_responses_viewed/event.json index 70a087c80..183fc6b9d 100644 --- a/tests/mod_questionnaire/all_responses_viewed/event.json +++ b/tests/mod_questionnaire/all_responses_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_questionnaire\\event\\all_responses_viewed", "objecttable": "questionnaire", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_questionnaire\\event\\all_responses_viewed" + "timecreated": 1433946701 } diff --git a/tests/mod_questionnaire/all_responses_viewed/statements.json b/tests/mod_questionnaire/all_responses_viewed/statements.json index 0fabe2e14..2288e9b1d 100644 --- a/tests/mod_questionnaire/all_responses_viewed/statements.json +++ b/tests/mod_questionnaire/all_responses_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/questionnaire/report.php?instance=1&group=0", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/report", "name": { "en": "test_q_name Report" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/report" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_questionnaire\\event\\all_responses_viewed", - "event_function": "\\src\\transformer\\events\\mod_questionnaire\\all_responses_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/questionnaire/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", "name": { "en": "test_q_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_questionnaire\\all_responses_viewed", + "event_name": "\\mod_questionnaire\\event\\all_responses_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_questionnaire/attempt_resumed/event.json b/tests/mod_questionnaire/attempt_resumed/event.json index 5bcfc4164..2fcdb3588 100644 --- a/tests/mod_questionnaire/attempt_resumed/event.json +++ b/tests/mod_questionnaire/attempt_resumed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_questionnaire\\event\\attempt_resumed", "objecttable": "questionnaire", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_questionnaire\\event\\attempt_resumed" + "timecreated": 1433946701 } diff --git a/tests/mod_questionnaire/attempt_resumed/statements.json b/tests/mod_questionnaire/attempt_resumed/statements.json index 5b18d9ae2..3320635da 100644 --- a/tests/mod_questionnaire/attempt_resumed/statements.json +++ b/tests/mod_questionnaire/attempt_resumed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/resumed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/questionnaire/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", "name": { "en": "test_q_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_questionnaire\\event\\attempt_resumed", - "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_resumed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_resumed", + "event_name": "\\mod_questionnaire\\event\\attempt_resumed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_questionnaire/attempt_saved/event.json b/tests/mod_questionnaire/attempt_saved/event.json index 8f471ebf8..88ebad0ea 100644 --- a/tests/mod_questionnaire/attempt_saved/event.json +++ b/tests/mod_questionnaire/attempt_saved/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_questionnaire\\event\\attempt_saved", "objecttable": "questionnaire", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_questionnaire\\event\\attempt_saved" + "timecreated": 1433946701 } diff --git a/tests/mod_questionnaire/attempt_saved/statements.json b/tests/mod_questionnaire/attempt_saved/statements.json index 653c1820f..b74dfdbad 100644 --- a/tests/mod_questionnaire/attempt_saved/statements.json +++ b/tests/mod_questionnaire/attempt_saved/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/suspended", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/questionnaire/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", "name": { "en": "test_q_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_questionnaire\\event\\attempt_saved", - "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_saved" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_saved", + "event_name": "\\mod_questionnaire\\event\\attempt_saved", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_questionnaire/attempt_submitted/event.json b/tests/mod_questionnaire/attempt_submitted/event.json index 16849d603..2c7d38181 100644 --- a/tests/mod_questionnaire/attempt_submitted/event.json +++ b/tests/mod_questionnaire/attempt_submitted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_questionnaire\\event\\attempt_submitted", "objecttable": "questionnaire", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_questionnaire\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_questionnaire/attempt_submitted/statements.json b/tests/mod_questionnaire/attempt_submitted/statements.json index c8a54cdc2..ddf6433cd 100644 --- a/tests/mod_questionnaire/attempt_submitted/statements.json +++ b/tests/mod_questionnaire/attempt_submitted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/submit", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/questionnaire/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", "name": { "en": "test_q_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_questionnaire\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_submitted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_questionnaire\\attempt_submitted", + "event_name": "\\mod_questionnaire\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_questionnaire/course_module_viewed/existing_module/event.json b/tests/mod_questionnaire/course_module_viewed/existing_module/event.json index 7b29608be..231fb2f5e 100644 --- a/tests/mod_questionnaire/course_module_viewed/existing_module/event.json +++ b/tests/mod_questionnaire/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_questionnaire\\event\\course_module_viewed" + "eventname": "\\mod_questionnaire\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_questionnaire/course_module_viewed/existing_module/statements.json b/tests/mod_questionnaire/course_module_viewed/existing_module/statements.json index 07389bb3b..1ca1d60cd 100644 --- a/tests/mod_questionnaire/course_module_viewed/existing_module/statements.json +++ b/tests/mod_questionnaire/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/questionnaire/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", "name": { "en": "test_q_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_questionnaire\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_questionnaire\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/attempt_becameoverdue/data.json b/tests/mod_quiz/attempt_becameoverdue/data.json index 7156400c7..2f5cf5e5e 100644 --- a/tests/mod_quiz/attempt_becameoverdue/data.json +++ b/tests/mod_quiz/attempt_becameoverdue/data.json @@ -5,20 +5,20 @@ "name": "quiz" } ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], "quiz_attempts": [ { "id": 1, "quiz": 1, - "sumgrades": 50, "state": "overdue", + "sumgrades": 50, "timefinish": 1, "timestart": 0 } - ], - "quiz": [ - { - "id": 1, - "name": "test_quiz_name" - } ] } diff --git a/tests/mod_quiz/attempt_becameoverdue/event.json b/tests/mod_quiz/attempt_becameoverdue/event.json index 51c6a12a6..b7945aabd 100644 --- a/tests/mod_quiz/attempt_becameoverdue/event.json +++ b/tests/mod_quiz/attempt_becameoverdue/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_becameoverdue", "objecttable": "quiz_attempts", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_becameoverdue" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_becameoverdue/statements.json b/tests/mod_quiz/attempt_becameoverdue/statements.json index d961babba..7fb98cdab 100644 --- a/tests/mod_quiz/attempt_becameoverdue/statements.json +++ b/tests/mod_quiz/attempt_becameoverdue/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/exceeded", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_becameoverdue", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_becameoverdue" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_becameoverdue", + "event_name": "\\mod_quiz\\event\\attempt_becameoverdue", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/data.json b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/data.json index 7ec241b71..761d1531e 100644 --- a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/data.json +++ b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/data.json @@ -1,36 +1,36 @@ { - "user": [ + "modules": [ { "id": 1, - "firstname": "test_instructor_fullname", - "email": "instructor@test.com" - }, - { - "id": 2, - "firstname": "test_learner_fullname", - "email": "learner@test.com" + "name": "quiz" } ], - "modules": [ + "quiz": [ { "id": 1, - "name": "quiz" + "name": "test_quiz_name" } ], "quiz_attempts": [ { "id": 1, "quiz": 1, - "sumgrades": 50, "state": "finished", + "sumgrades": 50, "timefinish": 1, "timestart": 0 } ], - "quiz": [ + "user": [ { "id": 1, - "name": "test_quiz_name" + "firstname": "test_instructor_fullname", + "email": "instructor@test.com" + }, + { + "id": 2, + "firstname": "test_learner_fullname", + "email": "learner@test.com" } ] } diff --git a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/event.json b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/event.json index 199ba0c94..779c67870 100644 --- a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/event.json +++ b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "attempt", "objectid": 1, - "contextinstanceid": 1, + "relateduserid": 2, + "userid": 1, "eventname": "\\mod_quiz\\event\\attempt_reviewed", - "relateduserid": 2 + "objecttable": "attempt", + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/statements.json b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/statements.json index 2b88b69eb..cfe75f88d 100644 --- a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/statements.json +++ b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_learner_fullname", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_learner_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/receive", @@ -16,86 +16,86 @@ "object": { "id": "http://www.example.org/review.php?attempt=1", "definition": { - "type": "http://activitystrea.ms/schema/1.0/review", "name": { "en": "Review" - } + }, + "type": "http://activitystrea.ms/schema/1.0/review" }, "objectType": "Activity" }, "context": { - "instructor": { - "name": "test_instructor_fullname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_reviewed", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_reviewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_reviewed", + "event_name": "\\mod_quiz\\event\\attempt_reviewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_instructor_fullname" + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/attempt_started/existing_attempt_started/data.json b/tests/mod_quiz/attempt_started/existing_attempt_started/data.json index cbdad7191..4110000b5 100644 --- a/tests/mod_quiz/attempt_started/existing_attempt_started/data.json +++ b/tests/mod_quiz/attempt_started/existing_attempt_started/data.json @@ -5,20 +5,20 @@ "name": "quiz" } ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], "quiz_attempts": [ { "id": 1, "quiz": 1, - "sumgrades": 50, "state": "finished", + "sumgrades": 50, "timefinish": 1, "timestart": 0 } - ], - "quiz": [ - { - "id": 1, - "name": "test_quiz_name" - } ] } diff --git a/tests/mod_quiz/attempt_started/existing_attempt_started/event.json b/tests/mod_quiz/attempt_started/existing_attempt_started/event.json index 0b7d13ec9..b38f241fc 100644 --- a/tests/mod_quiz/attempt_started/existing_attempt_started/event.json +++ b/tests/mod_quiz/attempt_started/existing_attempt_started/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_started", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_started" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_started/existing_attempt_started/statements.json b/tests/mod_quiz/attempt_started/existing_attempt_started/statements.json index 7b332f3e1..abd7ade35 100644 --- a/tests/mod_quiz/attempt_started/existing_attempt_started/statements.json +++ b/tests/mod_quiz/attempt_started/existing_attempt_started/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/start", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_started", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_started" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_started", + "event_name": "\\mod_quiz\\event\\attempt_started", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/attempt_submitted/essay/data.json b/tests/mod_quiz/attempt_submitted/essay/data.json index 2ace8c900..6747e7f43 100644 --- a/tests/mod_quiz/attempt_submitted/essay/data.json +++ b/tests/mod_quiz/attempt_submitted/essay/data.json @@ -1,63 +1,63 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "quiz": [ + "modules": [ { "id": 1, - "name": "test_quiz_name" + "name": "quiz" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "essay", + "questiontext": "test_question" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "test_answer" } ], - "question": [ + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ { "id": 1, - "qtype": "essay", - "name": "test_name", - "questiontext": "test_question" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/essay/event.json b/tests/mod_quiz/attempt_submitted/essay/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/essay/event.json +++ b/tests/mod_quiz/attempt_submitted/essay/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/essay/statements.json b/tests/mod_quiz/attempt_submitted/essay/statements.json index 6d8d575c3..7e5ca244b 100644 --- a/tests/mod_quiz/attempt_submitted/essay/statements.json +++ b/tests/mod_quiz/attempt_submitted/essay/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,87 +109,87 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "test_question" }, - "interactionType": "long-fill-in" + "interactionType": "long-fill-in", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_answer", - "completion": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "response": "test_answer" } } ] diff --git a/tests/mod_quiz/attempt_submitted/essay_null_response/data.json b/tests/mod_quiz/attempt_submitted/essay_null_response/data.json index 73ea53c4f..f660d3a31 100644 --- a/tests/mod_quiz/attempt_submitted/essay_null_response/data.json +++ b/tests/mod_quiz/attempt_submitted/essay_null_response/data.json @@ -1,63 +1,63 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "quiz": [ + "modules": [ { "id": 1, - "name": "test_quiz_name" + "name": "quiz" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "essay", + "questiontext": "test_question" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": null } ], - "question": [ + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ { "id": 1, - "qtype": "essay", - "name": "test_name", - "questiontext": "test_question" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/essay_null_response/event.json b/tests/mod_quiz/attempt_submitted/essay_null_response/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/essay_null_response/event.json +++ b/tests/mod_quiz/attempt_submitted/essay_null_response/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/essay_null_response/statements.json b/tests/mod_quiz/attempt_submitted/essay_null_response/statements.json index bbf55b548..d4af20e40 100644 --- a/tests/mod_quiz/attempt_submitted/essay_null_response/statements.json +++ b/tests/mod_quiz/attempt_submitted/essay_null_response/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,87 +109,87 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "test_question" }, - "interactionType": "long-fill-in" + "interactionType": "long-fill-in", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "", - "completion": false - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": false, + "response": "" } } ] diff --git a/tests/mod_quiz/attempt_submitted/gapselect/data.json b/tests/mod_quiz/attempt_submitted/gapselect/data.json index 7527ed8f5..a7ccbdfe8 100644 --- a/tests/mod_quiz/attempt_submitted/gapselect/data.json +++ b/tests/mod_quiz/attempt_submitted/gapselect/data.json @@ -1,84 +1,84 @@ { - "modules": [ - { - "id": 1, - "name": "quiz" - } - ], - "quiz_attempts": [ - { - "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 - } - ], - "quiz": [ + "grade_grades": [ { - "id": 1, - "name": "test_quiz_name" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], "grade_items": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, "grademax": 100, - "gradepass": 50 + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_attempts": [ + "modules": [ { "id": 1, - "questionusageid": 1, - "questionid": 1, - "rightanswer": "{spicy} {mango} {milkshake}", - "responsesummary": "{spicy} {mango} {milkshake}" + "name": "quiz" } ], "question": [ { "id": 1, - "qtype": "gapselect", "name": "test_name", + "qtype": "gapselect", "questiontext": "

Example [[1]] missing [[2]] words [[3]]

" } ], "question_answers": [ { "id": 1, - "fraction": 1.0, "answer": "spicy", + "fraction": 1.0, "question": 1 }, { "id": 2, - "fraction": 1.0, "answer": "mango", + "fraction": 1.0, "question": 1 }, { "id": 3, - "fraction": 1.0, "answer": "milkshake", + "fraction": 1.0, "question": 1 } ], - "grade_grades": [ + "question_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "questionid": 1, + "questionusageid": 1, + "responsesummary": "{spicy} {mango} {milkshake}", + "rightanswer": "{spicy} {mango} {milkshake}" + } + ], + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], + "quiz_attempts": [ + { + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/gapselect/event.json b/tests/mod_quiz/attempt_submitted/gapselect/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/gapselect/event.json +++ b/tests/mod_quiz/attempt_submitted/gapselect/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/gapselect/statements.json b/tests/mod_quiz/attempt_submitted/gapselect/statements.json index b41257256..39fd3d9de 100644 --- a/tests/mod_quiz/attempt_submitted/gapselect/statements.json +++ b/tests/mod_quiz/attempt_submitted/gapselect/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,95 +109,95 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "Example [[1]] missing [[2]] words [[3]]" }, - "interactionType": "sequencing" + "interactionType": "sequencing", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "spicy[,]mango[,]milkshake", - "completion": true, - "success": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/sequencing/response": [ - "spicy", - "mango", - "milkshake" - ] - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/sequencing/response": [ + "spicy", + "mango", + "milkshake" + ] + }, + "response": "spicy[,]mango[,]milkshake", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/match/data.json b/tests/mod_quiz/attempt_submitted/match/data.json index 564a04052..c8382f94a 100644 --- a/tests/mod_quiz/attempt_submitted/match/data.json +++ b/tests/mod_quiz/attempt_submitted/match/data.json @@ -1,84 +1,84 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_usages": [ + "modules": [ { - "id": 1 + "id": 1, + "name": "quiz" } ], - "quiz": [ + "qtype_match_subquestions": [ { "id": 1, - "name": "test_quiz_name" + "questionid": 1, + "answertext": "Green", + "questiontext": "

Red" + }, + { + "id": 2, + "questionid": 1, + "answertext": "Orange", + "questiontext": "

Blue" + }, + { + "id": 3, + "questionid": 1, + "answertext": "White", + "questiontext": "

Black" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "match", + "questiontext": "test_question" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "Red\n -> Green; Blue\n -> Orange; Black\n -> White", "rightanswer": "Red\n -> Green; Blue\n -> Orange; Black\n -> White" } ], - "question": [ + "question_usages": [ { - "id": 1, - "qtype": "match", - "name": "test_name", - "questiontext": "test_question" + "id": 1 } ], - "qtype_match_subquestions": [ + "quiz": [ { "id": 1, - "questionid": 1, - "questiontext": "

Red", - "answertext": "Green" - }, - { - "id": 2, - "questionid": 1, - "questiontext": "

Blue", - "answertext": "Orange" - }, - { - "id": 3, - "questionid": 1, - "questiontext": "

Black", - "answertext": "White" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/match/event.json b/tests/mod_quiz/attempt_submitted/match/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/match/event.json +++ b/tests/mod_quiz/attempt_submitted/match/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/match/statements.json b/tests/mod_quiz/attempt_submitted/match/statements.json index 3f87ee2f7..a0da96964 100644 --- a/tests/mod_quiz/attempt_submitted/match/statements.json +++ b/tests/mod_quiz/attempt_submitted/match/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,17 +109,16 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, + "correctResponsesPattern": [ + "red[.]green[,]blue[.]orange[,]black[.]white" + ], "description": { "en": "test_question" }, "interactionType": "matching", - "correctResponsesPattern": [ - "red[.]green[,]blue[.]orange[,]black[.]white" - ], + "name": { + "en": "test_name" + }, "source": [ { "id": "red", @@ -159,88 +158,89 @@ "en": "White" } } - ] + ], + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "red[.]green[,]blue[.]orange[,]black[.]white", - "completion": true, - "success": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/matching/response": { - "Red": "Green", - "Blue": "Orange", - "Black": "White" - } - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/matching/response": { + "Black": "White", + "Blue": "Orange", + "Red": "Green" + } + }, + "response": "red[.]green[,]blue[.]orange[,]black[.]white", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/multichoice/data.json b/tests/mod_quiz/attempt_submitted/multichoice/data.json index 26f52b325..15475d97b 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice/data.json +++ b/tests/mod_quiz/attempt_submitted/multichoice/data.json @@ -1,84 +1,84 @@ { - "modules": [ - { - "id": 1, - "name": "quiz" - } - ], - "quiz_attempts": [ - { - "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 - } - ], - "quiz": [ + "grade_grades": [ { - "id": 1, - "name": "test_quiz_name" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], "grade_items": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, "grademax": 100, - "gradepass": 50 + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_attempts": [ + "modules": [ { "id": 1, - "questionusageid": 1, - "questionid": 1, - "responsesummary": "answer 1", - "rightanswer": "answer 1" + "name": "quiz" } ], "question": [ { "id": 1, - "qtype": "multichoice", "name": "test_name", + "qtype": "multichoice", "questiontext": "test_question" } ], "question_answers": [ { "id": 1, - "fraction": 1.0, "answer": "answer 1", + "fraction": 1.0, "question": 1 }, { "id": 2, - "fraction": 1.0, "answer": "answer 2", + "fraction": 1.0, "question": 1 }, { "id": 3, - "fraction": 1.0, "answer": "answer 3", + "fraction": 1.0, "question": 1 } ], - "grade_grades": [ + "question_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "questionid": 1, + "questionusageid": 1, + "responsesummary": "answer 1", + "rightanswer": "answer 1" + } + ], + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], + "quiz_attempts": [ + { + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/multichoice/event.json b/tests/mod_quiz/attempt_submitted/multichoice/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice/event.json +++ b/tests/mod_quiz/attempt_submitted/multichoice/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/multichoice/statements.json b/tests/mod_quiz/attempt_submitted/multichoice/statements.json index 40efe2282..a560b5ded 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice/statements.json +++ b/tests/mod_quiz/attempt_submitted/multichoice/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,91 +109,91 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "test_question" }, - "interactionType": "choice" + "interactionType": "choice", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "answer-1", - "success": true, - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/choice/response": "answer 1" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "answer 1" + }, + "response": "answer-1", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/data.json b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/data.json index d6edf04cd..7434a7683 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/data.json +++ b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/data.json @@ -1,72 +1,72 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_usages": [ + "modules": [ { - "id": 1 + "id": 1, + "name": "quiz" } ], - "quiz": [ + "question": [ { "id": 1, - "name": "test_quiz_name" + "name": "test_name", + "qtype": "multichoice", + "questiontext": "test_question" } ], - "grade_items": [ + "question_answers": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "answer": "answer 1", + "fraction": 1.0, + "question": 1 } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "answer 1", "rightanswer": "answer 1" } ], - "question": [ + "question_usages": [ { - "id": 1, - "qtype": "multichoice", - "name": "test_name", - "questiontext": "test_question" + "id": 1 } ], - "question_answers": [ + "quiz": [ { "id": 1, - "fraction": 1.0, - "answer": "answer 1", - "question": 1 + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/event.json b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/event.json +++ b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/statements.json b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/statements.json index b793122cf..28d7419b4 100644 --- a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/statements.json +++ b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,17 +109,6 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, - "description": { - "en": "test_question" - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "answer-1" - ], "choices": [ { "id": "answer-1", @@ -127,84 +116,95 @@ "en": "answer 1" } } - ] + ], + "correctResponsesPattern": [ + "answer-1" + ], + "description": { + "en": "test_question" + }, + "interactionType": "choice", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "answer-1", - "success": true, - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/choice/response": "answer 1" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "answer 1" + }, + "response": "answer-1", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset/data.json b/tests/mod_quiz/attempt_submitted/multichoiceset/data.json index 0fc560517..94b0f028e 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset/data.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset/data.json @@ -1,84 +1,84 @@ { - "modules": [ - { - "id": 1, - "name": "quiz" - } - ], - "quiz_attempts": [ - { - "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 - } - ], - "quiz": [ + "grade_grades": [ { - "id": 1, - "name": "test_quiz_name" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], "grade_items": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, "grademax": 100, - "gradepass": 50 + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_attempts": [ + "modules": [ { "id": 1, - "questionusageid": 1, - "questionid": 1, - "responsesummary": "answer 1; answer 2", - "rightanswer": "answer 1; answer 2" + "name": "quiz" } ], "question": [ { "id": 1, - "qtype": "multichoiceset", "name": "test_name", + "qtype": "multichoiceset", "questiontext": "test_question" } ], "question_answers": [ { "id": 1, - "fraction": 1.0, "answer": "answer 1", + "fraction": 1.0, "question": 1 }, { "id": 2, - "fraction": 1.0, "answer": "answer 2", + "fraction": 1.0, "question": 1 }, { "id": 3, - "fraction": 1.0, "answer": "answer 3", + "fraction": 1.0, "question": 1 } ], - "grade_grades": [ + "question_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "questionid": 1, + "questionusageid": 1, + "responsesummary": "answer 1; answer 2", + "rightanswer": "answer 1; answer 2" + } + ], + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], + "quiz_attempts": [ + { + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset/event.json b/tests/mod_quiz/attempt_submitted/multichoiceset/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset/event.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset/statements.json b/tests/mod_quiz/attempt_submitted/multichoiceset/statements.json index 93318b4e1..e979f7c45 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset/statements.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,91 +109,91 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "test_question" }, - "interactionType": "choice" + "interactionType": "choice", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "answer-1[,]answer-2", - "success": true, - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/choice/response": "answer 1; answer 2" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "answer 1; answer 2" + }, + "response": "answer-1[,]answer-2", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/data.json b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/data.json index 0fc560517..94b0f028e 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/data.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/data.json @@ -1,84 +1,84 @@ { - "modules": [ - { - "id": 1, - "name": "quiz" - } - ], - "quiz_attempts": [ - { - "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 - } - ], - "quiz": [ + "grade_grades": [ { - "id": 1, - "name": "test_quiz_name" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], "grade_items": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, "grademax": 100, - "gradepass": 50 + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_attempts": [ + "modules": [ { "id": 1, - "questionusageid": 1, - "questionid": 1, - "responsesummary": "answer 1; answer 2", - "rightanswer": "answer 1; answer 2" + "name": "quiz" } ], "question": [ { "id": 1, - "qtype": "multichoiceset", "name": "test_name", + "qtype": "multichoiceset", "questiontext": "test_question" } ], "question_answers": [ { "id": 1, - "fraction": 1.0, "answer": "answer 1", + "fraction": 1.0, "question": 1 }, { "id": 2, - "fraction": 1.0, "answer": "answer 2", + "fraction": 1.0, "question": 1 }, { "id": 3, - "fraction": 1.0, "answer": "answer 3", + "fraction": 1.0, "question": 1 } ], - "grade_grades": [ + "question_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "questionid": 1, + "questionusageid": 1, + "responsesummary": "answer 1; answer 2", + "rightanswer": "answer 1; answer 2" + } + ], + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], + "quiz_attempts": [ + { + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/event.json b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/event.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/statements.json b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/statements.json index 85bca33a6..7c7195a93 100644 --- a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/statements.json +++ b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,17 +109,6 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, - "description": { - "en": "test_question" - }, - "interactionType": "choice", - "correctResponsesPattern": [ - "answer-1[,]answer-2" - ], "choices": [ { "id": "answer-1", @@ -139,84 +128,95 @@ "en": "answer 3" } } - ] + ], + "correctResponsesPattern": [ + "answer-1[,]answer-2" + ], + "description": { + "en": "test_question" + }, + "interactionType": "choice", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "answer-1[,]answer-2", - "success": true, - "completion": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/choice/response": "answer 1; answer 2" - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/choice/response": "answer 1; answer 2" + }, + "response": "answer-1[,]answer-2", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/no_questions/data.json b/tests/mod_quiz/attempt_submitted/no_questions/data.json index 78b3fe959..e1a7ef703 100644 --- a/tests/mod_quiz/attempt_submitted/no_questions/data.json +++ b/tests/mod_quiz/attempt_submitted/no_questions/data.json @@ -1,21 +1,29 @@ { - "modules": [ + "grade_grades": [ + { + "itemid": 1, + "userid": 1, + "rawgrade": 50 + } + ], + "grade_items": [ { "id": 1, - "name": "quiz" + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "quiz_attempts": [ + "modules": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "name": "quiz" } ], + "question": [], + "question_attempts": [], "question_usages": [ { "id": 1 @@ -27,23 +35,15 @@ "name": "test_quiz_name" } ], - "grade_items": [ + "quiz_attempts": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 - } - ], - "question_attempts": [], - "question": [], - "grade_grades": [ - { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/no_questions/event.json b/tests/mod_quiz/attempt_submitted/no_questions/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/no_questions/event.json +++ b/tests/mod_quiz/attempt_submitted/no_questions/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/no_questions/statements.json b/tests/mod_quiz/attempt_submitted/no_questions/statements.json index 624e3fb43..32f97d50b 100644 --- a/tests/mod_quiz/attempt_submitted/no_questions/statements.json +++ b/tests/mod_quiz/attempt_submitted/no_questions/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,80 +16,80 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/numerical/data.json b/tests/mod_quiz/attempt_submitted/numerical/data.json index af500f883..f8f4b4c24 100644 --- a/tests/mod_quiz/attempt_submitted/numerical/data.json +++ b/tests/mod_quiz/attempt_submitted/numerical/data.json @@ -1,80 +1,80 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_usages": [ + "modules": [ { - "id": 1 + "id": 1, + "name": "quiz" } ], - "quiz": [ + "question": [ { "id": 1, - "name": "test_quiz_name" + "name": "test_name", + "qtype": "numerical", + "questiontext": "test_question" } ], - "grade_items": [ + "question_answers": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "answer": 10, + "fraction": 1.0, + "question": 1 } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "11", "rightanswer": "10" } ], - "question": [ + "question_numerical": [ { "id": 1, - "qtype": "numerical", - "name": "test_name", - "questiontext": "test_question" + "answer": 1, + "question": 1, + "tolerance": 5 } ], - "question_answers": [ + "question_usages": [ { - "id": 1, - "fraction": 1.0, - "answer": 10, - "question": 1 + "id": 1 } ], - "question_numerical": [ + "quiz": [ { "id": 1, - "tolerance": 5, - "question": 1, - "answer": 1 + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/numerical/event.json b/tests/mod_quiz/attempt_submitted/numerical/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/numerical/event.json +++ b/tests/mod_quiz/attempt_submitted/numerical/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/numerical/statements.json b/tests/mod_quiz/attempt_submitted/numerical/statements.json index b0130cab9..f21926fbe 100644 --- a/tests/mod_quiz/attempt_submitted/numerical/statements.json +++ b/tests/mod_quiz/attempt_submitted/numerical/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,94 +109,94 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, + "correctResponsesPattern": [ + "5[:]15" + ], "description": { "en": "test_question" }, "interactionType": "numeric", - "correctResponsesPattern": [ - "5[:]15" - ] + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "11", - "completion": true, - "success": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/numeric/response": 11 - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/numeric/response": 11 + }, + "response": "11", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/data.json b/tests/mod_quiz/attempt_submitted/randomsamatch/data.json index 2243b592d..c93b23dcc 100644 --- a/tests/mod_quiz/attempt_submitted/randomsamatch/data.json +++ b/tests/mod_quiz/attempt_submitted/randomsamatch/data.json @@ -1,78 +1,78 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_usages": [ + "modules": [ { - "id": 1 + "id": 1, + "name": "quiz" } ], - "quiz": [ + "qtype_match_subquestions": [ { "id": 1, - "name": "test_quiz_name" + "questionid": 1, + "answertext": "orange", + "questiontext": "

Example short answer question" + }, + { + "id": 2, + "questionid": 1, + "answertext": "Purple", + "questiontext": "

Testing testing" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "randomsamatch", + "questiontext": "

Example Random short-answer matching question

" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, - "rightanswer": "Example short answer question\n -> orange; Testing testing\n -> Purple", - "responsesummary": "Example short answer question\n -> orange; Testing testing\n -> Purple" + "questionusageid": 1, + "responsesummary": "Example short answer question\n -> orange; Testing testing\n -> Purple", + "rightanswer": "Example short answer question\n -> orange; Testing testing\n -> Purple" } ], - "question": [ + "question_usages": [ { - "id": 1, - "qtype": "randomsamatch", - "name": "test_name", - "questiontext": "

Example Random short-answer matching question

" + "id": 1 } ], - "qtype_match_subquestions": [ + "quiz": [ { "id": 1, - "questionid": 1, - "questiontext": "

Example short answer question", - "answertext": "orange" - }, - { - "id": 2, - "questionid": 1, - "questiontext": "

Testing testing", - "answertext": "Purple" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/event.json b/tests/mod_quiz/attempt_submitted/randomsamatch/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/randomsamatch/event.json +++ b/tests/mod_quiz/attempt_submitted/randomsamatch/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json b/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json index 96fa6117d..f0dee6fb7 100644 --- a/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json +++ b/tests/mod_quiz/attempt_submitted/randomsamatch/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,17 +109,16 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, + "correctResponsesPattern": [ + "example-short-answer-question[.]orange[,]testing-testing[.]purple" + ], "description": { "en": "Example Random short-answer matching question" }, "interactionType": "matching", - "correctResponsesPattern": [ - "example-short-answer-question[.]orange[,]testing-testing[.]purple" - ], + "name": { + "en": "test_name" + }, "source": [ { "id": "example-short-answer-question", @@ -147,87 +146,88 @@ "en": "Purple" } } - ] + ], + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "example-short-answer-question[.]orange[,]testing-testing[.]purple", - "completion": true, - "success": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/matching/response": { - "Example short answer question": "orange", - "Testing testing": "Purple" - } - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/matching/response": { + "Example short answer question": "orange", + "Testing testing": "Purple" + } + }, + "response": "example-short-answer-question[.]orange[,]testing-testing[.]purple", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/data.json b/tests/mod_quiz/attempt_submitted/shortanswer/data.json index 61e655fc0..280cf7cae 100644 --- a/tests/mod_quiz/attempt_submitted/shortanswer/data.json +++ b/tests/mod_quiz/attempt_submitted/shortanswer/data.json @@ -1,63 +1,63 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "quiz": [ + "modules": [ { "id": 1, - "name": "test_quiz_name" + "name": "quiz" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "shortanswer", + "questiontext": "test_question" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "test_answer" } ], - "question": [ + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ { "id": 1, - "qtype": "shortanswer", - "name": "test_name", - "questiontext": "test_question" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/event.json b/tests/mod_quiz/attempt_submitted/shortanswer/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/shortanswer/event.json +++ b/tests/mod_quiz/attempt_submitted/shortanswer/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/statements.json b/tests/mod_quiz/attempt_submitted/shortanswer/statements.json index 1defe052b..49ba89e54 100644 --- a/tests/mod_quiz/attempt_submitted/shortanswer/statements.json +++ b/tests/mod_quiz/attempt_submitted/shortanswer/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,87 +109,87 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, "description": { "en": "test_question" }, - "interactionType": "fill-in" + "interactionType": "fill-in", + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "test_answer", - "completion": true - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "response": "test_answer" } } ] diff --git a/tests/mod_quiz/attempt_submitted/truefalse/data.json b/tests/mod_quiz/attempt_submitted/truefalse/data.json index dcc44ad27..59dfa2eee 100644 --- a/tests/mod_quiz/attempt_submitted/truefalse/data.json +++ b/tests/mod_quiz/attempt_submitted/truefalse/data.json @@ -1,78 +1,78 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "question_usages": [ + "modules": [ { - "id": 1 + "id": 1, + "name": "quiz" } ], - "quiz": [ + "question": [ { "id": 1, - "name": "test_quiz_name" + "name": "test_name", + "qtype": "truefalse", + "questiontext": "test_question" } ], - "grade_items": [ + "question_answers": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "answer": "True", + "fraction": 1.0, + "question": 1 + }, + { + "id": 2, + "answer": "False", + "fraction": 0.0, + "question": 1 } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "True", "rightanswer": "True" } ], - "question": [ + "question_usages": [ { - "id": 1, - "qtype": "truefalse", - "name": "test_name", - "questiontext": "test_question" + "id": 1 } ], - "question_answers": [ + "quiz": [ { "id": 1, - "fraction": 1.0, - "answer": "True", - "question": 1 - }, - { - "id": 2, - "fraction": 0.0, - "answer": "False", - "question": 1 + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/truefalse/event.json b/tests/mod_quiz/attempt_submitted/truefalse/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/truefalse/event.json +++ b/tests/mod_quiz/attempt_submitted/truefalse/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/truefalse/statements.json b/tests/mod_quiz/attempt_submitted/truefalse/statements.json index c8a7bc149..7976472f8 100644 --- a/tests/mod_quiz/attempt_submitted/truefalse/statements.json +++ b/tests/mod_quiz/attempt_submitted/truefalse/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,89 +16,89 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } }, { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/answered", @@ -109,94 +109,94 @@ "object": { "id": "http://www.example.org/question/question.php?cmid=1&id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/cmi.interaction", - "name": { - "en": "test_name" - }, + "correctResponsesPattern": [ + "true" + ], "description": { "en": "test_question" }, "interactionType": "true-false", - "correctResponsesPattern": [ - "true" - ] + "name": { + "en": "test_name" + }, + "type": "http://adlnet.gov/expapi/activities/cmi.interaction" }, "objectType": "Activity" }, - "result": { - "response": "true", - "completion": true, - "success": true, - "extensions": { - "http://learninglocker.net/xapi/cmi/true-false/response": true - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "extensions": { + "http://learninglocker.net/xapi/cmi/true-false/response": true + }, + "response": "true", + "success": true } } ] diff --git a/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json b/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json index 4fc1c6fe5..80591a1d5 100644 --- a/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json +++ b/tests/mod_quiz/attempt_submitted/unknown_qtype/data.json @@ -1,63 +1,63 @@ { - "modules": [ + "grade_grades": [ { - "id": 1, - "name": "quiz" + "itemid": 1, + "userid": 1, + "rawgrade": 50 } ], - "quiz_attempts": [ + "grade_items": [ { "id": 1, - "quiz": 1, - "uniqueid": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0 - } - ], - "question_usages": [ - { - "id": 1 + "grademax": 100, + "grademin": 0, + "gradepass": 50, + "iteminstance": 1, + "itemmodule": "quiz" } ], - "quiz": [ + "modules": [ { "id": 1, - "name": "test_quiz_name" + "name": "quiz" } ], - "grade_items": [ + "question": [ { "id": 1, - "iteminstance": 1, - "itemmodule": "quiz", - "grademin": 0, - "grademax": 100, - "gradepass": 50 + "name": "test_name", + "qtype": "unknown", + "questiontext": "test_question" } ], "question_attempts": [ { "id": 1, - "questionusageid": 1, "questionid": 1, + "questionusageid": 1, "responsesummary": "test_answer" } ], - "question": [ + "question_usages": [ + { + "id": 1 + } + ], + "quiz": [ { "id": 1, - "qtype": "unknown", - "name": "test_name", - "questiontext": "test_question" + "name": "test_quiz_name" } ], - "grade_grades": [ + "quiz_attempts": [ { - "itemid": 1, - "userid": 1, - "rawgrade": 50 + "id": 1, + "uniqueid": 1, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ] } diff --git a/tests/mod_quiz/attempt_submitted/unknown_qtype/event.json b/tests/mod_quiz/attempt_submitted/unknown_qtype/event.json index 87f94acf8..4f15fb522 100644 --- a/tests/mod_quiz/attempt_submitted/unknown_qtype/event.json +++ b/tests/mod_quiz/attempt_submitted/unknown_qtype/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "relateduserid": 1, - "courseid": 1, - "timecreated": 1433946701, + "eventname": "\\mod_quiz\\event\\attempt_submitted", "objecttable": "attempt", - "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_submitted" + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_submitted/unknown_qtype/statements.json b/tests/mod_quiz/attempt_submitted/unknown_qtype/statements.json index 624e3fb43..32f97d50b 100644 --- a/tests/mod_quiz/attempt_submitted/unknown_qtype/statements.json +++ b/tests/mod_quiz/attempt_submitted/unknown_qtype/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,80 +16,80 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 50, - "min": 0, - "max": 100, - "scaled": 0.0 - }, - "completion": true, - "success": true, - "duration": "PT1S" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_submitted", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_submitted\\handler", + "event_name": "\\mod_quiz\\event\\attempt_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "completion": true, + "duration": "PT1S", + "score": { + "max": 100, + "min": 0, + "raw": 50, + "scaled": 0.0 + }, + "success": true } } ] diff --git a/tests/mod_quiz/attempt_viewed/existing_module/data.json b/tests/mod_quiz/attempt_viewed/existing_module/data.json index cbdad7191..4110000b5 100644 --- a/tests/mod_quiz/attempt_viewed/existing_module/data.json +++ b/tests/mod_quiz/attempt_viewed/existing_module/data.json @@ -5,20 +5,20 @@ "name": "quiz" } ], + "quiz": [ + { + "id": 1, + "name": "test_quiz_name" + } + ], "quiz_attempts": [ { "id": 1, "quiz": 1, - "sumgrades": 50, "state": "finished", + "sumgrades": 50, "timefinish": 1, "timestart": 0 } - ], - "quiz": [ - { - "id": 1, - "name": "test_quiz_name" - } ] } diff --git a/tests/mod_quiz/attempt_viewed/existing_module/event.json b/tests/mod_quiz/attempt_viewed/existing_module/event.json index 40b02d227..548b784e1 100644 --- a/tests/mod_quiz/attempt_viewed/existing_module/event.json +++ b/tests/mod_quiz/attempt_viewed/existing_module/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\attempt_viewed" + "userid": 1, + "eventname": "\\mod_quiz\\event\\attempt_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/attempt_viewed/existing_module/statements.json b/tests/mod_quiz/attempt_viewed/existing_module/statements.json index 7deeefb43..f0d01decc 100644 --- a/tests/mod_quiz/attempt_viewed/existing_module/statements.json +++ b/tests/mod_quiz/attempt_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\attempt_viewed", - "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\attempt_viewed", + "event_name": "\\mod_quiz\\event\\attempt_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/course_module_viewed/existing_module/event.json b/tests/mod_quiz/course_module_viewed/existing_module/event.json index 192562757..deea0a769 100644 --- a/tests/mod_quiz/course_module_viewed/existing_module/event.json +++ b/tests/mod_quiz/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\course_module_viewed" + "eventname": "\\mod_quiz\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/course_module_viewed/existing_module/statements.json b/tests/mod_quiz/course_module_viewed/existing_module/statements.json index a48b35daa..03b0bff60 100644 --- a/tests/mod_quiz/course_module_viewed/existing_module/statements.json +++ b/tests/mod_quiz/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_quiz\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_quiz/question_manually_graded/data.json b/tests/mod_quiz/question_manually_graded/data.json index 24db1113b..a49ddec95 100644 --- a/tests/mod_quiz/question_manually_graded/data.json +++ b/tests/mod_quiz/question_manually_graded/data.json @@ -1,31 +1,24 @@ { - "user": [ + "modules": [ { "id": 1, - "firstname": "test_instructor_fullname", - "email": "instructor@test.com" - }, - { - "id": 2, - "firstname": "test_learner_fullname", - "email": "learner@test.com" + "name": "quiz" } ], - "modules": [ + "question_attempt_steps": [ { "id": 1, - "name": "quiz" + "questionattemptid": 1, + "fraction": 0.5, + "sequencenumber": 1 } ], - "quiz_attempts": [ + "question_attempts": [ { "id": 1, - "quiz": 1, - "sumgrades": 50, - "state": "finished", - "timefinish": 1, - "timestart": 0, - "userid": 2 + "questionusageid": 1, + "maxfraction": 1.0, + "minfraction": 0.0 } ], "quiz": [ @@ -34,20 +27,27 @@ "name": "test_quiz_name" } ], - "question_attempts": [ + "quiz_attempts": [ { "id": 1, - "questionusageid": 1, - "minfraction": 0.0, - "maxfraction": 1.0 + "userid": 2, + "quiz": 1, + "state": "finished", + "sumgrades": 50, + "timefinish": 1, + "timestart": 0 } ], - "question_attempt_steps": [ + "user": [ { "id": 1, - "questionattemptid": 1, - "fraction": 0.5, - "sequencenumber": 1 + "firstname": "test_instructor_fullname", + "email": "instructor@test.com" + }, + { + "id": 2, + "firstname": "test_learner_fullname", + "email": "learner@test.com" } ] } diff --git a/tests/mod_quiz/question_manually_graded/event.json b/tests/mod_quiz/question_manually_graded/event.json index 74cfdea49..0cc7f4227 100644 --- a/tests/mod_quiz/question_manually_graded/event.json +++ b/tests/mod_quiz/question_manually_graded/event.json @@ -1,12 +1,12 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "objecttable": "quiz", "objectid": 1, - "contextinstanceid": 1, - "eventname": "\\mod_quiz\\event\\question_manually_graded", "relateduserid": null, - "other": "a:3:{s:6:\"quizid\";s:1:\"1\";s:9:\"attemptid\";s:1:\"1\";s:4:\"slot\";i:1;}" + "userid": 1, + "eventname": "\\mod_quiz\\event\\question_manually_graded", + "objecttable": "quiz", + "other": "a:3:{s:6:\"quizid\";s:1:\"1\";s:9:\"attemptid\";s:1:\"1\";s:4:\"slot\";i:1;}", + "timecreated": 1433946701 } diff --git a/tests/mod_quiz/question_manually_graded/statements.json b/tests/mod_quiz/question_manually_graded/statements.json index 1d7c66a0a..340d06b7c 100644 --- a/tests/mod_quiz/question_manually_graded/statements.json +++ b/tests/mod_quiz/question_manually_graded/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_learner_fullname", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_learner_fullname" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/scored", @@ -16,103 +16,103 @@ "object": { "id": "http://www.example.org/review.php?attempt=1&slot=1", "definition": { - "type": "http://activitystrea.ms/schema/1.0/review#slot", "name": { "en": "test_quiz_name Review Slot 1" - } + }, + "type": "http://activitystrea.ms/schema/1.0/review#slot" }, "objectType": "Activity" }, - "result": { - "score": { - "min": 0, - "max": 1, - "raw": 0.5, - "scaled": 0.0 - } - }, "context": { - "instructor": { - "name": "test_instructor_fullname", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_quiz\\event\\question_manually_graded", - "event_function": "\\src\\transformer\\events\\mod_quiz\\question_manually_graded" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/review.php?attempt=1", "definition": { - "type": "http://activitystrea.ms/schema/1.0/review", "name": { "en": "Review" - } + }, + "type": "http://activitystrea.ms/schema/1.0/review" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/attempt.php?attempt=1&cmid=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/attempt", "name": { "en": "test_quiz_name Attempt 1" - } + }, + "type": "http://adlnet.gov/expapi/activities/attempt" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/quiz/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/assessment", "name": { "en": "test_quiz_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/assessment" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_quiz\\question_manually_graded", + "event_name": "\\mod_quiz\\event\\question_manually_graded", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_instructor_fullname" + }, + "language": "en" + }, + "result": { + "score": { + "max": 1, + "min": 0, + "raw": 0.5, + "scaled": 0.0 } } } diff --git a/tests/mod_resource/course_module_viewed/existing_module/event.json b/tests/mod_resource/course_module_viewed/existing_module/event.json index ce6deb9d2..d50d9599e 100644 --- a/tests/mod_resource/course_module_viewed/existing_module/event.json +++ b/tests/mod_resource/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_resource\\event\\course_module_viewed" + "eventname": "\\mod_resource\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_resource/course_module_viewed/existing_module/statements.json b/tests/mod_resource/course_module_viewed/existing_module/statements.json index 36f3c61c6..2c8a9c200 100644 --- a/tests/mod_resource/course_module_viewed/existing_module/statements.json +++ b/tests/mod_resource/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/resource/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/resource", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/resource" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_resource\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_resource\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_scorm/course_module_viewed/existing_module/event.json b/tests/mod_scorm/course_module_viewed/existing_module/event.json index 4b6efd2a4..5ed94e78c 100644 --- a/tests/mod_scorm/course_module_viewed/existing_module/event.json +++ b/tests/mod_scorm/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_scorm\\event\\course_module_viewed" + "eventname": "\\mod_scorm\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_scorm/course_module_viewed/existing_module/statements.json b/tests/mod_scorm/course_module_viewed/existing_module/statements.json index aeb530b53..33fc81fa9 100644 --- a/tests/mod_scorm/course_module_viewed/existing_module/statements.json +++ b/tests/mod_scorm/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/scorm/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/module", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/module" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_scorm\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_scorm\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_scorm/sco_launched/existing_sco_launched/event.json b/tests/mod_scorm/sco_launched/existing_sco_launched/event.json index 6294bca5d..d57bfefac 100644 --- a/tests/mod_scorm/sco_launched/existing_sco_launched/event.json +++ b/tests/mod_scorm/sco_launched/existing_sco_launched/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, + "userid": 1, "eventname": "\\mod_scorm\\event\\sco_launched", - "contextinstanceid": 1 + "timecreated": 1433946701 } diff --git a/tests/mod_scorm/sco_launched/existing_sco_launched/statements.json b/tests/mod_scorm/sco_launched/existing_sco_launched/statements.json index df4fcb25d..c3157ae45 100644 --- a/tests/mod_scorm/sco_launched/existing_sco_launched/statements.json +++ b/tests/mod_scorm/sco_launched/existing_sco_launched/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/launched", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/scorm/view.php?id=1#sco", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object", "name": { "en": "test_name Content" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_scorm\\event\\sco_launched", - "event_function": "\\src\\transformer\\events\\mod_scorm\\sco_launched" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/scorm/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/module", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/module" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_scorm\\sco_launched", + "event_name": "\\mod_scorm\\event\\sco_launched", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/data.json b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/data.json index 7123dcfaa..41ed38df7 100644 --- a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/data.json +++ b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/data.json @@ -14,27 +14,27 @@ "scorm_scoes_track": [ { "id": 1, - "userid": 1, - "scormid": 1, "scoid": 1, + "scormid": 1, + "userid": 1, "attempt": 1, "element": "cmi.core.lesson_status", "value": "completed" }, { "id": 2, - "userid": 1, - "scormid": 1, "scoid": 1, + "scormid": 1, + "userid": 1, "attempt": 1, "element": "cmi.core.score.min", "value": 0 }, { "id": 3, - "userid": 1, - "scormid": 1, "scoid": 1, + "scormid": 1, + "userid": 1, "attempt": 1, "element": "cmi.core.score.max", "value": 100 diff --git a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/event.json b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/event.json index 74f9f5ff1..eb6d52639 100644 --- a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/event.json +++ b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, + "userid": 1, "eventname": "\\mod_scorm\\event\\scoreraw_submitted", "other": "a:2:{s:8:\"cmivalue\";i:100;s:9:\"attemptid\";i:1;}", - "contextinstanceid": 1 + "timecreated": 1433946701 } diff --git a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/statements.json b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/statements.json index 0a6dcb00b..5f78d48df 100644 --- a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/statements.json +++ b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,76 +16,76 @@ "object": { "id": "http://www.example.org/mod/scorm/view.php?id=1#sco", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object", "name": { "en": "test_name Content" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object" }, "objectType": "Activity" }, - "result": { - "score": { - "raw": 100, - "min": 0, - "max": 100, - "scaled": 1 - } - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_scorm\\event\\scoreraw_submitted", - "event_function": "\\src\\transformer\\events\\mod_scorm\\scoreraw_submitted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/scorm/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/module", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/module" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_scorm\\scoreraw_submitted", + "event_name": "\\mod_scorm\\event\\scoreraw_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "score": { + "max": 100, + "min": 0, + "raw": 100, + "scaled": 1 } } } diff --git a/tests/mod_scorm/status_submitted/existing_status_submitted/data.json b/tests/mod_scorm/status_submitted/existing_status_submitted/data.json index 29006b340..83a49eb12 100644 --- a/tests/mod_scorm/status_submitted/existing_status_submitted/data.json +++ b/tests/mod_scorm/status_submitted/existing_status_submitted/data.json @@ -14,9 +14,9 @@ "scorm_scoes_track": [ { "id": 1, - "userid": 1, - "scormid": 1, "scoid": 1, + "scormid": 1, + "userid": 1, "attempt": 1, "element": "cmi.core.lesson_status", "value": "completed" diff --git a/tests/mod_scorm/status_submitted/existing_status_submitted/event.json b/tests/mod_scorm/status_submitted/existing_status_submitted/event.json index a0a67f3d7..09e99e1f9 100644 --- a/tests/mod_scorm/status_submitted/existing_status_submitted/event.json +++ b/tests/mod_scorm/status_submitted/existing_status_submitted/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, - "userid": 1, - "courseid": 1, - "timecreated": 1433946701, "objectid": 1, + "userid": 1, "eventname": "\\mod_scorm\\event\\status_submitted", "other": "a:1:{s:9:\"attemptid\";i:1;}", - "contextinstanceid": 1 + "timecreated": 1433946701 } diff --git a/tests/mod_scorm/status_submitted/existing_status_submitted/statements.json b/tests/mod_scorm/status_submitted/existing_status_submitted/statements.json index 8b333dcf8..3e617b944 100644 --- a/tests/mod_scorm/status_submitted/existing_status_submitted/statements.json +++ b/tests/mod_scorm/status_submitted/existing_status_submitted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/completed", @@ -16,69 +16,69 @@ "object": { "id": "http://www.example.org/mod/scorm/view.php?id=1#sco", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object", "name": { "en": "test_name Content" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/scorm-content-object" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_scorm\\event\\status_submitted", - "event_function": "\\src\\transformer\\events\\mod_scorm\\status_submitted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/scorm/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/module", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/module" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_scorm\\status_submitted", + "event_name": "\\mod_scorm\\event\\status_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_survey/course_module_viewed/existing_module/event.json b/tests/mod_survey/course_module_viewed/existing_module/event.json index 534febc89..a4dd5547a 100644 --- a/tests/mod_survey/course_module_viewed/existing_module/event.json +++ b/tests/mod_survey/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_survey\\event\\course_module_viewed" + "eventname": "\\mod_survey\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_survey/course_module_viewed/existing_module/statements.json b/tests/mod_survey/course_module_viewed/existing_module/statements.json index 6da1afba6..89058abe5 100644 --- a/tests/mod_survey/course_module_viewed/existing_module/statements.json +++ b/tests/mod_survey/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,62 +16,62 @@ "object": { "id": "http://www.example.org/mod/survey/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_survey\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_survey\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_survey/report_viewed/event.json b/tests/mod_survey/report_viewed/event.json index 83b6f7e6b..46d0101bc 100644 --- a/tests/mod_survey/report_viewed/event.json +++ b/tests/mod_survey/report_viewed/event.json @@ -1,12 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_survey\\event\\report_viewed", - "objectid": 1, - "contextinstanceid": 1, "objecttable": "survey", - "other": "a:2:{s:6:\"action\";s:7:\"summary\";s:7:\"groupid\";i:0;}" + "other": "a:2:{s:6:\"action\";s:7:\"summary\";s:7:\"groupid\";i:0;}", + "timecreated": 1433946701 } diff --git a/tests/mod_survey/report_viewed/statements.json b/tests/mod_survey/report_viewed/statements.json index ab8843042..334387dfe 100644 --- a/tests/mod_survey/report_viewed/statements.json +++ b/tests/mod_survey/report_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -15,73 +15,73 @@ }, "object": { "id": "http://www.example.org/mod/survey/report.php?id=1&action=summary", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/report", "name": { "en": "test_name Report: Summary" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/report" + }, + "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_survey\\event\\report_viewed", - "event_function": "\\src\\transformer\\events\\mod_survey\\report_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/survey/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_survey\\report_viewed", + "event_name": "\\mod_survey\\event\\report_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_survey/response_submitted/event.json b/tests/mod_survey/response_submitted/event.json index 846da2424..e1ce8b1e8 100644 --- a/tests/mod_survey/response_submitted/event.json +++ b/tests/mod_survey/response_submitted/event.json @@ -1,12 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": null, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_survey\\event\\response_submitted", - "objectid": null, - "contextinstanceid": 1, "objecttable": null, - "other": "a:1:{s:8:\"surveyid\";s:1:\"1\";}" + "other": "a:1:{s:8:\"surveyid\";s:1:\"1\";}", + "timecreated": 1433946701 } diff --git a/tests/mod_survey/response_submitted/statements.json b/tests/mod_survey/response_submitted/statements.json index ee8396a17..3081edcbf 100644 --- a/tests/mod_survey/response_submitted/statements.json +++ b/tests/mod_survey/response_submitted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/submit", @@ -16,62 +16,62 @@ "object": { "id": "http://www.example.org/mod/survey/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/survey", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "http://id.tincanapi.com/activitytype/survey" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_survey\\event\\response_submitted", - "event_function": "\\src\\transformer\\events\\mod_survey\\response_submitted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_survey\\response_submitted", + "event_name": "\\mod_survey\\event\\response_submitted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_url/course_module_viewed/existing_module/event.json b/tests/mod_url/course_module_viewed/existing_module/event.json index a53aebe10..60ba8c7a1 100644 --- a/tests/mod_url/course_module_viewed/existing_module/event.json +++ b/tests/mod_url/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_url\\event\\course_module_viewed" + "eventname": "\\mod_url\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_url/course_module_viewed/existing_module/statements.json b/tests/mod_url/course_module_viewed/existing_module/statements.json index edf9d3e4d..72f46a962 100644 --- a/tests/mod_url/course_module_viewed/existing_module/statements.json +++ b/tests/mod_url/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/url/view.php?id=1", "definition": { - "type": "http://adlnet.gov/expapi/activities/link", "name": { "en": "test_name" - } + }, + "type": "http://adlnet.gov/expapi/activities/link" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_url\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_url\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_wiki/comment_created/data.json b/tests/mod_wiki/comment_created/data.json index 3a53fc490..e4c3ec844 100644 --- a/tests/mod_wiki/comment_created/data.json +++ b/tests/mod_wiki/comment_created/data.json @@ -1,4 +1,11 @@ { + "comments": [ + { + "id": 1, + "itemid": 1, + "content": "

test_content

" + } + ], "modules": [ { "id": 1, @@ -12,25 +19,18 @@ "intro": "

test_intro

" } ], - "wiki_subwikis": [ - { - "id": 1, - "wikiid": 1 - } - ], "wiki_pages": [ { "id": 1, "subwikiid": 1, - "title": "test_page_title", - "cachedcontent": "

test_content

" + "cachedcontent": "

test_content

", + "title": "test_page_title" } ], - "comments": [ + "wiki_subwikis": [ { "id": 1, - "content": "

test_content

", - "itemid": 1 + "wikiid": 1 } ] } diff --git a/tests/mod_wiki/comment_created/event.json b/tests/mod_wiki/comment_created/event.json index 4dc8129a5..682c3e710 100644 --- a/tests/mod_wiki/comment_created/event.json +++ b/tests/mod_wiki/comment_created/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_wiki\\event\\comment_created", - "objectid": 1, - "objecttable": "comments" + "objecttable": "comments", + "timecreated": 1433946701 } diff --git a/tests/mod_wiki/comment_created/statements.json b/tests/mod_wiki/comment_created/statements.json index 69d2126ee..d84ad33ef 100644 --- a/tests/mod_wiki/comment_created/statements.json +++ b/tests/mod_wiki/comment_created/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://adlnet.gov/expapi/verbs/commented", @@ -16,88 +16,88 @@ "object": { "id": "http://www.example.org/mod/wiki/comments.php?pageid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_page_title Discussion" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, - "result": { - "response": "test_content" - }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_wiki\\event\\comment_created", - "event_function": "\\src\\transformer\\events\\mod_wiki\\comment_created" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/wiki/view.php?pageid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page", + "description": { + "en": "test_content" + }, "name": { "en": "test_page_title" }, - "description": { - "en": "test_content" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/wiki/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_wiki\\comment_created", + "event_name": "\\mod_wiki\\event\\comment_created", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" + }, + "result": { + "response": "test_content" } } ] diff --git a/tests/mod_wiki/comment_deleted/data.json b/tests/mod_wiki/comment_deleted/data.json index 8b4744ede..96308b078 100644 --- a/tests/mod_wiki/comment_deleted/data.json +++ b/tests/mod_wiki/comment_deleted/data.json @@ -12,18 +12,18 @@ "intro": "

test_intro

" } ], - "wiki_subwikis": [ + "wiki_pages": [ { "id": 1, - "wikiid": 1 + "subwikiid": 1, + "cachedcontent": "

test_content

", + "title": "test_page_title" } ], - "wiki_pages": [ + "wiki_subwikis": [ { "id": 1, - "subwikiid": 1, - "title": "test_page_title", - "cachedcontent": "

test_content

" + "wikiid": 1 } ] } diff --git a/tests/mod_wiki/comment_deleted/event.json b/tests/mod_wiki/comment_deleted/event.json index 472af2f3b..39b61d38c 100644 --- a/tests/mod_wiki/comment_deleted/event.json +++ b/tests/mod_wiki/comment_deleted/event.json @@ -1,11 +1,11 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_wiki\\event\\comment_deleted", - "objectid": 1, "objecttable": "comments", - "other": "a:1:{s:6:\"itemid\";s:1:\"1\";}" + "other": "a:1:{s:6:\"itemid\";s:1:\"1\";}", + "timecreated": 1433946701 } diff --git a/tests/mod_wiki/comment_deleted/statements.json b/tests/mod_wiki/comment_deleted/statements.json index 497d01450..8d804e5dd 100644 --- a/tests/mod_wiki/comment_deleted/statements.json +++ b/tests/mod_wiki/comment_deleted/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/delete", @@ -15,96 +15,96 @@ }, "object": { "id": "http://www.example.org/mod/wiki/instancecomments.php?commentid=1&pageid=1", - "objectType": "Activity", "definition": { - "type": "http://activitystrea.ms/comment", "name": { "en": "Comment" - } - } + }, + "type": "http://activitystrea.ms/comment" + }, + "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_wiki\\event\\comment_deleted", - "event_function": "\\src\\transformer\\events\\mod_wiki\\comment_deleted" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/wiki/comments.php?pageid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_page_title Discussion" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/wiki/view.php?pageid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page", + "description": { + "en": "test_content" + }, "name": { "en": "test_page_title" }, - "description": { - "en": "test_content" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/wiki/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_wiki\\comment_deleted", + "event_name": "\\mod_wiki\\event\\comment_deleted", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_wiki/comments_viewed/data.json b/tests/mod_wiki/comments_viewed/data.json index 3a53fc490..e4c3ec844 100644 --- a/tests/mod_wiki/comments_viewed/data.json +++ b/tests/mod_wiki/comments_viewed/data.json @@ -1,4 +1,11 @@ { + "comments": [ + { + "id": 1, + "itemid": 1, + "content": "

test_content

" + } + ], "modules": [ { "id": 1, @@ -12,25 +19,18 @@ "intro": "

test_intro

" } ], - "wiki_subwikis": [ - { - "id": 1, - "wikiid": 1 - } - ], "wiki_pages": [ { "id": 1, "subwikiid": 1, - "title": "test_page_title", - "cachedcontent": "

test_content

" + "cachedcontent": "

test_content

", + "title": "test_page_title" } ], - "comments": [ + "wiki_subwikis": [ { "id": 1, - "content": "

test_content

", - "itemid": 1 + "wikiid": 1 } ] } diff --git a/tests/mod_wiki/comments_viewed/event.json b/tests/mod_wiki/comments_viewed/event.json index 5cbabc265..6843346a3 100644 --- a/tests/mod_wiki/comments_viewed/event.json +++ b/tests/mod_wiki/comments_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_wiki\\event\\comments_viewed", - "objectid": 1, - "objecttable": "wiki_pages" + "objecttable": "wiki_pages", + "timecreated": 1433946701 } diff --git a/tests/mod_wiki/comments_viewed/statements.json b/tests/mod_wiki/comments_viewed/statements.json index 632ef0b23..3f3d8f298 100644 --- a/tests/mod_wiki/comments_viewed/statements.json +++ b/tests/mod_wiki/comments_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,85 +16,85 @@ "object": { "id": "http://www.example.org/mod/wiki/comments.php?pageid=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/discussion", "name": { "en": "test_page_title Discussion" - } + }, + "type": "http://id.tincanapi.com/activitytype/discussion" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_wiki\\event\\comments_viewed", - "event_function": "\\src\\transformer\\events\\mod_wiki\\comments_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/wiki/view.php?pageid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page", + "description": { + "en": "test_content" + }, "name": { "en": "test_page_title" }, - "description": { - "en": "test_content" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page" }, "objectType": "Activity" }, { "id": "http://www.example.org/mod/wiki/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_wiki\\comments_viewed", + "event_name": "\\mod_wiki\\event\\comments_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_wiki/course_module_viewed/existing_module/event.json b/tests/mod_wiki/course_module_viewed/existing_module/event.json index b749dda29..f56a7012d 100644 --- a/tests/mod_wiki/course_module_viewed/existing_module/event.json +++ b/tests/mod_wiki/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_wiki\\event\\course_module_viewed" + "eventname": "\\mod_wiki\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_wiki/course_module_viewed/existing_module/statements.json b/tests/mod_wiki/course_module_viewed/existing_module/statements.json index ec418db94..fa7e9199c 100644 --- a/tests/mod_wiki/course_module_viewed/existing_module/statements.json +++ b/tests/mod_wiki/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,62 +16,62 @@ "object": { "id": "http://www.example.org/mod/wiki/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_wiki\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_wiki\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_wiki/page_viewed/data.json b/tests/mod_wiki/page_viewed/data.json index 8b4744ede..96308b078 100644 --- a/tests/mod_wiki/page_viewed/data.json +++ b/tests/mod_wiki/page_viewed/data.json @@ -12,18 +12,18 @@ "intro": "

test_intro

" } ], - "wiki_subwikis": [ + "wiki_pages": [ { "id": 1, - "wikiid": 1 + "subwikiid": 1, + "cachedcontent": "

test_content

", + "title": "test_page_title" } ], - "wiki_pages": [ + "wiki_subwikis": [ { "id": 1, - "subwikiid": 1, - "title": "test_page_title", - "cachedcontent": "

test_content

" + "wikiid": 1 } ] } diff --git a/tests/mod_wiki/page_viewed/event.json b/tests/mod_wiki/page_viewed/event.json index 56870143d..03c4797c2 100644 --- a/tests/mod_wiki/page_viewed/event.json +++ b/tests/mod_wiki/page_viewed/event.json @@ -1,10 +1,10 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, + "objectid": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, "eventname": "\\mod_wiki\\event\\page_viewed", - "objectid": 1, - "objecttable": "wiki_pages" + "objecttable": "wiki_pages", + "timecreated": 1433946701 } diff --git a/tests/mod_wiki/page_viewed/statements.json b/tests/mod_wiki/page_viewed/statements.json index 3dee541a6..9e439582e 100644 --- a/tests/mod_wiki/page_viewed/statements.json +++ b/tests/mod_wiki/page_viewed/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,75 +16,75 @@ "object": { "id": "http://www.example.org/mod/wiki/view.php?pageid=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page", + "description": { + "en": "test_content" + }, "name": { "en": "test_page_title" }, - "description": { - "en": "test_content" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki-page" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_wiki\\event\\page_viewed", - "event_function": "\\src\\transformer\\events\\mod_wiki\\page_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/mod/wiki/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki", + "description": { + "en": "test_intro" + }, "name": { "en": "test_name" }, - "description": { - "en": "test_intro" - } + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/wiki" }, "objectType": "Activity" }, { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\mod_wiki\\page_viewed", + "event_name": "\\mod_wiki\\event\\page_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/mod_workshop/course_module_viewed/existing_module/event.json b/tests/mod_workshop/course_module_viewed/existing_module/event.json index b07a2e3a4..68928dd14 100644 --- a/tests/mod_workshop/course_module_viewed/existing_module/event.json +++ b/tests/mod_workshop/course_module_viewed/existing_module/event.json @@ -1,8 +1,8 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "courseid": 1, - "timecreated": 1433946701, - "contextinstanceid": 1, - "eventname": "\\mod_workshop\\event\\course_module_viewed" + "eventname": "\\mod_workshop\\event\\course_module_viewed", + "timecreated": 1433946701 } diff --git a/tests/mod_workshop/course_module_viewed/existing_module/statements.json b/tests/mod_workshop/course_module_viewed/existing_module/statements.json index 465d455f9..a4d181c4a 100644 --- a/tests/mod_workshop/course_module_viewed/existing_module/statements.json +++ b/tests/mod_workshop/course_module_viewed/existing_module/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://id.tincanapi.com/verb/viewed", @@ -16,59 +16,59 @@ "object": { "id": "http://www.example.org/mod/workshop/view.php?id=1", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/workshop", "name": { "en": "test_name" - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/workshop" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\mod_workshop\\event\\course_module_viewed", - "event_function": "\\src\\transformer\\events\\all\\course_module_viewed" - } - }, "contextActivities": { + "category": [ + { + "id": "http://www.example.org", + "definition": { + "name": { + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" + }, + "objectType": "Activity" + } + ], "parent": [ { "id": "http://www.example.org/course/section.php?id=1", - "objectType": "Activity", "definition": { "name": { "en": "test_name Section 0" }, "type": "http://id.tincanapi.com/activitytype/section" - } - }, - { - "id": "http://www.example.org/course/view.php?id=1", - "definition": { - "type": "https://w3id.org/xapi/cmi5/activitytype/course", - "name": { - "en": "test_name" - } }, "objectType": "Activity" - } - ], - "category": [ + }, { - "id": "http://www.example.org", + "id": "http://www.example.org/course/view.php?id=2", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "https://w3id.org/xapi/cmi5/activitytype/course" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\all\\course_module_viewed", + "event_name": "\\mod_workshop\\event\\course_module_viewed", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/tool_certificate/certificate_issued/data.json b/tests/tool_certificate/certificate_issued/data.json index 5be7b1663..2460ca2df 100644 --- a/tests/tool_certificate/certificate_issued/data.json +++ b/tests/tool_certificate/certificate_issued/data.json @@ -1,4 +1,11 @@ { + "tool_certificate_issues": [ + { + "courseid": null, + "id": 1, + "code": "4303209428AU" + } + ], "user": [ { "id": 1, @@ -10,12 +17,5 @@ "firstname": "test_fullname2", "email": "test2@test.com" } - ], - "tool_certificate_issues": [ - { - "id": 1, - "code": "4303209428AU", - "courseid": null - } ] } diff --git a/tests/tool_certificate/certificate_issued/event.json b/tests/tool_certificate/certificate_issued/event.json index f64f3b1e1..1f0a1c1f0 100644 --- a/tests/tool_certificate/certificate_issued/event.json +++ b/tests/tool_certificate/certificate_issued/event.json @@ -1,11 +1,11 @@ { + "courseid": 0, "id": 1, - "eventname": "\\tool_certificate\\event\\certificate_issued", - "timecreated": 1433946701, - "userid": 1, + "objectid": 1, "relateduserid": 2, - "courseid": 0, - "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "userid": 1, + "eventname": "\\tool_certificate\\event\\certificate_issued", "objecttable": "tool_certificate_issues", - "objectid": 1 + "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "timecreated": 1433946701 } diff --git a/tests/tool_certificate/certificate_issued/statements.json b/tests/tool_certificate/certificate_issued/statements.json index bedfb1fb8..8d0612b54 100644 --- a/tests/tool_certificate/certificate_issued/statements.json +++ b/tests/tool_certificate/certificate_issued/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/achieved", @@ -15,30 +15,22 @@ }, "object": { "id": "http://www.example.org/admin/tool/certificate/index.php?code=4303209428AU", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate", "name": { "en": "Certificate 4303209428AU" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate" + }, + "objectType": "Activity" }, "context": { - "language": "en", - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, @@ -48,12 +40,20 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_issued", "event_name": "\\tool_certificate\\event\\certificate_issued", - "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_issued" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/tool_certificate/certificate_revoked/event.json b/tests/tool_certificate/certificate_revoked/event.json index a328df74f..0cd3ece3e 100644 --- a/tests/tool_certificate/certificate_revoked/event.json +++ b/tests/tool_certificate/certificate_revoked/event.json @@ -1,11 +1,11 @@ { + "courseid": 0, "id": 1, - "eventname": "\\tool_certificate\\event\\certificate_revoked", - "timecreated": 1433946701, - "userid": 1, + "objectid": 1, "relateduserid": 2, - "courseid": 0, - "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "userid": 1, + "eventname": "\\tool_certificate\\event\\certificate_revoked", "objecttable": "tool_certificate_issues", - "objectid": 1 + "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "timecreated": 1433946701 } diff --git a/tests/tool_certificate/certificate_revoked/statements.json b/tests/tool_certificate/certificate_revoked/statements.json index 3a43a2b54..c1a48a133 100644 --- a/tests/tool_certificate/certificate_revoked/statements.json +++ b/tests/tool_certificate/certificate_revoked/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname2", "account": { "homePage": "http://www.example.org", "name": "2" - } + }, + "name": "test_fullname2" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/forfeited", @@ -15,30 +15,22 @@ }, "object": { "id": "http://www.example.org/admin/tool/certificate/index.php?code=4303209428AU", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate", "name": { "en": "Certificate 4303209428AU" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate" + }, + "objectType": "Activity" }, "context": { - "language": "en", - "instructor": { - "name": "test_fullname1", - "account": { - "homePage": "http://www.example.org", - "name": "1" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, @@ -48,12 +40,20 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_revoked", "event_name": "\\tool_certificate\\event\\certificate_revoked", - "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_revoked" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "instructor": { + "account": { + "homePage": "http://www.example.org", + "name": "1" + }, + "name": "test_fullname1" + }, + "language": "en" } } ] diff --git a/tests/tool_certificate/certificate_verified/data.json b/tests/tool_certificate/certificate_verified/data.json index 5be7b1663..2460ca2df 100644 --- a/tests/tool_certificate/certificate_verified/data.json +++ b/tests/tool_certificate/certificate_verified/data.json @@ -1,4 +1,11 @@ { + "tool_certificate_issues": [ + { + "courseid": null, + "id": 1, + "code": "4303209428AU" + } + ], "user": [ { "id": 1, @@ -10,12 +17,5 @@ "firstname": "test_fullname2", "email": "test2@test.com" } - ], - "tool_certificate_issues": [ - { - "id": 1, - "code": "4303209428AU", - "courseid": null - } ] } diff --git a/tests/tool_certificate/certificate_verified/event.json b/tests/tool_certificate/certificate_verified/event.json index 50298d6a6..db8226522 100644 --- a/tests/tool_certificate/certificate_verified/event.json +++ b/tests/tool_certificate/certificate_verified/event.json @@ -1,11 +1,11 @@ { + "courseid": 2, "id": 1, - "eventname": "\\tool_certificate\\event\\certificate_verified", - "timecreated": 1433946701, - "userid": 1, + "objectid": 1, "relateduserid": 2, - "courseid": 1, - "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "userid": 1, + "eventname": "\\tool_certificate\\event\\certificate_verified", "objecttable": "tool_certificate_issues", - "objectid": 1 + "other": "a:1:{s:4:\"code\";s:12:\"4303209428AU\";}", + "timecreated": 1433946701 } diff --git a/tests/tool_certificate/certificate_verified/statements.json b/tests/tool_certificate/certificate_verified/statements.json index 27dc11a0d..29482e236 100644 --- a/tests/tool_certificate/certificate_verified/statements.json +++ b/tests/tool_certificate/certificate_verified/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname1", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname1" }, "verb": { "id": "https://w3id.org/xapi/tla/verbs/verified", @@ -15,23 +15,22 @@ }, "object": { "id": "http://www.example.org/admin/tool/certificate/index.php?code=4303209428AU", - "objectType": "Activity", "definition": { - "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate", "name": { "en": "Certificate 4303209428AU" - } - } + }, + "type": "https://xapi.edlm/profiles/edlm-lms/concepts/activity-types/certificate" + }, + "objectType": "Activity" }, "context": { - "language": "en", "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { "name": { - "en": "test_name" + "en": "test_site_fullname" }, "type": "http://id.tincanapi.com/activitytype/lms" }, @@ -41,12 +40,13 @@ }, "extensions": { "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", + "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_verified", "event_name": "\\tool_certificate\\event\\certificate_verified", - "event_function": "\\src\\transformer\\events\\tool_certificate\\certificate_verified" + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" } - } + }, + "language": "en" } } ] diff --git a/tests/tool_usertours/tour_ended/event.json b/tests/tool_usertours/tour_ended/event.json index 5ebeb055e..1eabecbb0 100644 --- a/tests/tool_usertours/tour_ended/event.json +++ b/tests/tool_usertours/tour_ended/event.json @@ -1,9 +1,9 @@ { + "contextinstanceid": 1, + "courseid": 2, "id": 1, "userid": 1, - "timecreated": 1433946701, - "courseid": 1, - "contextinstanceid": 1, "eventname": "\\tool_usertours\\event\\tour_ended", - "other": "a:3:{s:7:\"pageurl\";s:42:\"http://localhost:8000/course/view.php?id=1\";s:6:\"stepid\";i:7;s:9:\"stepindex\";i:2;}" + "other": "a:3:{s:7:\"pageurl\";s:42:\"http://localhost:8000/course/view.php?id=1\";s:6:\"stepid\";i:7;s:9:\"stepindex\";i:2;}", + "timecreated": 1433946701 } diff --git a/tests/tool_usertours/tour_ended/statements.json b/tests/tool_usertours/tour_ended/statements.json index 61e0f5fb2..2abc4c060 100644 --- a/tests/tool_usertours/tour_ended/statements.json +++ b/tests/tool_usertours/tour_ended/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "https://xapi.edlm/profiles/edlm-lms/concepts/verbs/toured", @@ -14,32 +14,32 @@ } }, "object": { - "id": "http://www.example.org/course/view.php?id=1", + "id": "http://www.example.org/course/view.php?id=2", "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\tool_usertours\\event\\tour_ended", - "event_function": "\\src\\transformer\\events\\tool_usertours\\tour_ended" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/lms" } } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\tool_usertours\\tour_ended", + "event_name": "\\tool_usertours\\event\\tour_ended", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ] diff --git a/tests/totara_program/program_assigned/existing_program/event.json b/tests/totara_program/program_assigned/existing_program/event.json index 7449c5968..e5b28ca12 100644 --- a/tests/totara_program/program_assigned/existing_program/event.json +++ b/tests/totara_program/program_assigned/existing_program/event.json @@ -1,8 +1,8 @@ { "id": 1, + "objectid": 1, "userid": 1, - "timecreated": 1560399491, + "eventname": "\\totara_program\\event\\program_assigned", "objecttable": "prog_assignment", - "objectid": 1, - "eventname": "\\totara_program\\event\\program_assigned" + "timecreated": 1560399491 } diff --git a/tests/totara_program/program_assigned/existing_program/statements.json b/tests/totara_program/program_assigned/existing_program/statements.json index 553daccd6..f6ee59c53 100644 --- a/tests/totara_program/program_assigned/existing_program/statements.json +++ b/tests/totara_program/program_assigned/existing_program/statements.json @@ -1,11 +1,11 @@ [ { "actor": { - "name": "test_fullname", "account": { "homePage": "http://www.example.org", "name": "1" - } + }, + "name": "test_fullname" }, "verb": { "id": "http://activitystrea.ms/schema/1.0/assign", @@ -16,37 +16,37 @@ "object": { "id": "http://www.example.org/totara/program/view.php?id=1", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms/program", "name": { "en": "test_name" - } + }, + "type": "http://id.tincanapi.com/activitytype/lms/program" }, "objectType": "Activity" }, "context": { - "language": "en", - "extensions": { - "http://lrs.learninglocker.net/define/extensions/info": { - "http://moodle.org": "1.0.0", - "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development", - "event_name": "\\totara_program\\event\\program_assigned", - "event_function": "\\src\\transformer\\events\\totara_program\\program_assigned" - } - }, "contextActivities": { "category": [ { "id": "http://www.example.org", "definition": { - "type": "http://id.tincanapi.com/activitytype/lms", "name": { - "en": "test_name" - } + "en": "test_site_fullname" + }, + "type": "http://id.tincanapi.com/activitytype/lms" }, "objectType": "Activity" } ] - } + }, + "extensions": { + "http://lrs.learninglocker.net/define/extensions/info": { + "event_function": "\\src\\transformer\\events\\totara_program\\program_assigned", + "event_name": "\\totara_program\\event\\program_assigned", + "http://moodle.org": "1.0.0", + "https://github.com/xAPI-vle/moodle-logstore_xapi": "0.0.0-development" + } + }, + "language": "en" } } ]