Changeset 772

Timestamp:

09/22/08 10:09:12 (2 months ago)

Author:

aarkerio

Message:

New Unit Testing models

Location:

trunk/app

Files:

• models/news.php (modified) (3 diffs)
• plugins/scorm/config/sql/scorm_postgresql.sql (added)
• tests/cases/controllers/news_controller.test.php (modified) (3 diffs)
• tests/cases/controllers/podcasts_controller.test.php (added)
• tests/cases/controllers/quotes_controller.test.php (added)
• tests/cases/models/vclassroom.test.php (added)
• tests/cases/models/wiki.test.php (added)
• tests/fixtures/message_test_fixture.php (added)
• tests/fixtures/news_test_fixture.php (modified) (1 diff)
• tests/fixtures/podcast_test_fixture.php (added)
• views/acquaintances/display.ctp (modified) (1 diff)

trunk/app/models/news.php

@@ -10 +10 @@
 class News extends AppModel
 {
-  public $name      = 'News';
+ public $name      = 'News';
     
-  public $belongsTo  = array(
+ public $belongsTo  = array(
              'User' => array(
                              'className'    => 'User',
@@ -24 +24 @@
              );
     
-  public $hasMany  = array(
+ public $hasMany  = array(
              'Discussion' => array(
                                    'className'    => 'Discussion',
@@ -32 +32 @@
                          );
 
-public $validate = array(
+ public $validate = array(
   'title' => array(
                    'rule'       => array('minLength', 4),

trunk/app/tests/cases/controllers/news_controller.test.php

@@ -4 +4 @@
   public function startCase() 
   { 
-    echo '<h1>Starting Test Case</h1>'; 
+    echo '<h1>Starting News Test Case</h1>'; 
   } 
   public function endCase() { 
-    echo '<h1>Ending Test Case</h1>'; 
+    echo '<h1>Ending News Test Case</h1>'; 
   } 
-  public public function startTest($method) { 
+  public function startTest($method) { 
     echo '<h3>Starting method ' . $method . '</h3>'; 
   } 
@@ -15 +15 @@
     echo '<hr />'; 
   } 
-  public function testDisplay() { 
-    $result = $this->testAction('/news/display'); 
+  /* public function testDisplay() 
+  { 
+    $result = $this->testAction('/news/display', array('return'=>'render')); 
     debug($result); 
-  } 
+  } */
   public function testView() 
   { 
     $result = $this->testAction('/news/view/16', array('return'=>'render')); 
-    debug($result); 
+    // debug($result); 
+  }
+  public function testDisplayNewIdGetRenderedHtml()
+  { 
+    $result = $this->testAction('/news/display/16', array('return' => 'render')); 
+    //debug(htmlentities($result)); 
   } 
-  public function testDisplayGetRenderedHtml() { 
+  /* public function testDisplayGetRenderedHtml() { 
     $result = $this->testAction('/news/display/', array('return' => 'render')); 
     debug(htmlentities($result)); 
@@ -32 +38 @@
                 array('return' => 'vars')); 
     debug($result); 
-  } 
-  public function testDiplayFixturized() { 
-    $result = $this->testAction('/news/display/', 
-                array('fixturize' => true)); 
-    debug($result); 
+  }*/
+  public function testDisplayFixturized() { 
+    $result = $this->testAction('/admin/news/add', array('fixturize' => true)); 
+    debug($result);
   } 
   public function testDisplayPostFixturized() 
   { 
-    $data = array('News' => array('user_id' => 1, 'published' 
-                     => 1, 'slug'=>'new-article', 'title' => 'New Article', 'body' => 'New Body')); 
-    $result = $this->testAction('/news/display', 
-                array('fixturize' => true, 'data' => $data, 'method' => 'post')); 
+    $data = array('News' => array('user_id' =>1, 'status'=>1, 'title' => 'New Article', 'body' => 'New Body')); 
+    $result = $this->testAction('/admin/news/add', array('fixturize' => true, 'method' => 'post')); 
     debug($result); 
   } 

trunk/app/tests/fixtures/news_test_fixture.php

@@ -1 @@
-<?php  
+<?php
 // News Model Unit Test
 class NewsTestFixture extends CakeTestFixture { 
 
   public $name   = 'NewsTest'; 
-  public $import = array('model' => 'News', 'records' => true);  
+  //public $import = array('model' => 'News', 'records' => true, 'conection'=>'default');  
   public $fields = array( 
               'id'        => array('type' => 'integer', 'key' => 'primary'), 
               'title'     => array('type'=>'string', 'length'=>50, 'null'=>false), 
               'body'      => array('type'=>'text', 'null'=>false), 
-              'published' => array('type' => 'integer', 'default' => 0, 'null' => false),
+              'status'    => array('type' => 'integer', 'default' => 0, 'null' => false),
                       'user_id'   => array('type' => 'integer', 'default' => 1, 'null' => false), 
               'created'   => 'timestamp', 

trunk/app/views/acquaintances/display.ctp

@@ -6 +6 @@
 
  $tmp  =  '<h2>'. $val['Acquaintance']['name']   . '</h2>';
- $tmp .= para(null, $val['Acquaintance']['description']);
- $tmp .= para(null,$html->link($html->image('static/icon_http.gif', array("alt"=>"Go!", "alt"=>"Go!")),$val['Acquaintance']['url'], null, false, false));
+ $tmp .= $html->para(null, $val['Acquaintance']['description']);
+ $tmp .= $html->para(null,$html->link($html->image('static/icon_http.gif', array("alt"=>"Go!", "alt"=>"Go!")),$val['Acquaintance']['url'], null, false, false));
  
  echo $html->div(null, $tmp, array('style'=>'padding:3px;border:1px dotted gray;margin:3px;'));