From 95499e34da7472479154c8a14b8fd4333a309e09 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sun, 27 May 2007 15:52:45 +0000
Subject: [PATCH] Factor out common DefinitionCache test code to a harness.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1098 48356398-32a2-884e-a903-53898d9a118a
---
 .../DefinitionCache/SerializerTest.php             | 28 ++----------------
 tests/HTMLPurifier/DefinitionCacheHarness.php      | 33 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 tests/HTMLPurifier/DefinitionCacheHarness.php

diff --git a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
index 0822d892..d7da42e0 100644
--- a/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
+++ b/tests/HTMLPurifier/DefinitionCache/SerializerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once 'HTMLPurifier/DefinitionCacheHarness.php';
 require_once 'HTMLPurifier/DefinitionCache/Serializer.php';
 
 class HTMLPurifier_Definition_SerializerMock extends HTMLPurifier_Definition
@@ -25,7 +26,7 @@ class HTMLPurifier_Definition_SerializerMock extends HTMLPurifier_Definition
     
 }
 
-class HTMLPurifier_DefinitionCache_SerializerTest extends UnitTestCase
+class HTMLPurifier_DefinitionCache_SerializerTest extends HTMLPurifier_DefinitionCacheHarness
 {
     
     function test__SerializerMock_pass() {
@@ -150,31 +151,6 @@ class HTMLPurifier_DefinitionCache_SerializerTest extends UnitTestCase
     }
     
     /**
-     * Generate a configuration mock object that returns $values
-     * to a getBatch() call
-     * @param $values Values to return when getBatch is invoked
-     */
-    function generateConfigMock($values) {
-        generate_mock_once('HTMLPurifier_Config');
-        $config = new HTMLPurifier_ConfigMock($this);
-        $config->setReturnValue('getBatch', $values, array('Test'));
-        return $config;
-    }
-    
-    /**
-     * Returns an anonymous def that has been setup and named Test
-     */
-    function generateDefinition($member_vars = array()) {
-        $def = new HTMLPurifier_Definition();
-        $def->setup = true;
-        $def->type  = 'Test';
-        foreach ($member_vars as $key => $val) {
-            $def->$key = $val;
-        }
-        return $def;
-    }
-    
-    /**
      * Asserts that a file exists, ignoring the stat cache
      */
     function assertFileExist($file) {
diff --git a/tests/HTMLPurifier/DefinitionCacheHarness.php b/tests/HTMLPurifier/DefinitionCacheHarness.php
new file mode 100644
index 00000000..9747b615
--- /dev/null
+++ b/tests/HTMLPurifier/DefinitionCacheHarness.php
@@ -0,0 +1,33 @@
+<?php
+
+class HTMLPurifier_DefinitionCacheHarness extends UnitTestCase
+{
+    
+    /**
+     * Generate a configuration mock object that returns $values
+     * to a getBatch() call
+     * @param $values Values to return when getBatch is invoked
+     */
+    function generateConfigMock($values) {
+        generate_mock_once('HTMLPurifier_Config');
+        $config = new HTMLPurifier_ConfigMock($this);
+        $config->setReturnValue('getBatch', $values, array('Test'));
+        return $config;
+    }
+    
+    /**
+     * Returns an anonymous def that has been setup and named Test
+     */
+    function generateDefinition($member_vars = array()) {
+        $def = new HTMLPurifier_Definition();
+        $def->setup = true;
+        $def->type  = 'Test';
+        foreach ($member_vars as $key => $val) {
+            $def->$key = $val;
+        }
+        return $def;
+    }
+    
+}
+
+?>
\ No newline at end of file
-- 
2.11.4.GIT