X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ut%2Fxdbtest.php;h=8fd3b2bf8daecc59b65b1faa601ff5b18cb9ab67;hb=5f6b3a28efe41c038f349fb0b281d9637f7078de;hp=72b168689e40faa1c137cd2fb55796a5915c2e2f;hpb=536fc7f7d2c9880d4c61469bcee6daaee73afaf5;p=platal.git

diff --git a/ut/xdbtest.php b/ut/xdbtest.php
index 72b1686..8fd3b2b 100644
--- a/ut/xdbtest.php
+++ b/ut/xdbtest.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,35 +21,57 @@
 
 require_once dirname(__FILE__) . '/../include/test.inc.php';
 
+class FormatBlah implements XDBFormat
+{
+    private $text;
+
+    public function __construct($text)
+    {
+        $this->text = $text;
+    }
+
+    public function format()
+    {
+        return 'blah' . $this->text . 'blah';
+    }
+}
+
 class XDBTest extends PlTestCase
 {
     public function testEscapeString()
     {
-        $this->assertEquals("'blah'", XDB::format('{?}', 'blah'));
-        $this->assertEquals("'blah\\''", XDB::format('{?}', "blah'"));
-        $this->assertEquals("'bl\\'ah'", XDB::format('{?}', "bl'ah"));
-        $this->assertEquals("'\\'blah\\''", XDB::format('{?}', "'blah'"));
+        $this->assertSame("'blah'", XDB::format('{?}', 'blah'));
+        $this->assertSame("'blah\\''", XDB::format('{?}', "blah'"));
+        $this->assertSame("'bl\\'ah'", XDB::format('{?}', "bl'ah"));
+        $this->assertSame("'\\'blah\\''", XDB::format('{?}', "'blah'"));
     }
 
     public function testEscapeInt()
     {
-        $this->assertEquals("1", XDB::format('{?}', 1));
+        $this->assertSame("1", XDB::format('{?}', 1));
     }
 
     public function testEscapeFlagSet()
     {
         $flagset = new PlFlagSet();
         $flagset->addFlag('toto');
-        $this->assertEquals("'toto'", XDB::format('{?}', $flagset));
+        $this->assertSame("'toto'", XDB::format('{?}', $flagset));
         $flagset->addFlag('titi');
-        $this->assertEquals("'toto,titi'", XDB::format('{?}', $flagset));
+        $this->assertSame("'toto,titi'", XDB::format('{?}', $flagset));
         $flagset->addFlag('titi');
-        $this->assertEquals("'toto,titi'", XDB::format('{?}', $flagset));
+        $this->assertSame("'toto,titi'", XDB::format('{?}', $flagset));
     }
 
     public function testEscapeArray()
     {
-        $this->assertEquals("(1, 'toto')", XDB::format('{?}', array(1, 'toto')));
+        $this->assertSame("(1, 'toto')", XDB::format('{?}', array(1, 'toto')));
+    }
+
+    public function testEscapeFormat()
+    {
+        $this->assertSame('blahblah', XDB::format('{?}', new FormatBlah('')));
+        $this->assertSame('blahblahblah', XDB::format('{?}', new FormatBlah('blah')));
+        $this->assertSame('blahBloumblah', XDB::format('{?}', new FormatBlah('Bloum')));
     }
 }