[2.1.2?] Final migration for Injectors, deprecate the config and context parameters in assertResult

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1378 48356398-32a2-884e-a903-53898d9a118a

tests/HTMLPurifier/Injector/PurifierLinkifyTest.php

@@ -8,39 +8,53 @@ class HTMLPurifier_Injector_PurifierLinkifyTest extends HTMLPurifier_InjectorHar
     
     function setup() {
         parent::setup();
-        $this->config = array(
-            'AutoFormat.PurifierLinkify' => true,
-            'AutoFormatParam.PurifierLinkifyDocURL' => '#%s'
-        );
+        $this->config->set('AutoFormat', 'PurifierLinkify', true);
+        $this->config->set('AutoFormatParam', 'PurifierLinkifyDocURL', '#%s');
     }
     
-    function testLinkify() {
-        
+    function testNoTriggerCharacer() {
         $this->assertResult('Foobar');
+    }
+    
+    function testTriggerCharacterInIrrelevantContext() {
         $this->assertResult('20% off!');
+    }
+    
+    function testPreserveNamespace() {
         $this->assertResult('%Core namespace (not recognized)');
+    }
+    
+    function testLinkifyBasic() {
         $this->assertResult(
           '%Namespace.Directive',
           '<a href="#Namespace.Directive">%Namespace.Directive</a>'
         );
+    }
+    
+    function testLinkifyWithAdjacentTextNodes() {
         $this->assertResult(
           'This %Namespace.Directive thing',
           'This <a href="#Namespace.Directive">%Namespace.Directive</a> thing'
         );
+    }
+    
+    function testLinkifyInBlock() {
         $this->assertResult(
           '<div>This %Namespace.Directive thing</div>',
           '<div>This <a href="#Namespace.Directive">%Namespace.Directive</a> thing</div>'
         );
+    }
+    
+    function testPreserveInATag() {
         $this->assertResult(
           '<a>%Namespace.Directive</a>'
         );
-        
-        
     }
     
     function testNeeded() {
+        $this->config->set('HTML', 'Allowed', 'b');
         $this->expectError('Cannot enable PurifierLinkify injector because a is not allowed');
-        $this->assertResult('%Namespace.Directive', true, array('AutoFormat.PurifierLinkify' => true, 'HTML.Allowed' => 'b'));
+        $this->assertResult('%Namespace.Directive');
     }
     
 }