Changeset 683

Timestamp:

12/06/07 18:12:20 (1 year ago)

Author:

laurentj

Message:

added unit tests for bug #364

Files:

• trunk/testapp/modules/jelix_tests/controllers/urlsig.classic.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/controllers/urlsig.classic.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html.php (modified) (3 diffs)
• trunk/testapp/var/config/urls.xml (modified) (1 diff)
• trunk/testapp/var/config/urls.xml (modified) (1 diff)

trunk/testapp/modules/jelix_tests/controllers/urlsig.classic.php

@@ -71 +71 @@
-      return $this->url1('url10');
-   }
+
+   function url30() {
+      $rep = $this->getResponse('html',true);
+      $content='<h1>test url 30</h1>';
+      $rep->body->assign('MAIN',$content);
+      return $rep;
+   }
-}
-

trunk/testapp/modules/jelix_tests/controllers/urlsig.classic.php

@@ -71 +71 @@
-      return $this->url1('url10');
-   }
+
+   function url30() {
+      $rep = $this->getResponse('html',true);
+      $content='<h1>test url 30</h1>';
+      $rep->body->assign('MAIN',$content);
+      return $rep;
+   }
-}
-

trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

@@ -237 +237 @@
-      $urlList[]= array('jelix_tests~urlsig_url20', array('mois'=>'08',  'annee'=>'2007','lang'=>'fr_FR'));
-      $urlList[]= array('jelix_tests~urlsig_url20', array('mois'=>'08',  'annee'=>'2007'));
+      $urlList[]= array('jelix_tests~urlsig_url30', array());
+      $urlList[]= array('jelix_tests~default_hello2', array());
+      $urlList[]= array('jelix_tests~default_hello3', array());
+      $urlList[]= array('jelix_tests~hello3', array());
-
-      $trueResult=array(
@@ -256 +260 @@
-          "/index.php/articles/fr/2007/08",
-          "/index.php/articles/fr/2007/08",
+          "/index.php/hello",
+          "/index.php/hello2",
+          "/index.php/hello3",
+          "/index.php/hello3",
-       );
-
@@ -281 +289 @@
-          "/index/articles/fr/2007/08",
-          "/index/articles/fr/2007/08",
+          "/index/hello",
+          "/index/hello2",
+          "/index/hello3",
+          "/index/hello3",
-       );
-      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11];

trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

@@ -237 +237 @@
-      $urlList[]= array('jelix_tests~urlsig_url20', array('mois'=>'08',  'annee'=>'2007','lang'=>'fr_FR'));
-      $urlList[]= array('jelix_tests~urlsig_url20', array('mois'=>'08',  'annee'=>'2007'));
+      $urlList[]= array('jelix_tests~urlsig_url30', array());
+      $urlList[]= array('jelix_tests~default_hello2', array());
+      $urlList[]= array('jelix_tests~default_hello3', array());
+      $urlList[]= array('jelix_tests~hello3', array());
-
-      $trueResult=array(
@@ -256 +260 @@
-          "/index.php/articles/fr/2007/08",
-          "/index.php/articles/fr/2007/08",
+          "/index.php/hello",
+          "/index.php/hello2",
+          "/index.php/hello3",
+          "/index.php/hello3",
-       );
-
@@ -281 +289 @@
-          "/index/articles/fr/2007/08",
-          "/index/articles/fr/2007/08",
+          "/index/hello",
+          "/index/hello2",
+          "/index/hello3",
+          "/index/hello3",
-       );
-      $trueResult[11]='https://'.$_SERVER['HTTP_HOST'].$trueResult[11];

trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html.php

@@ -74 +74 @@
-      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url20', 'mois'=>'08',  'annee'=>'2007','lang'=>'en_EN');
-      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url20', 'mois'=>'08',  'annee'=>'2007','lang'=>'fr_FR');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url30');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'hello2');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default_hello3');
-
-      $request=array(
@@ -90 +93 @@
-          array("index.php","/articles/en/2007/08",array()),
-          array("index.php","/articles/fr/2007/08",array()),
+          array("index.php","/hello",array()),
+          array("index.php","/hello2",array()),
+          array("index.php","/hello3",array()),
-       );
-
@@ -120 +126 @@
-          array("index","/articles/en/2007/08",array()),
-          array("index","/articles/fr/2007/08",array()),
+          array("index","/hello",array()),
+          array("index","/hello2",array()),
+          array("index","/hello3",array()),
-       );
-      foreach($request as $k=>$urldata){

trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html.php

@@ -74 +74 @@
-      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url20', 'mois'=>'08',  'annee'=>'2007','lang'=>'en_EN');
-      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url20', 'mois'=>'08',  'annee'=>'2007','lang'=>'fr_FR');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig_url30');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'hello2');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default_hello3');
-
-      $request=array(
@@ -90 +93 @@
-          array("index.php","/articles/en/2007/08",array()),
-          array("index.php","/articles/fr/2007/08",array()),
+          array("index.php","/hello",array()),
+          array("index.php","/hello2",array()),
+          array("index.php","/hello3",array()),
-       );
-
@@ -120 +126 @@
-          array("index","/articles/en/2007/08",array()),
-          array("index","/articles/fr/2007/08",array()),
+          array("index","/hello",array()),
+          array("index","/hello2",array()),
+          array("index","/hello3",array()),
-       );
-      foreach($request as $k=>$urldata){

trunk/testapp/var/config/urls.xml

@@ -46 +46 @@
-              <static name="lang" value="en_EN" />
-        </url>
+        <url pathinfo="/hello" module="jelix_tests" action="urlsig_url30" />
+        <url pathinfo="/hello2" module="jelix_tests" action="hello2" />
+        <url pathinfo="/hello3" module="jelix_tests" action="default_hello3" />
-    </classicentrypoint>
-    <classicentrypoint name="testnews">

trunk/testapp/var/config/urls.xml

@@ -46 +46 @@
-              <static name="lang" value="en_EN" />
-        </url>
+        <url pathinfo="/hello" module="jelix_tests" action="urlsig_url30" />
+        <url pathinfo="/hello2" module="jelix_tests" action="hello2" />
+        <url pathinfo="/hello3" module="jelix_tests" action="default_hello3" />
-    </classicentrypoint>
-    <classicentrypoint name="testnews">