Merge pull request #12 from brianjmiller/master

Fixes for Group and ContextActivities
RusticiSoftware · Jul 23, 2014 · 0a2b5e7 · 0a2b5e7
2 parents f82f2ab + bceec14
commit 0a2b5e7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,8 @@
         "tincan",
         "xapi",
         "experience api",
-        "e-learning"
+        "e-learning",
+        "scorm"
     ],
     "license": "Apache-2.0",
     "authors": [

diff --git a/src/ContextActivities.php b/src/ContextActivities.php
@@ -21,10 +21,10 @@ class ContextActivities implements VersionableInterface
 {
     use ArraySetterTrait, FromJSONTrait;
 
-    protected $category;
-    protected $parent;
-    protected $grouping;
-    protected $other;
+    protected $category = array();
+    protected $parent = array();
+    protected $grouping = array();
+    protected $other = array();
 
     private static $directProps = array(
         'category',
@@ -39,21 +39,6 @@ public function __construct() {
 
             $this->_fromArray($arg);
         }
-
-        foreach (
-            [
-                'category',
-                'parent',
-                'grouping',
-                'other',
-            ] as $k
-        ) {
-            $method = 'set' . ucfirst($k);
-
-            if (! isset($this->$k)) {
-                $this->$method(array());
-            }
-        }
     }
 
     public function asVersion($version) {

diff --git a/src/Group.php b/src/Group.php
@@ -46,9 +46,9 @@ public function asVersion($version) {
     }
 
     public function setMember($value) {
-        foreach ($value as $k) {
-            if (! $value[$k] instanceof Agent) {
-                $value[$k] = new Agent($value[$k]);
+        foreach ($value as $k => $v) {
+            if (! $v instanceof Agent) {
+                $value[$k] = new Agent($v);
             }
         }
 

diff --git a/tests/ContextActivitiesTest.php b/tests/ContextActivitiesTest.php
@@ -31,15 +31,31 @@ public function testInstantiation() {
         }
     }
 
-    /*
-    // TODO: need to loop possible configs
     public function testFromJSONInstantiations() {
-        $obj = ContextActivities::fromJSON('{"mbox":"' . COMMON_GROUP_MBOX . '", "member":[{"mbox":"' . COMMON_MBOX . '"}]}');
+        $common_activity = new TinCan\Activity(self::$common_activity_cfg);
+
+        $all_json = array();
+        foreach (self::$listProps as $k) {
+            $getMethod = 'get' . ucfirst($k);
+
+            $prop_json = '"' . $k . '":[' . json_encode($common_activity->asVersion('1.0.0')) . ']';
+
+            array_push($all_json, $prop_json);
+
+            $obj = ContextActivities::fromJSON('{' . $prop_json . '}');
+
+            $this->assertInstanceOf('TinCan\ContextActivities', $obj);
+            $this->assertEquals([$common_activity], $obj->$getMethod(), "$k list");
+        }
+
+        $obj = ContextActivities::fromJSON('{' . join(",", $all_json) . "}");
+
         $this->assertInstanceOf('TinCan\ContextActivities', $obj);
-        $this->assertSame(COMMON_GROUP_MBOX, $obj->getMbox(), 'mbox value');
-        $this->assertEquals([['mbox' => COMMON_MBOX]], $obj->getMember(), 'member list');
+        $this->assertEquals([$common_activity], $obj->getCategory(), "all props: category list");
+        $this->assertEquals([$common_activity], $obj->getParent(), "all props: parent list");
+        $this->assertEquals([$common_activity], $obj->getGrouping(), "all props: grouping list");
+        $this->assertEquals([$common_activity], $obj->getOther(), "all props: other list");
     }
-    */
 
     // TODO: need to loop versions
     public function testAsVersion() {

diff --git a/tests/RemoteLRSTest.php b/tests/RemoteLRSTest.php
@@ -199,9 +199,6 @@ public function testRetrieveActivityProfile() {
         );
 
         $this->assertInstanceOf('TinCan\LRSResponse', $response);
-        print_r($response->httpResponse['headers']);
-        print "\n\n";
-        print_r($response->content);
     }
 
     public function testSaveActivityProfile() {

diff --git a/tests/StatementTest.php b/tests/StatementTest.php
@@ -150,6 +150,6 @@ public function testAsVersion() {
 
         $versioned = $obj->asVersion('1.0.0');
 
-        print json_encode($versioned, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        //print json_encode($versioned, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
     }
 }