Added Swiftlet\Exception, tests

alez007 · Jun 19, 2013 · 3e8b59e · 3e8b59e
1 parent d4bb11b
commit 3e8b59e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/Swiftlet/App.php b/Swiftlet/App.php
@@ -252,11 +252,11 @@ public function autoload($className)
  * @param string $string
  * @param string $file
  * @param int $line
-  *
- * @throws \Exception
+  *
+ * @throws Exception
  */
  public function error($number, $string, $file, $line)
  {
- throw new \Exception('Error #' . $number . ': ' . $string . ' in ' . $file . ' on line ' . $line);
+ throw new Exception('Error #' . $number . ': ' . $string . ' in ' . $file . ' on line ' . $line);
  }
 }
diff --git a/Swiftlet/Controller.php b/Swiftlet/Controller.php
@@ -33,10 +33,10 @@ public function index()
  /**
  * Fallback in case action doesn't exist
  *
- * @throws \Exception
+ * @throws Exception
  */
  public function notImplemented()
  {
- throw new \Exception('Action ' . $this->view->htmlEncode($this->app->getAction()) . ' not implemented in ' . get_called_class());
+ throw new Exception('Action ' . $this->view->htmlEncode($this->app->getAction()) . ' not implemented in ' . get_called_class());
  }
 }
diff --git a/Swiftlet/View.php b/Swiftlet/View.php
@@ -130,7 +130,7 @@ public function htmlDecode($value)
  /**
  * Render the view
  *
- * @throws \Exception
+ * @throws Exception
  */
  public function render()
  {
@@ -139,7 +139,7 @@ public function render()
 
  require $file;
  } else {
- throw new \Exception('View not found');
+ throw new Exception('View not found');
  }
  }
 }
diff --git a/tests/Swiftlet/AppTest.php b/tests/Swiftlet/AppTest.php
@@ -55,16 +55,25 @@ public function testGetAction()
  }
 
  /**
- * @covers Swiftlet\App::setConfig
  * @covers Swiftlet\App::getConfig
  */
- public function testConfig()
+ public function testGetConfig()
+ {
+ $test = $this->app->getConfig('test');
+
+ $this->assertNull($test, 'test');
+ }
+
+ /**
+ * @covers Swiftlet\App::setConfig
+ */
+ public function testSetConfig()
  {
  $this->app->setConfig('test', 'test');
 
  $test = $this->app->getConfig('test');
 
- $this->assertEquals('test', $test);
+ $this->assertEquals($test, 'test');
  }
 
  /**

diff --git a/tests/Swiftlet/ViewTest.php b/tests/Swiftlet/ViewTest.php
@@ -34,7 +34,7 @@ public function testGet()
  {
  $test = $this->view->get('test');
 
- $this->assertEmpty($test);
+ $this->assertNull($test);
  }
 
  /**

diff --git a/www/index.php b/www/index.php
@@ -19,7 +19,7 @@
 
  $app->run();
  $app->serve();
-} catch ( \Exception $e ) {
+} catch ( Exception $e ) {
  if ( !headers_sent() ) {
  header('HTTP/1.1 503 Service Temporarily Unavailable');
  header('Status: 503 Service Temporarily Unavailable');