@@ -39,137 +39,137 @@ |
||
39 | 39 | * @author Guillaume Viguier-Just <[email protected]> |
40 | 40 | * @licence http://www.gnu.org/licenses/gpl.txt |
41 | 41 | */ |
42 | - class PENSResponse extends PENSMessage { |
|
43 | - /** |
|
44 | - * Error code |
|
45 | - * @var int |
|
46 | - */ |
|
47 | - protected $_error = null; |
|
42 | + class PENSResponse extends PENSMessage { |
|
43 | + /** |
|
44 | + * Error code |
|
45 | + * @var int |
|
46 | + */ |
|
47 | + protected $_error = null; |
|
48 | 48 | |
49 | - /** |
|
50 | - * Descriptive text of the error |
|
51 | - * @var string |
|
52 | - */ |
|
53 | - protected $_error_text = null; |
|
49 | + /** |
|
50 | + * Descriptive text of the error |
|
51 | + * @var string |
|
52 | + */ |
|
53 | + protected $_error_text = null; |
|
54 | 54 | |
55 | - /** |
|
56 | - * Data linked to the error |
|
57 | - * @var string |
|
58 | - */ |
|
59 | - protected $_pens_data = null; |
|
55 | + /** |
|
56 | + * Data linked to the error |
|
57 | + * @var string |
|
58 | + */ |
|
59 | + protected $_pens_data = null; |
|
60 | 60 | |
61 | - /** |
|
62 | - * Version |
|
63 | - * @var string |
|
64 | - */ |
|
65 | - protected $_pens_version = null; |
|
61 | + /** |
|
62 | + * Version |
|
63 | + * @var string |
|
64 | + */ |
|
65 | + protected $_pens_version = null; |
|
66 | 66 | |
67 | - /** |
|
68 | - * Constructor |
|
69 | - * |
|
70 | - * @param mixed Can be a PENSException or an error code or a string representing an HTTP response |
|
71 | - * @param string error text |
|
72 | - * @param string PENS data |
|
73 | - */ |
|
74 | - public function __construct($error, $error_text = null, $pens_data = null) { |
|
75 | - $this->_pens_version = PENSConfig::$version; |
|
76 | - if($error instanceof PENSException) { |
|
77 | - $this->_error = $error->getCode(); |
|
78 | - $this->_error_text = $error->getMessage(); |
|
79 | - } else if(is_string($error)){ |
|
80 | - // Parse the string |
|
81 | - $this->parseResponse($error); |
|
82 | - } else if(is_array($error)) { |
|
83 | - // Try to build from array |
|
84 | - $this->_error = $error["error"]; |
|
85 | - $this->_error_text = $error["error-text"]; |
|
86 | - $this->_pens_data = $error["pens-data"]; |
|
87 | - } else { |
|
88 | - $this->_error = $error; |
|
89 | - $this->_error_text = $error_text; |
|
90 | - $this->_pens_data = $pens_data; |
|
91 | - } |
|
67 | + /** |
|
68 | + * Constructor |
|
69 | + * |
|
70 | + * @param mixed Can be a PENSException or an error code or a string representing an HTTP response |
|
71 | + * @param string error text |
|
72 | + * @param string PENS data |
|
73 | + */ |
|
74 | + public function __construct($error, $error_text = null, $pens_data = null) { |
|
75 | + $this->_pens_version = PENSConfig::$version; |
|
76 | + if($error instanceof PENSException) { |
|
77 | + $this->_error = $error->getCode(); |
|
78 | + $this->_error_text = $error->getMessage(); |
|
79 | + } else if(is_string($error)){ |
|
80 | + // Parse the string |
|
81 | + $this->parseResponse($error); |
|
82 | + } else if(is_array($error)) { |
|
83 | + // Try to build from array |
|
84 | + $this->_error = $error["error"]; |
|
85 | + $this->_error_text = $error["error-text"]; |
|
86 | + $this->_pens_data = $error["pens-data"]; |
|
87 | + } else { |
|
88 | + $this->_error = $error; |
|
89 | + $this->_error_text = $error_text; |
|
90 | + $this->_pens_data = $pens_data; |
|
91 | + } |
|
92 | 92 | |
93 | - } |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * Parses an HTTP response and assigns the attributes of the object |
|
97 | - * |
|
98 | - * @param string HTTP response |
|
99 | - */ |
|
100 | - protected function parseResponse($response) { |
|
101 | - $lines = explode(PENSConfig::$eol, $response); |
|
102 | - $i = 1; |
|
103 | - foreach($lines as $line) { |
|
104 | - if($i < 5) { |
|
105 | - $pair = explode("=", $line); |
|
106 | - if($pair[0] == "error") { |
|
107 | - $this->_error = intval($pair[1]); |
|
108 | - } else if($pair[0] == "error-text") { |
|
109 | - $this->_error_text = $pair[1]; |
|
110 | - } else if($pair[0] == "version") { |
|
111 | - $this->_pens_version = $pair[1]; |
|
112 | - } else if($pair[0] == "pens-data") { |
|
113 | - if(!empty($pair[1])) { |
|
114 | - $this->_pens_data = $pair[1].PENSConfig::$eol; |
|
115 | - } |
|
116 | - } |
|
117 | - } else { |
|
118 | - if(!empty($line)) { |
|
119 | - $this->_pens_data .= $line.PENSConfig::$eol; |
|
120 | - } |
|
121 | - } |
|
122 | - $i++; |
|
123 | - } |
|
124 | - } |
|
95 | + /** |
|
96 | + * Parses an HTTP response and assigns the attributes of the object |
|
97 | + * |
|
98 | + * @param string HTTP response |
|
99 | + */ |
|
100 | + protected function parseResponse($response) { |
|
101 | + $lines = explode(PENSConfig::$eol, $response); |
|
102 | + $i = 1; |
|
103 | + foreach($lines as $line) { |
|
104 | + if($i < 5) { |
|
105 | + $pair = explode("=", $line); |
|
106 | + if($pair[0] == "error") { |
|
107 | + $this->_error = intval($pair[1]); |
|
108 | + } else if($pair[0] == "error-text") { |
|
109 | + $this->_error_text = $pair[1]; |
|
110 | + } else if($pair[0] == "version") { |
|
111 | + $this->_pens_version = $pair[1]; |
|
112 | + } else if($pair[0] == "pens-data") { |
|
113 | + if(!empty($pair[1])) { |
|
114 | + $this->_pens_data = $pair[1].PENSConfig::$eol; |
|
115 | + } |
|
116 | + } |
|
117 | + } else { |
|
118 | + if(!empty($line)) { |
|
119 | + $this->_pens_data .= $line.PENSConfig::$eol; |
|
120 | + } |
|
121 | + } |
|
122 | + $i++; |
|
123 | + } |
|
124 | + } |
|
125 | 125 | |
126 | - public function getError() { |
|
127 | - return $this->_error; |
|
128 | - } |
|
126 | + public function getError() { |
|
127 | + return $this->_error; |
|
128 | + } |
|
129 | 129 | |
130 | - public function getErrorText() { |
|
131 | - return $this->_error_text; |
|
132 | - } |
|
130 | + public function getErrorText() { |
|
131 | + return $this->_error_text; |
|
132 | + } |
|
133 | 133 | |
134 | - public function getPensData() { |
|
135 | - return $this->_pens_data; |
|
136 | - } |
|
134 | + public function getPensData() { |
|
135 | + return $this->_pens_data; |
|
136 | + } |
|
137 | 137 | |
138 | - public function getVersion() { |
|
139 | - return $this->_pens_version; |
|
140 | - } |
|
138 | + public function getVersion() { |
|
139 | + return $this->_pens_version; |
|
140 | + } |
|
141 | 141 | |
142 | - /** |
|
143 | - * Sends the response content through HTTP headers |
|
144 | - */ |
|
145 | - public function send() { |
|
146 | - header("Content-Type: text/plain"); |
|
147 | - print $this; |
|
148 | - } |
|
142 | + /** |
|
143 | + * Sends the response content through HTTP headers |
|
144 | + */ |
|
145 | + public function send() { |
|
146 | + header("Content-Type: text/plain"); |
|
147 | + print $this; |
|
148 | + } |
|
149 | 149 | |
150 | - /** |
|
151 | - * Returns an associative array of the response |
|
152 | - * |
|
153 | - * @return array Associative array |
|
154 | - */ |
|
155 | - public function getArray() { |
|
156 | - return array("error" => $this->_error, |
|
157 | - "error-text" => $this->_error_text, |
|
158 | - "version" => PENSConfig::$version, |
|
159 | - "pens-data" => $this->_pens_data); |
|
160 | - } |
|
150 | + /** |
|
151 | + * Returns an associative array of the response |
|
152 | + * |
|
153 | + * @return array Associative array |
|
154 | + */ |
|
155 | + public function getArray() { |
|
156 | + return array("error" => $this->_error, |
|
157 | + "error-text" => $this->_error_text, |
|
158 | + "version" => PENSConfig::$version, |
|
159 | + "pens-data" => $this->_pens_data); |
|
160 | + } |
|
161 | 161 | |
162 | - /** |
|
163 | - * Transforms the object into a string |
|
164 | - */ |
|
165 | - public function __toString() { |
|
166 | - $eol = PENSConfig::$eol; |
|
167 | - $return = "error=".$this->_error.$eol; |
|
168 | - $return .= "error-text=".$this->_error_text.$eol; |
|
169 | - $return .= "version=".PENSConfig::$version.$eol; |
|
170 | - $return .= "pens-data=".$this->_pens_data.$eol; |
|
171 | - return $return; |
|
172 | - } |
|
162 | + /** |
|
163 | + * Transforms the object into a string |
|
164 | + */ |
|
165 | + public function __toString() { |
|
166 | + $eol = PENSConfig::$eol; |
|
167 | + $return = "error=".$this->_error.$eol; |
|
168 | + $return .= "error-text=".$this->_error_text.$eol; |
|
169 | + $return .= "version=".PENSConfig::$version.$eol; |
|
170 | + $return .= "pens-data=".$this->_pens_data.$eol; |
|
171 | + return $return; |
|
172 | + } |
|
173 | 173 | |
174 | - } |
|
174 | + } |
|
175 | 175 |
@@ -26,9 +26,9 @@ |
||
26 | 26 | require_once __DIR__ . '/pens.php'; |
27 | 27 | |
28 | 28 | class MyRequestHandler extends PENSRequestHandler { |
29 | - public function processRequest($request, $response) { |
|
30 | - // Do the processing of the alert or the receipt here |
|
31 | - } |
|
29 | + public function processRequest($request, $response) { |
|
30 | + // Do the processing of the alert or the receipt here |
|
31 | + } |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | $handler = new MyRequestHandler(); |
@@ -26,9 +26,9 @@ |
||
26 | 26 | require_once __DIR__ . '/pens.php'; |
27 | 27 | |
28 | 28 | class MyPackageHandler extends PENSPackageHandler { |
29 | - public function processPackage($request, $path_to_package) { |
|
30 | - // Do the package processing here |
|
31 | - } |
|
29 | + public function processPackage($request, $path_to_package) { |
|
30 | + // Do the package processing here |
|
31 | + } |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | $handler = new MyPackageHandler(); |
@@ -44,25 +44,25 @@ |
||
44 | 44 | */ |
45 | 45 | class TestPENSResponse extends UnitTestCase { |
46 | 46 | |
47 | - public function testCreationFromPENSException() { |
|
48 | - $object = new PENSResponse(new PENSException(1101)); |
|
49 | - $this->assertEqual($object->getError(), 1101); |
|
50 | - $this->assertNotNull($object->getErrorText()); |
|
51 | - } |
|
47 | + public function testCreationFromPENSException() { |
|
48 | + $object = new PENSResponse(new PENSException(1101)); |
|
49 | + $this->assertEqual($object->getError(), 1101); |
|
50 | + $this->assertNotNull($object->getErrorText()); |
|
51 | + } |
|
52 | 52 | |
53 | - public function testCreationFromArguments() { |
|
54 | - $object = new PENSResponse(0, "collect command received and understood"); |
|
55 | - $this->assertIdentical($object->getError(), 0); |
|
56 | - $this->assertEqual($object->getErrorText(), "collect command received and understood"); |
|
57 | - } |
|
53 | + public function testCreationFromArguments() { |
|
54 | + $object = new PENSResponse(0, "collect command received and understood"); |
|
55 | + $this->assertIdentical($object->getError(), 0); |
|
56 | + $this->assertEqual($object->getErrorText(), "collect command received and understood"); |
|
57 | + } |
|
58 | 58 | |
59 | - public function testCreationFromHTTPResponse() { |
|
60 | - $eol = PENSConfig::$eol; |
|
61 | - $response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol; |
|
62 | - $object = new PENSResponse($response); |
|
63 | - $this->assertIdentical($object->getError(), 1101); |
|
64 | - $this->assertIdentical($object->getErrorText(), "unable to parse PENS command"); |
|
65 | - $this->assertIdentical($object->getVersion(), "1.0.0"); |
|
66 | - $this->assertNull($object->getPensData()); |
|
67 | - } |
|
59 | + public function testCreationFromHTTPResponse() { |
|
60 | + $eol = PENSConfig::$eol; |
|
61 | + $response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol; |
|
62 | + $object = new PENSResponse($response); |
|
63 | + $this->assertIdentical($object->getError(), 1101); |
|
64 | + $this->assertIdentical($object->getErrorText(), "unable to parse PENS command"); |
|
65 | + $this->assertIdentical($object->getVersion(), "1.0.0"); |
|
66 | + $this->assertNull($object->getPensData()); |
|
67 | + } |
|
68 | 68 | } |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | require_once(dirname(__FILE__)."/../pens.php"); |
34 | 34 | |
35 | 35 | class MyPackageHandler extends PENSPackageHandler { |
36 | - public function processPackage($request, $path_to_package) { |
|
37 | - } |
|
36 | + public function processPackage($request, $path_to_package) { |
|
37 | + } |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -49,39 +49,39 @@ discard block |
||
49 | 49 | */ |
50 | 50 | class TestPENSPackageHandler extends UnitTestCase { |
51 | 51 | |
52 | - public function testSupportedPackageTypesInvalid() { |
|
53 | - $object = new MyPackageHandler(); |
|
54 | - $object->setSupportedPackageTypes("testing"); |
|
55 | - $this->assertEqual($object->getSupportedPackageTypes(), null); |
|
56 | - } |
|
52 | + public function testSupportedPackageTypesInvalid() { |
|
53 | + $object = new MyPackageHandler(); |
|
54 | + $object->setSupportedPackageTypes("testing"); |
|
55 | + $this->assertEqual($object->getSupportedPackageTypes(), null); |
|
56 | + } |
|
57 | 57 | |
58 | - public function testSupportedPackageTypesInvalid2() { |
|
59 | - $object = new MyPackageHandler(); |
|
60 | - $object->setSupportedPackageTypes(array("aicc-pkg", "testing")); |
|
61 | - $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg")); |
|
62 | - } |
|
58 | + public function testSupportedPackageTypesInvalid2() { |
|
59 | + $object = new MyPackageHandler(); |
|
60 | + $object->setSupportedPackageTypes(array("aicc-pkg", "testing")); |
|
61 | + $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg")); |
|
62 | + } |
|
63 | 63 | |
64 | - public function testSupportedPackageTypesValid() { |
|
65 | - $object = new MyPackageHandler(); |
|
66 | - $object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti")); |
|
67 | - $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti")); |
|
68 | - } |
|
64 | + public function testSupportedPackageTypesValid() { |
|
65 | + $object = new MyPackageHandler(); |
|
66 | + $object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti")); |
|
67 | + $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti")); |
|
68 | + } |
|
69 | 69 | |
70 | - public function testSupportedPackageFormatsInvalid() { |
|
71 | - $object = new MyPackageHandler(); |
|
72 | - $object->setSupportedPackageFormats("testing"); |
|
73 | - $this->assertEqual($object->getSupportedPackageFormats(), null); |
|
74 | - } |
|
70 | + public function testSupportedPackageFormatsInvalid() { |
|
71 | + $object = new MyPackageHandler(); |
|
72 | + $object->setSupportedPackageFormats("testing"); |
|
73 | + $this->assertEqual($object->getSupportedPackageFormats(), null); |
|
74 | + } |
|
75 | 75 | |
76 | - public function testSupportedPackageFormatsInvalid2() { |
|
77 | - $object = new MyPackageHandler(); |
|
78 | - $object->setSupportedPackageFormats(array("zip", "testing")); |
|
79 | - $this->assertEqual($object->getSupportedPackageFormats(), array("zip")); |
|
80 | - } |
|
76 | + public function testSupportedPackageFormatsInvalid2() { |
|
77 | + $object = new MyPackageHandler(); |
|
78 | + $object->setSupportedPackageFormats(array("zip", "testing")); |
|
79 | + $this->assertEqual($object->getSupportedPackageFormats(), array("zip")); |
|
80 | + } |
|
81 | 81 | |
82 | - public function testSupportedPackageFormatsValid() { |
|
83 | - $object = new MyPackageHandler(); |
|
84 | - $object->setSupportedPackageFormats(array("zip", "jar")); |
|
85 | - $this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar")); |
|
86 | - } |
|
82 | + public function testSupportedPackageFormatsValid() { |
|
83 | + $object = new MyPackageHandler(); |
|
84 | + $object->setSupportedPackageFormats(array("zip", "jar")); |
|
85 | + $this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar")); |
|
86 | + } |
|
87 | 87 | } |
@@ -46,77 +46,77 @@ |
||
46 | 46 | */ |
47 | 47 | class TestPENSServer extends WebTestCase { |
48 | 48 | |
49 | - private $_valid_params = array( |
|
50 | - "command" => "collect", |
|
51 | - "pens-version" => "1.0.0", |
|
52 | - "package-type" => "aicc-pkg", |
|
53 | - "package-type-version" => "1.0", |
|
54 | - "package-format" => "zip", |
|
55 | - "package-id" => "http://myurl.com/12345", |
|
56 | - "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
57 | - "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
58 | - "client" => "test-pens-server", |
|
59 | - "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
49 | + private $_valid_params = array( |
|
50 | + "command" => "collect", |
|
51 | + "pens-version" => "1.0.0", |
|
52 | + "package-type" => "aicc-pkg", |
|
53 | + "package-type-version" => "1.0", |
|
54 | + "package-format" => "zip", |
|
55 | + "package-id" => "http://myurl.com/12345", |
|
56 | + "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip", |
|
57 | + "package-url-expiry" => "2099-04-09T14:17:43Z", |
|
58 | + "client" => "test-pens-server", |
|
59 | + "receipt" => PENS_TEST_RECEIPT_MAILTO); |
|
60 | 60 | |
61 | - public function testEmptyQuery() { |
|
62 | - $this->get(PENS_TEST_SERVER_URL); |
|
63 | - $this->assertText("error=2002"); |
|
64 | - } |
|
61 | + public function testEmptyQuery() { |
|
62 | + $this->get(PENS_TEST_SERVER_URL); |
|
63 | + $this->assertText("error=2002"); |
|
64 | + } |
|
65 | 65 | |
66 | - public function testValidQuery() { |
|
67 | - $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
68 | - $this->assertText("error=0"); |
|
69 | - } |
|
66 | + public function testValidQuery() { |
|
67 | + $this->get(PENS_TEST_SERVER_URL, $this->_valid_params); |
|
68 | + $this->assertText("error=0"); |
|
69 | + } |
|
70 | 70 | |
71 | - private function invalidParameterTest($name, $value, $error) { |
|
72 | - $params = $this->_valid_params; |
|
73 | - $params[$name] = $value; |
|
74 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
75 | - $this->assertText("error=".$error); |
|
76 | - } |
|
71 | + private function invalidParameterTest($name, $value, $error) { |
|
72 | + $params = $this->_valid_params; |
|
73 | + $params[$name] = $value; |
|
74 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
75 | + $this->assertText("error=".$error); |
|
76 | + } |
|
77 | 77 | |
78 | - private function validParameterTest($name, $value) { |
|
79 | - $params = $this->_valid_params; |
|
80 | - $params[$name] = $value; |
|
81 | - $this->get(PENS_TEST_SERVER_URL, $params); |
|
82 | - $this->assertText("error=0"); |
|
83 | - } |
|
78 | + private function validParameterTest($name, $value) { |
|
79 | + $params = $this->_valid_params; |
|
80 | + $params[$name] = $value; |
|
81 | + $this->get(PENS_TEST_SERVER_URL, $params); |
|
82 | + $this->assertText("error=0"); |
|
83 | + } |
|
84 | 84 | |
85 | - public function testInvalidCommand() { |
|
86 | - $this->invalidParameterTest("command", "invalid", 2002); |
|
87 | - } |
|
85 | + public function testInvalidCommand() { |
|
86 | + $this->invalidParameterTest("command", "invalid", 2002); |
|
87 | + } |
|
88 | 88 | |
89 | - public function testInvalidVersion() { |
|
90 | - $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
91 | - } |
|
89 | + public function testInvalidVersion() { |
|
90 | + $this->invalidParameterTest("pens-version", "0.8.0", 2001); |
|
91 | + } |
|
92 | 92 | |
93 | - public function testInvalidPackageType() { |
|
94 | - $this->invalidParameterTest("package-type", "invalid", 2003); |
|
95 | - } |
|
93 | + public function testInvalidPackageType() { |
|
94 | + $this->invalidParameterTest("package-type", "invalid", 2003); |
|
95 | + } |
|
96 | 96 | |
97 | - public function testEmptyPackageTypeVersion() { |
|
98 | - $this->invalidParameterTest("package-type-version", null, 2004); |
|
99 | - } |
|
97 | + public function testEmptyPackageTypeVersion() { |
|
98 | + $this->invalidParameterTest("package-type-version", null, 2004); |
|
99 | + } |
|
100 | 100 | |
101 | - public function testInvalidPackageFormat() { |
|
102 | - $this->invalidParameterTest("package-format", "invalid", 2005); |
|
103 | - } |
|
101 | + public function testInvalidPackageFormat() { |
|
102 | + $this->invalidParameterTest("package-format", "invalid", 2005); |
|
103 | + } |
|
104 | 104 | |
105 | - public function testInvalidPackageId() { |
|
106 | - $this->invalidParameterTest("package-id", "invalid", 2007); |
|
107 | - } |
|
105 | + public function testInvalidPackageId() { |
|
106 | + $this->invalidParameterTest("package-id", "invalid", 2007); |
|
107 | + } |
|
108 | 108 | |
109 | - public function testInvalidPackageUrl() { |
|
110 | - $this->invalidParameterTest("package-url", "invalid", 2008); |
|
111 | - } |
|
109 | + public function testInvalidPackageUrl() { |
|
110 | + $this->invalidParameterTest("package-url", "invalid", 2008); |
|
111 | + } |
|
112 | 112 | |
113 | - public function testInvalidPackageUrlExpiry() { |
|
114 | - $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
115 | - } |
|
113 | + public function testInvalidPackageUrlExpiry() { |
|
114 | + $this->invalidParameterTest("package-url-expiry", "invalid", 2009); |
|
115 | + } |
|
116 | 116 | |
117 | - public function testValidPackageUrlExpiry() { |
|
118 | - $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
119 | - } |
|
117 | + public function testValidPackageUrlExpiry() { |
|
118 | + $this->validParameterTest("package-url-expiry", "2099-01-01"); |
|
119 | + } |
|
120 | 120 | |
121 | 121 | } |
122 | 122 |
@@ -44,170 +44,170 @@ |
||
44 | 44 | */ |
45 | 45 | class TestPENSRequest extends UnitTestCase { |
46 | 46 | |
47 | - /** |
|
48 | - * Valid arguments to be used for tests |
|
49 | - * |
|
50 | - * @var array |
|
51 | - */ |
|
52 | - private $args = null; |
|
53 | - |
|
54 | - public function setUp() { |
|
55 | - $this->args = array( |
|
56 | - "pens-version" => "1.0.0", |
|
57 | - "command" => "collect", |
|
58 | - "package-type" => "aicc-pkg", |
|
59 | - "package-type-version" => "1.0", |
|
60 | - "package-format" => "zip", |
|
61 | - "package-id" => "http://myurl.com/12345", |
|
62 | - "package-url" => "http://myurl.com/mypackage.zip", |
|
63 | - "package-url-expiry" => "2006-04-01T06:51:29Z", |
|
64 | - "client" => "Authorware7", |
|
65 | - "receipt" => "mailto:[email protected]", |
|
66 | - "package-url-user-id" => "guillaumev", |
|
67 | - "package-url-account" => "toto", |
|
68 | - "package-url-password" => "12345", |
|
69 | - "system-user-id" => "guillaumev", |
|
70 | - "system-password" => "12345", |
|
71 | - "alerts" => "http://myurl.com/alerts", |
|
72 | - "vendor-data" => "here are my data"); |
|
73 | - } |
|
74 | - |
|
75 | - public function createObject($myargs) { |
|
76 | - return PENSRequestFactory::createPENSRequest($myargs); |
|
77 | - } |
|
78 | - |
|
79 | - public function exceptionTestForValue($key, $value, $code) { |
|
80 | - try { |
|
81 | - $myargs = $this->args; |
|
82 | - if($value === null) { |
|
83 | - unset($myargs[$key]); |
|
84 | - } else { |
|
85 | - $myargs[$key] = $value; |
|
86 | - } |
|
87 | - $object = $this->createObject($myargs); |
|
88 | - $this->fail(); |
|
89 | - } catch(PENSException $e) { |
|
90 | - $this->assertEqual($e->getCode(), $code); |
|
91 | - } |
|
92 | - } |
|
93 | - |
|
94 | - public function testPensVersionInvalid() { |
|
95 | - $this->exceptionTestForValue("pens-version", "0.8.0", 2001); |
|
96 | - } |
|
97 | - |
|
98 | - public function testPensVersionNull() { |
|
99 | - $this->exceptionTestForValue("pens-version", null, 2001); |
|
100 | - } |
|
101 | - |
|
102 | - |
|
103 | - public function testCommandInvalid() { |
|
104 | - $this->exceptionTestForValue("command", "testing", 2002); |
|
105 | - } |
|
106 | - |
|
107 | - public function testCommandNull() { |
|
108 | - $this->exceptionTestForValue("command", null, 2002); |
|
109 | - } |
|
110 | - |
|
111 | - public function testPackageTypeInvalid() { |
|
112 | - $this->exceptionTestForValue("package-type", "testing", 2003); |
|
113 | - } |
|
114 | - |
|
115 | - public function testPackageTypeNull() { |
|
116 | - $this->exceptionTestForValue("package-type", null, 2003); |
|
117 | - } |
|
118 | - |
|
119 | - public function testPackageTypeVersionNull() { |
|
120 | - $this->exceptionTestForValue("package-type-version", null, 2004); |
|
121 | - } |
|
122 | - |
|
123 | - public function testPackageFormatInvalid() { |
|
124 | - $this->exceptionTestForValue("package-format", "testing", 2005); |
|
125 | - } |
|
126 | - |
|
127 | - public function testPackageFormatNull() { |
|
128 | - $this->exceptionTestForValue("package-format", null, 2005); |
|
129 | - } |
|
130 | - |
|
131 | - public function testPackageIdInvalid() { |
|
132 | - $this->exceptionTestForValue("package-id", "testing", 2007); |
|
133 | - } |
|
134 | - |
|
135 | - public function testPackageIdNull() { |
|
136 | - $this->exceptionTestForValue("package-id", null, 2007); |
|
137 | - } |
|
138 | - |
|
139 | - public function testPackageUrlInvalid() { |
|
140 | - $this->exceptionTestForValue("package-url", "testing", 2008); |
|
141 | - } |
|
142 | - |
|
143 | - public function testPackageUrlInvalid2() { |
|
144 | - $this->exceptionTestForValue("package-url", "http://myurl.com/mypackage", 2008); |
|
145 | - } |
|
146 | - |
|
147 | - public function testPackageUrlNull() { |
|
148 | - $this->exceptionTestForValue("package-url", null, 2008); |
|
149 | - } |
|
150 | - |
|
151 | - public function testPackageUrlExpiryNull() { |
|
152 | - $this->exceptionTestForValue("package-url-expiry", null, 2009); |
|
153 | - } |
|
154 | - |
|
155 | - public function testPackageUrlExpiryInvalid() { |
|
156 | - $this->exceptionTestForValue("package-url-expiry", "testing", 2009); |
|
157 | - } |
|
158 | - |
|
159 | - public function testClientNull() { |
|
160 | - $this->exceptionTestForValue("client", null, 2010); |
|
161 | - } |
|
162 | - |
|
163 | - public function testReceiptNull() { |
|
164 | - $this->exceptionTestForValue("receipt", null, 2011); |
|
165 | - } |
|
166 | - |
|
167 | - public function testReceiptInvalid() { |
|
168 | - $this->exceptionTestForValue("receipt", "testing", 2011); |
|
169 | - } |
|
170 | - |
|
171 | - public function testAlertsInvalid() { |
|
172 | - $this->exceptionTestForValue("alerts", "testing", 1201); |
|
173 | - } |
|
174 | - |
|
175 | - public function testReceiptValid() { |
|
176 | - try { |
|
177 | - $myargs = $this->args; |
|
178 | - $myargs["receipt"] = "mailto:[email protected],[email protected]"; |
|
179 | - $object = $this->createObject($myargs); |
|
180 | - $this->pass(); |
|
181 | - } catch(PENSException $e) { |
|
182 | - $this->fail(); |
|
183 | - } |
|
184 | - } |
|
185 | - |
|
186 | - public function testValid() { |
|
187 | - try { |
|
188 | - $object = $this->createObject($this->args); |
|
189 | - $this->assertIsA($object, "PENSRequestCollect"); |
|
190 | - $this->assertEqual($object->getPensVersion(), "1.0.0"); |
|
191 | - $this->assertEqual($object->getPackageType(), "aicc-pkg"); |
|
192 | - $this->assertEqual($object->getPackageTypeVersion(), "1.0"); |
|
193 | - $this->assertEqual($object->getPackageFormat(), "zip"); |
|
194 | - $this->assertEqual($object->getPackageId(), "http://myurl.com/12345"); |
|
195 | - $this->assertEqual($object->getPackageUrl(), "http://myurl.com/mypackage.zip"); |
|
196 | - $this->assertIsA($object->getPackageUrlExpiry(), "DateTime"); |
|
197 | - $this->assertEqual($object->getClient(), "Authorware7"); |
|
198 | - $this->assertEqual($object->getReceipt(), "mailto:[email protected]"); |
|
199 | - $this->assertEqual($object->getPackageUrlUserId(), "guillaumev"); |
|
200 | - $this->assertEqual($object->getPackageUrlAccount(), "toto"); |
|
201 | - $this->assertEqual($object->getPackageUrlPassword(), "12345"); |
|
202 | - $this->assertEqual($object->getSystemUserId(), "guillaumev"); |
|
203 | - $this->assertEqual($object->getSystemPassword(), "12345"); |
|
204 | - $this->assertEqual($object->getAlerts(), "http://myurl.com/alerts"); |
|
205 | - $this->assertEqual($object->getVendorData(), "here are my data"); |
|
47 | + /** |
|
48 | + * Valid arguments to be used for tests |
|
49 | + * |
|
50 | + * @var array |
|
51 | + */ |
|
52 | + private $args = null; |
|
53 | + |
|
54 | + public function setUp() { |
|
55 | + $this->args = array( |
|
56 | + "pens-version" => "1.0.0", |
|
57 | + "command" => "collect", |
|
58 | + "package-type" => "aicc-pkg", |
|
59 | + "package-type-version" => "1.0", |
|
60 | + "package-format" => "zip", |
|
61 | + "package-id" => "http://myurl.com/12345", |
|
62 | + "package-url" => "http://myurl.com/mypackage.zip", |
|
63 | + "package-url-expiry" => "2006-04-01T06:51:29Z", |
|
64 | + "client" => "Authorware7", |
|
65 | + "receipt" => "mailto:[email protected]", |
|
66 | + "package-url-user-id" => "guillaumev", |
|
67 | + "package-url-account" => "toto", |
|
68 | + "package-url-password" => "12345", |
|
69 | + "system-user-id" => "guillaumev", |
|
70 | + "system-password" => "12345", |
|
71 | + "alerts" => "http://myurl.com/alerts", |
|
72 | + "vendor-data" => "here are my data"); |
|
73 | + } |
|
74 | + |
|
75 | + public function createObject($myargs) { |
|
76 | + return PENSRequestFactory::createPENSRequest($myargs); |
|
77 | + } |
|
78 | + |
|
79 | + public function exceptionTestForValue($key, $value, $code) { |
|
80 | + try { |
|
81 | + $myargs = $this->args; |
|
82 | + if($value === null) { |
|
83 | + unset($myargs[$key]); |
|
84 | + } else { |
|
85 | + $myargs[$key] = $value; |
|
86 | + } |
|
87 | + $object = $this->createObject($myargs); |
|
88 | + $this->fail(); |
|
89 | + } catch(PENSException $e) { |
|
90 | + $this->assertEqual($e->getCode(), $code); |
|
91 | + } |
|
92 | + } |
|
93 | + |
|
94 | + public function testPensVersionInvalid() { |
|
95 | + $this->exceptionTestForValue("pens-version", "0.8.0", 2001); |
|
96 | + } |
|
97 | + |
|
98 | + public function testPensVersionNull() { |
|
99 | + $this->exceptionTestForValue("pens-version", null, 2001); |
|
100 | + } |
|
101 | + |
|
102 | + |
|
103 | + public function testCommandInvalid() { |
|
104 | + $this->exceptionTestForValue("command", "testing", 2002); |
|
105 | + } |
|
106 | + |
|
107 | + public function testCommandNull() { |
|
108 | + $this->exceptionTestForValue("command", null, 2002); |
|
109 | + } |
|
110 | + |
|
111 | + public function testPackageTypeInvalid() { |
|
112 | + $this->exceptionTestForValue("package-type", "testing", 2003); |
|
113 | + } |
|
114 | + |
|
115 | + public function testPackageTypeNull() { |
|
116 | + $this->exceptionTestForValue("package-type", null, 2003); |
|
117 | + } |
|
118 | + |
|
119 | + public function testPackageTypeVersionNull() { |
|
120 | + $this->exceptionTestForValue("package-type-version", null, 2004); |
|
121 | + } |
|
122 | + |
|
123 | + public function testPackageFormatInvalid() { |
|
124 | + $this->exceptionTestForValue("package-format", "testing", 2005); |
|
125 | + } |
|
126 | + |
|
127 | + public function testPackageFormatNull() { |
|
128 | + $this->exceptionTestForValue("package-format", null, 2005); |
|
129 | + } |
|
130 | + |
|
131 | + public function testPackageIdInvalid() { |
|
132 | + $this->exceptionTestForValue("package-id", "testing", 2007); |
|
133 | + } |
|
134 | + |
|
135 | + public function testPackageIdNull() { |
|
136 | + $this->exceptionTestForValue("package-id", null, 2007); |
|
137 | + } |
|
138 | + |
|
139 | + public function testPackageUrlInvalid() { |
|
140 | + $this->exceptionTestForValue("package-url", "testing", 2008); |
|
141 | + } |
|
142 | + |
|
143 | + public function testPackageUrlInvalid2() { |
|
144 | + $this->exceptionTestForValue("package-url", "http://myurl.com/mypackage", 2008); |
|
145 | + } |
|
146 | + |
|
147 | + public function testPackageUrlNull() { |
|
148 | + $this->exceptionTestForValue("package-url", null, 2008); |
|
149 | + } |
|
150 | + |
|
151 | + public function testPackageUrlExpiryNull() { |
|
152 | + $this->exceptionTestForValue("package-url-expiry", null, 2009); |
|
153 | + } |
|
154 | + |
|
155 | + public function testPackageUrlExpiryInvalid() { |
|
156 | + $this->exceptionTestForValue("package-url-expiry", "testing", 2009); |
|
157 | + } |
|
158 | + |
|
159 | + public function testClientNull() { |
|
160 | + $this->exceptionTestForValue("client", null, 2010); |
|
161 | + } |
|
162 | + |
|
163 | + public function testReceiptNull() { |
|
164 | + $this->exceptionTestForValue("receipt", null, 2011); |
|
165 | + } |
|
166 | + |
|
167 | + public function testReceiptInvalid() { |
|
168 | + $this->exceptionTestForValue("receipt", "testing", 2011); |
|
169 | + } |
|
170 | + |
|
171 | + public function testAlertsInvalid() { |
|
172 | + $this->exceptionTestForValue("alerts", "testing", 1201); |
|
173 | + } |
|
174 | + |
|
175 | + public function testReceiptValid() { |
|
176 | + try { |
|
177 | + $myargs = $this->args; |
|
178 | + $myargs["receipt"] = "mailto:[email protected],[email protected]"; |
|
179 | + $object = $this->createObject($myargs); |
|
180 | + $this->pass(); |
|
181 | + } catch(PENSException $e) { |
|
182 | + $this->fail(); |
|
183 | + } |
|
184 | + } |
|
185 | + |
|
186 | + public function testValid() { |
|
187 | + try { |
|
188 | + $object = $this->createObject($this->args); |
|
189 | + $this->assertIsA($object, "PENSRequestCollect"); |
|
190 | + $this->assertEqual($object->getPensVersion(), "1.0.0"); |
|
191 | + $this->assertEqual($object->getPackageType(), "aicc-pkg"); |
|
192 | + $this->assertEqual($object->getPackageTypeVersion(), "1.0"); |
|
193 | + $this->assertEqual($object->getPackageFormat(), "zip"); |
|
194 | + $this->assertEqual($object->getPackageId(), "http://myurl.com/12345"); |
|
195 | + $this->assertEqual($object->getPackageUrl(), "http://myurl.com/mypackage.zip"); |
|
196 | + $this->assertIsA($object->getPackageUrlExpiry(), "DateTime"); |
|
197 | + $this->assertEqual($object->getClient(), "Authorware7"); |
|
198 | + $this->assertEqual($object->getReceipt(), "mailto:[email protected]"); |
|
199 | + $this->assertEqual($object->getPackageUrlUserId(), "guillaumev"); |
|
200 | + $this->assertEqual($object->getPackageUrlAccount(), "toto"); |
|
201 | + $this->assertEqual($object->getPackageUrlPassword(), "12345"); |
|
202 | + $this->assertEqual($object->getSystemUserId(), "guillaumev"); |
|
203 | + $this->assertEqual($object->getSystemPassword(), "12345"); |
|
204 | + $this->assertEqual($object->getAlerts(), "http://myurl.com/alerts"); |
|
205 | + $this->assertEqual($object->getVendorData(), "here are my data"); |
|
206 | 206 | |
207 | - } catch(PENSException $e) { |
|
208 | - $this->fail(); |
|
209 | - } |
|
210 | - } |
|
207 | + } catch(PENSException $e) { |
|
208 | + $this->fail(); |
|
209 | + } |
|
210 | + } |
|
211 | 211 | |
212 | 212 | |
213 | 213 | } |
@@ -1069,7 +1069,7 @@ |
||
1069 | 1069 | */ |
1070 | 1070 | public function getStatusMessage($status, $isAble = true) |
1071 | 1071 | { |
1072 | - $message = ''; |
|
1072 | + $message = ''; |
|
1073 | 1073 | switch ($status) { |
1074 | 1074 | case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_NO_QUEUE: |
1075 | 1075 | if ($isAble) { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | if ($data['type'] === HOOK_EVENT_TYPE_PRE) { |
68 | 68 | |
69 | 69 | } elseif ($data['type'] === HOOK_EVENT_TYPE_POST) { |
70 | - /** @var \nusoap_server $server */ |
|
70 | + /** @var \nusoap_server $server */ |
|
71 | 71 | $server = &$data['server']; |
72 | 72 | |
73 | 73 | /** WSSessionListInCategory */ |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | } |
425 | 425 | if (!WSHelperVerifyKey($params)) { |
426 | 426 | |
427 | - //return return_error(WS_ERROR_SECRET_KEY); |
|
427 | + //return return_error(WS_ERROR_SECRET_KEY); |
|
428 | 428 | } |
429 | 429 | // Check if category ID is set |
430 | 430 | if (!empty($params['id']) && empty($params['name'])) { |