ims_caliper 0.9.3.15 → 1.0.0

data/spec/lib/{event → events}/assessment_item_completed_event_spec.rb

@@ -16,27 +16,26 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require 'require_all'
-require_all 'lib/caliper/entities/entity.rb'
+require_all 'lib/caliper/actions/assessment_item_actions.rb'
+require_all 'lib/caliper/entities/entity_base.rb'
 require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/agent/person.rb'
+require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/role.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/assessment/assessment.rb'
-require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
 require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
 require_all 'lib/caliper/entities/response/Response.rb'
 require_all 'lib/caliper/entities/response/fillin_blank_response.rb'
-require_all 'lib/caliper/event/assessment_item_event.rb'
-require_all 'lib/caliper/profiles/assessment_item_profile.rb'
+require_all 'lib/caliper/events/assessment_item_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe AssessmentItemEvent do
 
@@ -44,133 +43,110 @@ module Caliper
 
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::AssessmentItemActions::COMPLETED
+        action = Caliper::Actions::AssessmentItemActions::COMPLETED
 
         # Parent assessment
         assessment = Caliper::Entities::Assessment::Assessment.new
-        assessment.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        assessment.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
         assessment.name = "American Revolution - Key Figures Assessment"
-        assessment.dateModified =  '2015-09-02T11:30:00.000Z'
-        assessment.dateCreated =  '2015-08-01T06:00:00.000Z'
-        assessment.datePublished =  '2015-08-15T09:30:00.000Z'
+        assessment.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
+        assessment.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        assessment.datePublished = Time.utc(2015,8,15,9,30,0).iso8601(3)
         assessment.version = "1.0"
-        assessment.dateToActivate = '2015-08-16T05:00:00.000Z'
-        assessment.dateToShow =  '2015-08-16T05:00:00.000Z'
-        assessment.dateToStartOn = "2015-08-16T05:00:00.000Z"
-        assessment.dateToSubmit = "2015-09-28T11:59:59.000Z"
+        assessment.dateToActivate = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToShow = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToStartOn = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToSubmit = Time.utc(2015,9,28,11,59,59).iso8601(3)
         assessment.maxAttempts = 2
         assessment.maxSubmits = 2
         assessment.maxScore = 3.0
 
         # Object
         item = Caliper::Entities::Assessment::AssessmentItem.new
-        item.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1"
+        item.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/item/001"
         item.name = "Assessment Item 1"
         item.isPartOf = assessment
         item.maxAttempts = 2
         item.maxSubmits = 2
         item.maxScore = 1.0
-        item.dateCreated = nil
-        item.dateModified = nil
         item.version = "1.0"
-        item.isTimeDependent = false
 
         # Attempt (response.attempt)
         attempt = Caliper::Entities::Assignable::Attempt.new
-        attempt.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1/attempt1"
-        attempt.actor = "https://some-university.edu/user/554433"
-        attempt.assignable = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
-        attempt.dateCreated = "2015-08-01T06:00:00.000Z"
-        attempt.dateModified = nil
+        attempt.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/item/001/attempt/789"
+        attempt.actor = "https://example.edu/user/554433"
+        attempt.assignable = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
+        attempt.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
         attempt.count = 1
-        attempt.startedAtTime = "2015-09-15T10:15:00.000Z"
-        attempt.duration = nil
-        attempt.endedAtTime = nil
-        attempt.extensions = {}
-        attempt.name = nil
+        attempt.startedAtTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
 
         # Generate response
         response = Caliper::Entities::Response::FillinBlankResponse.new
-        response.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1/response1"
-        response.name = nil
-        response.description = nil
-        response.extensions = {}
+        response.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/item/001/response/001"
         response.dateCreated = "2015-08-01T06:00:00.000Z"
-        response.dateModified = nil
-        response.assignable = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
-        response.actor = "https://some-university.edu/user/554433"
+        response.assignable = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
+        response.actor = "https://example.edu/user/554433"
         response.attempt = attempt
-        response.duration = nil
         response.startedAtTime = "2015-09-15T10:15:00.000Z"
-        response.endedAtTime = nil
         response.values = ["2 July 1776"]
 
         # ed_app
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://com.sat/super-assessment-tool'
+        ed_app.id = 'https://example.com/super-assessment-tool'
         ed_app.name = 'Super Assessment Tool'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = nil
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
         event = AssessmentItemEvent.new
         event.actor  = actor
         event.action = action
         event.object = item
-        event.target = nil
         event.generated = response
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures

data/spec/lib/{event → events}/assessment_item_started_event_spec.rb

@@ -16,26 +16,24 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require 'require_all'
-require_all 'lib/caliper/entities/entity.rb'
+require_all 'lib/caliper/actions/assessment_item_actions.rb'
+require_all 'lib/caliper/entities/entity_base.rb'
 require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/agent/person.rb'
+require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/role.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/assessment/assessment.rb'
-require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
 require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
-require_all 'lib/caliper/event/assessment_item_event.rb'
-require_all 'lib/caliper/profiles/assessment_item_profile.rb'
-require_all 'lib/caliper/profiles/assessment_profile.rb'
+require_all 'lib/caliper/events/assessment_item_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe AssessmentItemEvent do
 
@@ -43,117 +41,101 @@ module Caliper
 
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::AssessmentActions::STARTED
+        action = Caliper::Actions::AssessmentItemActions::STARTED
 
         # The parent assessment
         assessment = Caliper::Entities::Assessment::Assessment.new
-        assessment.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        assessment.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
         assessment.name = "American Revolution - Key Figures Assessment"
-        assessment.dateModified =  '2015-09-02T11:30:00.000Z'
-        assessment.dateCreated =  '2015-08-01T06:00:00.000Z'
-        assessment.datePublished =  '2015-08-15T09:30:00.000Z'
+        assessment.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
+        assessment.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        assessment.datePublished = Time.utc(2015,8,15,9,30,0).iso8601(3)
         assessment.version = "1.0"
-        assessment.dateToActivate = '2015-08-16T05:00:00.000Z'
-        assessment.dateToShow =  '2015-08-16T05:00:00.000Z'
-        assessment.dateToStartOn = "2015-08-16T05:00:00.000Z"
-        assessment.dateToSubmit = "2015-09-28T11:59:59.000Z"
+        assessment.dateToActivate = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToShow = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToStartOn = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToSubmit = Time.utc(2015,9,28,11,59,59).iso8601(3)
         assessment.maxAttempts = 2
         assessment.maxSubmits = 2
         assessment.maxScore = 3.0
 
         # Object
         item = Caliper::Entities::Assessment::AssessmentItem.new
-        item.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1"
+        item.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/item/001"
         item.name = "Assessment Item 1"
         item.isPartOf = assessment
         item.maxAttempts = 2
         item.maxSubmits = 2
         item.maxScore = 1.0
-        item.dateCreated = nil
-        item.dateModified = nil
         item.version = "1.0"
         item.isTimeDependent = false
 
         # Generated attempt
         attempt = Caliper::Entities::Assignable::Attempt.new
-        attempt.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/item1/attempt1"
-        attempt.actor = "https://some-university.edu/user/554433"
-        attempt.assignable = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
-        attempt.dateCreated = "2015-08-01T06:00:00.000Z"
-        attempt.dateModified = nil
+        attempt.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/item/001/attempt/789"
+        attempt.actor = "https://example.edu/user/554433"
+        attempt.assignable = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
+        attempt.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
         attempt.count = 1
-        attempt.startedAtTime = "2015-09-15T10:15:00.000Z"
-        attempt.duration = nil
-        attempt.endedAtTime = nil
-        attempt.extensions = {}
-        attempt.name = nil
+        attempt.startedAtTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
 
         # ed_app
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://com.sat/super-assessment-tool'
+        ed_app.id = 'https://example.com/super-assessment-tool'
         ed_app.name = 'Super Assessment Tool'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = nil
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
         event = AssessmentItemEvent.new
         event.actor  = actor
         event.action = action
         event.object = item
-        event.target = nil
         event.generated = attempt
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures

data/spec/lib/{event/assessment_event_spec.rb → events/assessment_started_event_spec.rb}

@@ -16,25 +16,24 @@
 # with this program. If not, see http://www.gnu.org/licenses/.
 
 require 'require_all'
-require_all 'lib/caliper/entities/entity.rb'
+require_all 'lib/caliper/actions/assessment_actions.rb'
+require_all 'lib/caliper/entities/entity_base.rb'
 require_all 'lib/caliper/entities/agent/software_application.rb'
 require_all 'lib/caliper/entities/agent/person.rb'
+require_all 'lib/caliper/entities/assessment/assessment.rb'
 require_all 'lib/caliper/entities/lis/membership.rb'
 require_all 'lib/caliper/entities/lis/role.rb'
 require_all 'lib/caliper/entities/lis/status.rb'
 require_all 'lib/caliper/entities/lis/course_section.rb'
 require_all 'lib/caliper/entities/lis/course_offering.rb'
 require_all 'lib/caliper/entities/lis/group.rb'
-require_all 'lib/caliper/entities/assessment/assessment.rb'
-require_all 'lib/caliper/entities/assessment/assessment_item.rb'
 require_all 'lib/caliper/entities/assignable/attempt.rb'
 require_all 'lib/caliper/entities/assignable/assignable_digital_resource.rb'
-require_all 'lib/caliper/event/assessment_event.rb'
-require_all 'lib/caliper/profiles/assessment_profile.rb'
+require_all 'lib/caliper/events/assessment_event.rb'
 require 'json_spec'
 
 module Caliper
-  module Event
+  module Events
 
     describe AssessmentEvent do
 
@@ -42,104 +41,90 @@ module Caliper
 
         # Actor
         actor = Caliper::Entities::Agent::Person.new
-        actor.id = 'https://some-university.edu/user/554433'
-        actor.dateCreated = '2015-08-01T06:00:00.000Z'
-        actor.dateModified = '2015-09-02T11:30:00.000Z'
+        actor.id = 'https://example.edu/user/554433'
+        actor.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        actor.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # Action
-        action = Caliper::Profiles::AssessmentActions::STARTED
+        action = Caliper::Actions::AssessmentActions::STARTED
 
         # Object
         assessment = Caliper::Entities::Assessment::Assessment.new
-        assessment.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
+        assessment.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
         assessment.name = "American Revolution - Key Figures Assessment"
-        assessment.dateModified =  '2015-09-02T11:30:00.000Z'
-        assessment.dateCreated =  '2015-08-01T06:00:00.000Z'
-        assessment.datePublished =  '2015-08-15T09:30:00.000Z'
+        assessment.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
+        assessment.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        assessment.datePublished = Time.utc(2015,8,15,9,30,0).iso8601(3)
         assessment.version = "1.0"
-        assessment.dateToActivate = '2015-08-16T05:00:00.000Z'
-        assessment.dateToShow =  '2015-08-16T05:00:00.000Z'
-        assessment.dateToStartOn = "2015-08-16T05:00:00.000Z"
-        assessment.dateToSubmit = "2015-09-28T11:59:59.000Z"
+        assessment.dateToActivate = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToShow = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToStartOn = Time.utc(2015,8,16,5,0,0).iso8601(3)
+        assessment.dateToSubmit = Time.utc(2015,9,28,11,59,59).iso8601(3)
         assessment.maxAttempts = 2
         assessment.maxSubmits = 2
         assessment.maxScore = 3.0
 
         # Generated attempt
         attempt = Caliper::Entities::Assignable::Attempt.new
-        attempt.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1/attempt1"
-        attempt.actor = "https://some-university.edu/user/554433"
-        attempt.assignable = "https://some-university.edu/politicalScience/2015/american-revolution-101/assessment1"
-        attempt.dateCreated = "2015-08-01T06:00:00.000Z"
-        attempt.dateModified = nil
+        attempt.id = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001/attempt/5678"
+        attempt.actor = "https://example.edu/user/554433"
+        attempt.assignable = "https://example.edu/politicalScience/2015/american-revolution-101/assessment/001"
+        attempt.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
         attempt.count = 1
         attempt.startedAtTime = "2015-09-15T10:15:00.000Z"
-        attempt.duration = nil
-        attempt.endedAtTime = nil
-        attempt.extensions = {}
-        attempt.name = nil
 
         # ed_app
         ed_app = Caliper::Entities::Agent::SoftwareApplication.new
-        ed_app.id = 'https://com.sat/super-assessment-tool'
+        ed_app.id = 'https://example.com/super-assessment-tool'
         ed_app.name = 'Super Assessment Tool'
-        ed_app.dateCreated = '2015-08-01T06:00:00.000Z'
-        ed_app.dateModified = nil
+        ed_app.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # LIS Course Offering
         course = Caliper::Entities::LIS::CourseOffering.new
-        course.id = "https://some-university.edu/politicalScience/2015/american-revolution-101"
+        course.id = "https://example.edu/politicalScience/2015/american-revolution-101"
         course.name = "Political Science 101: The American Revolution"
         course.courseNumber = "POL101"
         course.academicSession = "Fall-2015"
-        course.subOrganizationOf = nil
-        course.dateCreated = '2015-08-01T06:00:00.000Z'
-        course.dateModified = '2015-09-02T11:30:00.000Z'
+        course.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        course.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Course Section
         section = Caliper::Entities::LIS::CourseSection.new
-        section.id = 'https://some-university.edu/politicalScience/2015/american-revolution-101/section/001'
+        section.id = 'https://example.edu/politicalScience/2015/american-revolution-101/section/001'
         section.name = 'American Revolution 101'
         section.courseNumber = "POL101"
         section.academicSession = "Fall-2015"
-        section.category = nil
         section.subOrganizationOf = course
-        section.dateCreated = '2015-08-01T06:00:00.000Z'
-        section.dateModified = '2015-09-02T11:30:00.000Z'
+        section.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
+        section.dateModified = Time.utc(2015,9,2,11,30,0).iso8601(3)
 
         # LIS Group
         group = Caliper::Entities::LIS::Group.new
-        group.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
+        group.id = "https://example.edu/politicalScience/2015/american-revolution-101/section/001/group/001"
         group.name = "Discussion Group 001"
         group.subOrganizationOf = section
-        group.dateCreated = '2015-08-01T06:00:00.000Z'
-        group.dateModified = nil
+        group.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         membership = Caliper::Entities::LIS::Membership.new
-        membership.id = "https://some-university.edu/politicalScience/2015/american-revolution-101/roster/554433"
+        membership.id = "https://example.edu/politicalScience/2015/american-revolution-101/roster/554433"
         membership.name = "American Revolution 101"
         membership.description = "Roster entry"
-        membership.member = "https://some-university.edu/user/554433"
-        membership.organization = "https://some-university.edu/politicalScience/2015/american-revolution-101/section/001"
+        membership.member = "https://example.edu/user/554433"
+        membership.organization = "https://example.edu/politicalScience/2015/american-revolution-101/section/001"
         membership.roles = [Caliper::Entities::LIS::Role::LEARNER]
         membership.status = Caliper::Entities::LIS::Status::ACTIVE
-        membership.dateCreated = "2015-08-01T06:00:00.000Z"
-        membership.dateModified = nil
+        membership.dateCreated = Time.utc(2015,8,1,6,0,0).iso8601(3)
 
         # Create the Event
         event = AssessmentEvent.new
         event.actor  = actor
         event.action = action
         event.object = assessment
-        event.target = nil
         event.generated = attempt
-        event.startedAtTime = '2015-09-15T10:15:00.000Z'
-        event.endedAtTime = nil
-        event.duration = nil
+        event.eventTime = Time.utc(2015,9,15,10,15,0).iso8601(3)
         event.edApp = ed_app
         event.group = group
         event.membership = membership
-        # puts "Event JSON = #{event.to_json}'"
 
         # Load JSON from caliper-common-fixtures for comparison
         # NOTE - sym link to caliper-common-fixtures needs to exist under spec/fixtures