Changeset 962

Timestamp:

05/30/08 11:57:41 (6 months ago)

Author:

laurentj

Message:

fixed regressions on some tests

Files:

• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (2 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (3 diffs)

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -1201 +1201 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-80=>'$label = \'Votre nom\';
+$js.="jForms.tControl = new jFormsControl(\'nom\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
+$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
+$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
+$js.="jForms.tForm.addControl( jForms.tControl);\n";',
+81=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControl(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
@@ -1206 +1211 @@
-$js.="jForms.tControl.multiple = true;\n";
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-1
-
-
-
-
+2
+\
+\
+\
+\
-    );
-

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -1201 +1201 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-80=>'$label = \'Votre nom\';
+$js.="jForms.tControl = new jFormsControl(\'nom\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
+$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
+$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
+$js.="jForms.tForm.addControl( jForms.tControl);\n";',
+81=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControl(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
@@ -1206 +1211 @@
-$js.="jForms.tControl.multiple = true;\n";
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-1
-
-
-
-
+2
+\
+\
+\
+\
-    );
-

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -1201 +1201 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-80=>'$label = \'Votre nom\';
+$js.="jForms.tControl = new jFormsControl(\'nom\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
+$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
+$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
+$js.="jForms.tForm.addControl( jForms.tControl);\n";',
+81=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControl(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
@@ -1206 +1211 @@
-$js.="jForms.tControl.multiple = true;\n";
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-1
-
-
-
-
+2
+\
+\
+\
+\
-    );
-

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -1201 +1201 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-80=>'$label = \'Votre nom\';
+$js.="jForms.tControl = new jFormsControl(\'nom\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
+$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
+$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
+$js.="jForms.tForm.addControl( jForms.tControl);\n";',
+81=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControl(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
@@ -1206 +1211 @@
-$js.="jForms.tControl.multiple = true;\n";
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-1
-
-
-
-
+2
+\
+\
+\
+\
-    );
-

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -390 +390 @@
-        $ctrl->readonly = false;
-        $ctrl->hint='';
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -399 +399 @@
-        $this->assertEqualOrDiff($result, $out);
-
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -417 +417 @@
-        $this->form->setData('choixsimple',"");
-        $this->form->setData('autrechoix',"25");
-
+'', 
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -390 +390 @@
-        $ctrl->readonly = false;
-        $ctrl->hint='';
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -399 +399 @@
-        $this->assertEqualOrDiff($result, $out);
-
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -417 +417 @@
-        $this->form->setData('choixsimple',"");
-        $this->form->setData('autrechoix',"25");
-
+'', 
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -390 +390 @@
-        $ctrl->readonly = false;
-        $ctrl->hint='';
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -399 +399 @@
-        $this->assertEqualOrDiff($result, $out);
-
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -417 +417 @@
-        $this->form->setData('choixsimple',"");
-        $this->form->setData('autrechoix',"25");
-
+'', 
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php

@@ -390 +390 @@
-        $ctrl->readonly = false;
-        $ctrl->hint='';
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -399 +399 @@
-        $this->assertEqualOrDiff($result, $out);
-
-
+', '
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
@@ -417 +417 @@
-        $this->form->setData('choixsimple',"");
-        $this->form->setData('autrechoix',"25");
-
+'', 
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';