From 85fdced5087feaabb38c6409fc7a8f94ac55716e Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sat, 30 Aug 2008 03:29:49 +0000
Subject: [PATCH] Unit tests for Cache/File.php and Cache/Memcache.php More
 consistent file naming

---
 min_extras/unit_tests/test_Minify.php         |  1 -
 .../{test_CSS.php => test_Minify_CSS.php}     |  0
 .../unit_tests/test_Minify_Cache_File.php     | 30 +++++++++++++++
 .../unit_tests/test_Minify_Cache_Memcache.php | 38 +++++++++++++++++++
 .../{test_HTML.php => test_Minify_HTML.php}   |  0
 ...ascript.php => test_Minify_Javascript.php} |  0
 .../{test_Lines.php => test_Minify_Lines.php} |  0
 min_extras/unit_tests/test_all.php            | 11 ++++--
 8 files changed, 75 insertions(+), 5 deletions(-)
 rename min_extras/unit_tests/{test_CSS.php => test_Minify_CSS.php} (100%)
 create mode 100644 min_extras/unit_tests/test_Minify_Cache_File.php
 create mode 100644 min_extras/unit_tests/test_Minify_Cache_Memcache.php
 rename min_extras/unit_tests/{test_HTML.php => test_Minify_HTML.php} (100%)
 rename min_extras/unit_tests/{test_Javascript.php => test_Minify_Javascript.php} (100%)
 rename min_extras/unit_tests/{test_Lines.php => test_Minify_Lines.php} (100%)

diff --git a/min_extras/unit_tests/test_Minify.php b/min_extras/unit_tests/test_Minify.php
index d8a2be3..ba57d99 100644
--- a/min_extras/unit_tests/test_Minify.php
+++ b/min_extras/unit_tests/test_Minify.php
@@ -91,7 +91,6 @@ function test_Minify()
     
     // Test minifying CSS and responding with Etag/Last-Modified
     
-    // needed to expose E_STRICT warning in Cache_Lite_File 
     Minify::setCache();
     
     // don't allow conditional headers
diff --git a/min_extras/unit_tests/test_CSS.php b/min_extras/unit_tests/test_Minify_CSS.php
similarity index 100%
rename from min_extras/unit_tests/test_CSS.php
rename to min_extras/unit_tests/test_Minify_CSS.php
diff --git a/min_extras/unit_tests/test_Minify_Cache_File.php b/min_extras/unit_tests/test_Minify_Cache_File.php
new file mode 100644
index 0000000..10dd550
--- /dev/null
+++ b/min_extras/unit_tests/test_Minify_Cache_File.php
@@ -0,0 +1,30 @@
+<?php
+require_once '_inc.php';
+
+require_once 'Minify/Cache/File.php';
+
+function test_Minify_Cache_File()
+{
+    $data = str_repeat(md5('testing'), 160);
+    $id = 'Minify_test_cache';
+    $prefix = 'Minify_Cache_File : ';
+    
+    $cache = new Minify_Cache_File();
+    
+    assertTrue(true === $cache->store($id, $data), $prefix . 'store');
+    
+    assertTrue(strlen($data) === $cache->getSize($id), $prefix . 'getSize');
+    
+    assertTrue(true === $cache->isValid($id, $_SERVER['REQUEST_TIME'] - 10), $prefix . 'isValid');
+    
+    ob_start();
+    $cache->display($id);
+    $displayed = ob_get_contents();
+    ob_end_clean();
+    
+    assertTrue($data === $displayed, $prefix . 'display');
+    
+    assertTrue($data === $cache->fetch($id), $prefix . 'fetch');
+}
+
+test_Minify_Cache_File();
\ No newline at end of file
diff --git a/min_extras/unit_tests/test_Minify_Cache_Memcache.php b/min_extras/unit_tests/test_Minify_Cache_Memcache.php
new file mode 100644
index 0000000..b0223aa
--- /dev/null
+++ b/min_extras/unit_tests/test_Minify_Cache_Memcache.php
@@ -0,0 +1,38 @@
+<?php
+require_once '_inc.php';
+
+require_once 'Minify/Cache/Memcache.php';
+
+function test_Minify_Cache_Memcache()
+{
+    $prefix = 'Minify_Cache_Memcache : ';
+    if (! function_exists('memcache_set')) {
+        return;
+    }
+    $mc = new Memcache;
+    if (! @$mc->connect('localhost', 11211)) {
+        return;
+    }
+    
+    $data = str_repeat(md5('testing'), 160);
+    $id = 'Minify_test_cache';
+    
+    $cache = new Minify_Cache_Memcache($mc);
+    
+    assertTrue(true === $cache->store($id, $data), $prefix . 'store');
+    
+    assertTrue(strlen($data) === $cache->getSize($id), $prefix . 'getSize');
+    
+    assertTrue(true === $cache->isValid($id, $_SERVER['REQUEST_TIME'] - 10), $prefix . 'isValid');
+    
+    ob_start();
+    $cache->display($id);
+    $displayed = ob_get_contents();
+    ob_end_clean();
+    
+    assertTrue($data === $displayed, $prefix . 'display');
+    
+    assertTrue($data === $cache->fetch($id), $prefix . 'fetch');
+}
+
+test_Minify_Cache_Memcache();
\ No newline at end of file
diff --git a/min_extras/unit_tests/test_HTML.php b/min_extras/unit_tests/test_Minify_HTML.php
similarity index 100%
rename from min_extras/unit_tests/test_HTML.php
rename to min_extras/unit_tests/test_Minify_HTML.php
diff --git a/min_extras/unit_tests/test_Javascript.php b/min_extras/unit_tests/test_Minify_Javascript.php
similarity index 100%
rename from min_extras/unit_tests/test_Javascript.php
rename to min_extras/unit_tests/test_Minify_Javascript.php
diff --git a/min_extras/unit_tests/test_Lines.php b/min_extras/unit_tests/test_Minify_Lines.php
similarity index 100%
rename from min_extras/unit_tests/test_Lines.php
rename to min_extras/unit_tests/test_Minify_Lines.php
diff --git a/min_extras/unit_tests/test_all.php b/min_extras/unit_tests/test_all.php
index fe0cb3a..9384750 100644
--- a/min_extras/unit_tests/test_all.php
+++ b/min_extras/unit_tests/test_all.php
@@ -1,10 +1,13 @@
 <?php
 
 require 'test_Minify.php';
-require 'test_Javascript.php';
-require 'test_CSS.php';
-require 'test_Lines.php';
-require 'test_HTML.php';
 require 'test_Minify_Build.php';
+require 'test_Minify_Cache_File.php';
+require 'test_Minify_Cache_Memcache.php';
+require 'test_Minify_CSS.php';
+require 'test_Minify_CSS_Linearizer.php';
+require 'test_Minify_HTML.php';
+require 'test_Minify_Javascript.php';
+require 'test_Minify_Lines.php';
 require 'test_HTTP_Encoder.php';
 require 'test_HTTP_ConditionalGet.php';