Unit test

arunlodhi · Jul 14, 2013 · f7c5911 · f7c5911
1 parent 7522784
commit f7c5911
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/unit-tests/ConfigTest.php b/unit-tests/ConfigTest.php
@@ -78,7 +78,13 @@ public function testIniConfig()
 		$this->assertTrue($this->_compareConfig($this->_config, $config));
 	}
 
-	public function testStandarConfig()
+	public function testJSONConfig()
+	{
+		$config = new Phalcon\Config\Adapter\Json('unit-tests/config/config.json');
+		$this->assertTrue($this->_compareConfig($this->_config, $config));
+	}
+
+	public function testStandardConfig()
 	{
 		$config = new Phalcon\Config($this->_config);
 		$this->_compareConfig($this->_config, $config);

diff --git a/unit-tests/config/config.ini b/unit-tests/config/config.ini
diff --git a/unit-tests/config/config.json b/unit-tests/config/config.json
@@ -0,0 +1 @@
+{"phalcon":{"baseuri":"\/phalcon\/"},"models":{"metadata":"memory"},"database":{"adapter":"mysql","host":"localhost","username":"user","password":"passwd","name":"demo"},"test":{"parent":{"property2":"yeah"}}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"phalcon":{"baseuri":"\/phalcon\/"},"models":{"metadata":"memory"},"database":{"adapter":"mysql","host":"localhost","username":"user","password":"passwd","name":"demo"},"test":{"parent":{"property2":"yeah"}}}