From 316a1090321541eab413d01ef7fdab169d81c0c5 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Sun, 22 Nov 2015 13:55:01 -0500 Subject: [PATCH] Port last of min_unit_tests, remove references to it, add composer script --- .gitattributes | 1 - README.md | 6 +- UPGRADING.txt | 2 +- composer.json | 3 + docs/TestingMinify.wiki.md | 12 ---- docs/UserGuide.wiki.md | 2 +- min_extras/cli/minify.php | 4 +- min_extras/cli/rewrite-uris.php | 2 +- min_unit_tests/.htaccess | 4 -- min_unit_tests/HTTP_ConditionalGet/2.php | 43 ------------ min_unit_tests/HTTP_ConditionalGet/3.php | 39 ----------- min_unit_tests/HTTP_ConditionalGet/4.php | 47 ------------- min_unit_tests/HTTP_ConditionalGet/5.php | 26 ------- .../HTTP_ConditionalGet/_include.php | 64 ------------------ min_unit_tests/HTTP_ConditionalGet/index.php | 35 ---------- min_unit_tests/HTTP_Encoder/green.png | Bin 202 -> 0 bytes min_unit_tests/HTTP_Encoder/index.php | 57 ---------------- min_unit_tests/_inc.php | 62 ----------------- tests/TestCase.php | 4 +- .../_test_files/css/comments.css | 0 .../_test_files/css/comments.min.css | 0 .../_test_files/css/hacks.css | 0 .../_test_files/css/hacks.min.css | 0 .../_test_files/css/issue210.css | 0 .../_test_files/css/issue210.min.css | 0 .../_test_files/css/issue62.css | 0 .../_test_files/css/issue62.min.css | 0 .../_test_files/css/paths_prepend.css | 0 .../_test_files/css/paths_prepend.min.css | 0 .../_test_files/css/paths_rewrite.css | 0 .../_test_files/css/paths_rewrite.min.css | 0 .../_test_files/css/readme.txt | 0 .../_test_files/css/selectors.css | 0 .../_test_files/css/selectors.min.css | 0 .../_test_files/css/styles.css | 0 .../_test_files/css/styles.min.css | 0 .../_test_files/css/subsilver.css | 0 .../_test_files/css/subsilver.min.css | 0 .../_test_files/css/unusual_strings.css | 0 .../_test_files/css/unusual_strings.min.css | 0 .../_test_files/css/vladmirated.css | 0 .../_test_files/css/vladmirated.min.css | 0 .../_test_files/css_uriRewriter/exp.css | 0 .../css_uriRewriter/exp_prepend.css | 0 .../css_uriRewriter/exp_prepend2.css | 0 .../_test_files/css_uriRewriter/in.css | 0 .../_test_files/html/before.html | 0 .../_test_files/html/before.min.html | 0 .../_test_files/html/before2.html | 0 .../_test_files/html/before2.min.html | 0 .../_test_files/htmlHelper_groupsConfig.php | 0 .../importProcessor/css/1/adjacent.css | 0 .../_test_files/importProcessor/css/1/tv.css | 0 .../importProcessor/css/adjacent.css | 0 .../_test_files/importProcessor/css/input.css | 0 .../importProcessor/css/output.css | 0 .../importProcessor/lib/css/example.css | 0 .../_test_files/js/before.js | 0 .../_test_files/js/before.min.js | 0 .../_test_files/js/before.min_plus.js | 0 .../_test_files/js/condcomm.js | 0 .../_test_files/js/condcomm.min_plus.js | 0 .../_test_files/js/issue132.js | 0 .../_test_files/js/issue132.min.js | 0 .../_test_files/js/issue141.min.js | 0 .../_test_files/js/issue144.js | 0 .../_test_files/js/issue144.min.js | 0 .../_test_files/js/issue256.js | 0 .../_test_files/js/issue256.min.js | 0 .../_test_files/js/jquery-1.2.3.js | 0 .../_test_files/js/regexes.js | 0 .../_test_files/js/regexes.min.js | 0 .../_test_files/minify/QueryString.js | 0 .../_test_files/minify/email.js | 0 .../_test_files/minify/issue143.js | 0 .../_test_files/minify/issue73_1.js | 0 .../_test_files/minify/issue73_2.js | 0 .../_test_files/minify/issue89_1.css | 0 .../_test_files/minify/issue89_2.css | 0 .../_test_files/minify/issue89_out.min.css | 0 .../_test_files/minify/lines_bugs.js | 0 .../_test_files/minify/lines_output.js | 0 .../_test_files/minify/minified.css | 0 .../_test_files/minify/minified.js | 0 .../test_js_in_browser.html | 0 85 files changed, 12 insertions(+), 401 deletions(-) delete mode 100644 docs/TestingMinify.wiki.md delete mode 100644 min_unit_tests/.htaccess delete mode 100644 min_unit_tests/HTTP_ConditionalGet/2.php delete mode 100644 min_unit_tests/HTTP_ConditionalGet/3.php delete mode 100644 min_unit_tests/HTTP_ConditionalGet/4.php delete mode 100644 min_unit_tests/HTTP_ConditionalGet/5.php delete mode 100644 min_unit_tests/HTTP_ConditionalGet/_include.php delete mode 100644 min_unit_tests/HTTP_ConditionalGet/index.php delete mode 100644 min_unit_tests/HTTP_Encoder/green.png delete mode 100644 min_unit_tests/HTTP_Encoder/index.php delete mode 100644 min_unit_tests/_inc.php rename {min_unit_tests => tests}/_test_files/css/comments.css (100%) rename {min_unit_tests => tests}/_test_files/css/comments.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/hacks.css (100%) rename {min_unit_tests => tests}/_test_files/css/hacks.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/issue210.css (100%) rename {min_unit_tests => tests}/_test_files/css/issue210.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/issue62.css (100%) rename {min_unit_tests => tests}/_test_files/css/issue62.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/paths_prepend.css (100%) rename {min_unit_tests => tests}/_test_files/css/paths_prepend.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/paths_rewrite.css (100%) rename {min_unit_tests => tests}/_test_files/css/paths_rewrite.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/readme.txt (100%) rename {min_unit_tests => tests}/_test_files/css/selectors.css (100%) rename {min_unit_tests => tests}/_test_files/css/selectors.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/styles.css (100%) rename {min_unit_tests => tests}/_test_files/css/styles.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/subsilver.css (100%) rename {min_unit_tests => tests}/_test_files/css/subsilver.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/unusual_strings.css (100%) rename {min_unit_tests => tests}/_test_files/css/unusual_strings.min.css (100%) rename {min_unit_tests => tests}/_test_files/css/vladmirated.css (100%) rename {min_unit_tests => tests}/_test_files/css/vladmirated.min.css (100%) rename {min_unit_tests => tests}/_test_files/css_uriRewriter/exp.css (100%) rename {min_unit_tests => tests}/_test_files/css_uriRewriter/exp_prepend.css (100%) rename {min_unit_tests => tests}/_test_files/css_uriRewriter/exp_prepend2.css (100%) rename {min_unit_tests => tests}/_test_files/css_uriRewriter/in.css (100%) rename {min_unit_tests => tests}/_test_files/html/before.html (100%) rename {min_unit_tests => tests}/_test_files/html/before.min.html (100%) rename {min_unit_tests => tests}/_test_files/html/before2.html (100%) rename {min_unit_tests => tests}/_test_files/html/before2.min.html (100%) rename {min_unit_tests => tests}/_test_files/htmlHelper_groupsConfig.php (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/css/1/adjacent.css (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/css/1/tv.css (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/css/adjacent.css (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/css/input.css (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/css/output.css (100%) rename {min_unit_tests => tests}/_test_files/importProcessor/lib/css/example.css (100%) rename {min_unit_tests => tests}/_test_files/js/before.js (100%) rename {min_unit_tests => tests}/_test_files/js/before.min.js (100%) rename {min_unit_tests => tests}/_test_files/js/before.min_plus.js (100%) rename {min_unit_tests => tests}/_test_files/js/condcomm.js (100%) rename {min_unit_tests => tests}/_test_files/js/condcomm.min_plus.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue132.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue132.min.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue141.min.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue144.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue144.min.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue256.js (100%) rename {min_unit_tests => tests}/_test_files/js/issue256.min.js (100%) rename {min_unit_tests => tests}/_test_files/js/jquery-1.2.3.js (100%) rename {min_unit_tests => tests}/_test_files/js/regexes.js (100%) rename {min_unit_tests => tests}/_test_files/js/regexes.min.js (100%) rename {min_unit_tests => tests}/_test_files/minify/QueryString.js (100%) rename {min_unit_tests => tests}/_test_files/minify/email.js (100%) rename {min_unit_tests => tests}/_test_files/minify/issue143.js (100%) rename {min_unit_tests => tests}/_test_files/minify/issue73_1.js (100%) rename {min_unit_tests => tests}/_test_files/minify/issue73_2.js (100%) rename {min_unit_tests => tests}/_test_files/minify/issue89_1.css (100%) rename {min_unit_tests => tests}/_test_files/minify/issue89_2.css (100%) rename {min_unit_tests => tests}/_test_files/minify/issue89_out.min.css (100%) rename {min_unit_tests => tests}/_test_files/minify/lines_bugs.js (100%) rename {min_unit_tests => tests}/_test_files/minify/lines_output.js (100%) rename {min_unit_tests => tests}/_test_files/minify/minified.css (100%) rename {min_unit_tests => tests}/_test_files/minify/minified.js (100%) rename {min_unit_tests => tests}/test_js_in_browser.html (100%) diff --git a/.gitattributes b/.gitattributes index 3520cb9..8b57b3a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,5 +2,4 @@ /.gitignore export-ignore /.gitattributes export-ignore /min_extras export-ignore -/min_unit_tests export-ignore /tests export-ignore diff --git a/README.md b/README.md index 599ba2d..a90309e 100644 --- a/README.md +++ b/README.md @@ -68,10 +68,8 @@ Support Unit Testing ------------ -1. Open the file `min_unit_tests/_inc.php`. -1. Enable the file by commenting out the `die()` statement. -1. Access: http://example.org/min/min_unit_tests/test_all.php (If you wish, the other test_*.php files can be run to test individual components with more verbose output.) -1. Re-disable the `_inc.php` file when you are done. +1. Install via Composer +1. `composer run test` Warnings -------- diff --git a/UPGRADING.txt b/UPGRADING.txt index 647b9cc..700c841 100644 --- a/UPGRADING.txt +++ b/UPGRADING.txt @@ -7,7 +7,7 @@ UPGRADING FROM 2.1.* /min/config.php --> /min/old_config.php /min/groupsConfig.php --> /min/old_groupsConfig.php -2. Overwrite all files in /min (and /min_unit_tests) with those from this zip. +2. Overwrite all files in /min with those from this zip. 3. Delete /min/groupsConfig.php diff --git a/composer.json b/composer.json index b80d499..36746ad 100644 --- a/composer.json +++ b/composer.json @@ -35,5 +35,8 @@ "suggest": { "leafo/lessphp": "~0.4.0", "meenie/javascript-packer": "~1.1" + }, + "scripts": { + "test": "phpunit" } } diff --git a/docs/TestingMinify.wiki.md b/docs/TestingMinify.wiki.md deleted file mode 100644 index 937be1a..0000000 --- a/docs/TestingMinify.wiki.md +++ /dev/null @@ -1,12 +0,0 @@ -# Unit Testing - -0. If you haven't already, install Minify using the [UserGuide](UserGuide.wiki.md). - -1. Copy the "min\_unit\_tests" directory directly into your DOCUMENT\_ROOT. - -2. Browse to http://example.com/min_unit_tests/test_all.php - -You should see a list of "PASS"es. You can run the individual test PHP files in http://example.com/min_unit_tests/ for more verbose output. - -## Common Problems - diff --git a/docs/UserGuide.wiki.md b/docs/UserGuide.wiki.md index 6284d94..a572894 100644 --- a/docs/UserGuide.wiki.md +++ b/docs/UserGuide.wiki.md @@ -128,4 +128,4 @@ url.rewrite-once = ( "^/min/([a-z]=.*)" => "/min/index.php?$1" ) # Problems? -See [CommonProblems](CommonProblems.wiki.md) and [Debugging](Debugging.wiki.md). You might also try [TestingMinify](TestingMinify.wiki.md) (running `test_environment.php` in particular). +See [CommonProblems](CommonProblems.wiki.md) and [Debugging](Debugging.wiki.md). You might also try running `server-info.php` in particular. diff --git a/min_extras/cli/minify.php b/min_extras/cli/minify.php index 3d23cf5..30394e9 100755 --- a/min_extras/cli/minify.php +++ b/min_extras/cli/minify.php @@ -21,8 +21,8 @@ if (! $cli->validate()) { if ($cli->isHelpRequest) { echo $cli->getArgumentsListing(); } - echo "EXAMPLE: ./minify.php ../../min_unit_tests/_test_files/js/*.js\n"; - echo "EXAMPLE: ./minify.php -d../.. ../../min_unit_tests/_test_files/css/*.css\n"; + echo "EXAMPLE: ./minify.php ../../tests/_test_files/js/*.js\n"; + echo "EXAMPLE: ./minify.php -d../.. ../../tests/_test_files/css/*.css\n"; echo "EXAMPLE: echo \"var js = 'Awesome' && /cool/;\" | ./minify.php -t js\n"; echo "EXAMPLE: echo \"sel > ector { prop: 'value '; }\" | ./minify.php -t css\n"; echo "\n"; diff --git a/min_extras/cli/rewrite-uris.php b/min_extras/cli/rewrite-uris.php index b9ba97e..908d1f3 100755 --- a/min_extras/cli/rewrite-uris.php +++ b/min_extras/cli/rewrite-uris.php @@ -18,7 +18,7 @@ if (! $cli->validate()) { if ($cli->isHelpRequest) { echo $cli->getArgumentsListing(); } - echo "EXAMPLE: ./rewrite-uris.php -v -d../.. ../../min_unit_tests/_test_files/css/paths_rewrite.css ../../min_unit_tests/_test_files/css/comments.css + echo "EXAMPLE: ./rewrite-uris.php -v -d../.. ../../tests/_test_files/css/paths_rewrite.css ../../tests/_test_files/css/comments.css \n"; exit(0); } diff --git a/min_unit_tests/.htaccess b/min_unit_tests/.htaccess deleted file mode 100644 index 4e05c4c..0000000 --- a/min_unit_tests/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - -# In case AddOutputFilterByType has been added -SetEnv no-gzip - diff --git a/min_unit_tests/HTTP_ConditionalGet/2.php b/min_unit_tests/HTTP_ConditionalGet/2.php deleted file mode 100644 index 237ce0a..0000000 --- a/min_unit_tests/HTTP_ConditionalGet/2.php +++ /dev/null @@ -1,43 +0,0 @@ - $lastModified -)); -if ($cg->cacheIsValid) { - $cg->sendHeaders(); - // we're done - exit(); -} - -// generate content -$title = 'Last-Modified is known : add Content-Length'; -$explain = ' -

Here, like the first example, we know the Last-Modified time, -but we also want to set the Content-Length to increase cacheability and allow -HTTP persistent connections. Instead of sending headers immediately, we first -generate our content, then use setContentLength(strlen($content)) -to add the header. Then finally call sendHeaders() and send the -content.

-

Note: This is not required if your PHP config buffers all -output and your script doesn\'t do any incremental flushing of the output -buffer. PHP will generally set Content-Length for you if it can.

-

This script emulates a document that changes every ' .$every. ' seconds. -
This is version: ' . date('r', $lastModified) . '

-'; - -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$cg->setContentLength(strlen($content)); -$cg->sendHeaders(); -send_slowly($content); - diff --git a/min_unit_tests/HTTP_ConditionalGet/3.php b/min_unit_tests/HTTP_ConditionalGet/3.php deleted file mode 100644 index 67f6ee9..0000000 --- a/min_unit_tests/HTTP_ConditionalGet/3.php +++ /dev/null @@ -1,39 +0,0 @@ -When Last-Modified is unknown, you can still use ETags, but you need a short -string that is unique for that content. In the worst case, you have to generate -all the content first, then instantiate HTTP_ConditionalGet, setting -the array key contentHash to the output of a hash function of the -content. Since we have the full content, we might as well also use -setContentLength(strlen($content)) in the case where we need to -send it.

-

This script emulates a document that changes every ' .$every. ' seconds. -
This is version: ' . date('r', $lastModified) . '

-'; -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$cg = new HTTP_ConditionalGet(array( - 'contentHash' => substr(md5($content), 7) -)); -if ($cg->cacheIsValid) { - $cg->sendHeaders(); - // we're done - exit(); -} -$cg->setContentLength(strlen($content)); -$cg->sendHeaders(); - -send_slowly($content); - diff --git a/min_unit_tests/HTTP_ConditionalGet/4.php b/min_unit_tests/HTTP_ConditionalGet/4.php deleted file mode 100644 index d749b26..0000000 --- a/min_unit_tests/HTTP_ConditionalGet/4.php +++ /dev/null @@ -1,47 +0,0 @@ - $lastModified - ,'encoding' => $enc -)); -$cg->sendHeaders(); -if ($cg->cacheIsValid) { - // we're done - exit(); -} - -// output encoded content - -$title = 'ConditionalGet + Encoder'; -$explain = ' -

Using ConditionalGet and Encoder is straightforward. First impliment the -ConditionalGet, then if the cache is not valid, encode and send the content

-

This script emulates a document that changes every ' .$every. ' seconds. -
This is version: ' . date('r', $lastModified) . '

-'; -require '_include.php'; -$content = get_content(array( - 'title' => $title - ,'explain' => $explain -)); - -$he = new HTTP_Encoder(array( - 'content' => get_content(array( - 'title' => $title - ,'explain' => $explain - )) -)); -$he->encode(); - -// usually you would just $he->sendAll(), but here we want to emulate slow -// connection -$he->sendHeaders(); -send_slowly($he->getContent()); diff --git a/min_unit_tests/HTTP_ConditionalGet/5.php b/min_unit_tests/HTTP_ConditionalGet/5.php deleted file mode 100644 index dbd079a..0000000 --- a/min_unit_tests/HTTP_ConditionalGet/5.php +++ /dev/null @@ -1,26 +0,0 @@ - 20 - ,'lastModifiedTime' => filemtime(__FILE__) -)); -$cg->sendHeaders(); - -// generate, send content -$title = 'Last-Modified + Expires'; -$explain = ' -

Here we set a static "lastModifiedTime" and "maxAge" to 20. The browser -will consider this document fresh for 20 seconds, then revalidate its cache. After -the 304 response, the cache will be good for another 20 seconds. Unless you force -a reload, there will only be 304 responses for this page after the initial download. -'; - -require '_include.php'; -echo get_content(array( - 'title' => $title - ,'explain' => $explain -)); - diff --git a/min_unit_tests/HTTP_ConditionalGet/_include.php b/min_unit_tests/HTTP_ConditionalGet/_include.php deleted file mode 100644 index 9b65ae1..0000000 --- a/min_unit_tests/HTTP_ConditionalGet/_include.php +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -HTTP_ConditionalGet : <?php echo $data['title']; ?> - - -

HTTP_ConditionalGet

-

- - -

Notes

-

How to distinguish 200 and 304 responses

-

For these pages all 200 responses are sent in chunks a second apart, so you -should notice that 304 responses are quicker. You can also use HTTP sniffers -like Fiddler (win) and -LiveHTTPHeaders (Firefox add-on) -to verify headers and content being sent.

-

Browser notes

-
-
Opera
-
Opera has a couple behaviors against the HTTP spec: Manual refreshes (F5) - prevents the ETag/If-Modified-Since headers from being sent; it only sends - them when following a link or bookmark. Also, Opera will not honor the - must-revalidate Cache-Control value unless max-age - is set. To get Opera to follow the spec, ConditionalGet will send Opera max-age=0 - (if one is not already set).
-
Safari
-
ETag validation is unsupported, but Safari supports HTTP/1.0 validation via - If-Modified-Since headers as long as the cache is explicitly marked - "public" or "private" ("private" is default in ConditionalGet).
-
- - - $lastModified -)); -$cg->sendHeaders(); -if ($cg->cacheIsValid) { - // we're done - exit(); -} - -$title = 'Last-Modified is known : simple usage'; -$explain = ' -

If your content has not changed since a certain timestamp, set this via the -the lastModifiedTime array key when instantiating HTTP_ConditionalGet. -You can immediately call the method sendHeaders() to set the -Last-Modified, ETag, and Cache-Control headers. The, if cacheIsValid -property is false, you echo the content.

-

This script emulates a document that changes every ' .$every. ' seconds. -
This is version: ' . date('r', $lastModified) . '

-'; - -require '_include.php'; - -send_slowly(get_content(array( - 'title' => $title - ,'explain' => $explain -))); - diff --git a/min_unit_tests/HTTP_Encoder/green.png b/min_unit_tests/HTTP_Encoder/green.png deleted file mode 100644 index d9d3a308aec0e9c7be676a8bc5438e5c61427ff2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_{3?x-PN__%S%*9TgAsieWw;%dH0CL#^d_r6q z{xkglf9682r8`iBv%n*=n1O-o0|+xZtudJa6cj6QjVN(0N=+=u%+FH@$;?efo0^iDsNj}alv - - - -HTTP_Encoder Test - - - -

HTTP_Encoder test

-

HTML

-

CSS

-

Javascript

-

image

- - - - $content - ,'type' => $type -)); -$he->encode(); -$he->sendAll(); diff --git a/min_unit_tests/_inc.php b/min_unit_tests/_inc.php deleted file mode 100644 index 9013f57..0000000 --- a/min_unit_tests/_inc.php +++ /dev/null @@ -1,62 +0,0 @@ -0, 'fail'=>0, 'total'=>0); - - $mode = $test ? 'pass' : 'fail'; - $outMode = $test ? 'PASS' : '!FAIL'; - printf("%s: %s (%d of %d tests run so far have %sed)\n", - $outMode, $message, ++$count[$mode], ++$count['total'], $mode); - - return (bool)$test; -} - -/** - * Get number of bytes in a string regardless of mbstring.func_overload - * - * @param string $str - * @return int - */ -function countBytes($str) -{ - return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) - ? mb_strlen($str, '8bit') - : strlen($str); -} - -ob_start(); diff --git a/tests/TestCase.php b/tests/TestCase.php index e6d4b52..a871461 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -9,8 +9,8 @@ class TestCase extends PHPUnit_Framework_TestCase public static function setupBeforeClass() { - self::$document_root = __DIR__ . '/../min_unit_tests'; - self::$test_files = self::$document_root . '/_test_files'; + self::$document_root = __DIR__; + self::$test_files = __DIR__ . '/_test_files'; } /** diff --git a/min_unit_tests/_test_files/css/comments.css b/tests/_test_files/css/comments.css similarity index 100% rename from min_unit_tests/_test_files/css/comments.css rename to tests/_test_files/css/comments.css diff --git a/min_unit_tests/_test_files/css/comments.min.css b/tests/_test_files/css/comments.min.css similarity index 100% rename from min_unit_tests/_test_files/css/comments.min.css rename to tests/_test_files/css/comments.min.css diff --git a/min_unit_tests/_test_files/css/hacks.css b/tests/_test_files/css/hacks.css similarity index 100% rename from min_unit_tests/_test_files/css/hacks.css rename to tests/_test_files/css/hacks.css diff --git a/min_unit_tests/_test_files/css/hacks.min.css b/tests/_test_files/css/hacks.min.css similarity index 100% rename from min_unit_tests/_test_files/css/hacks.min.css rename to tests/_test_files/css/hacks.min.css diff --git a/min_unit_tests/_test_files/css/issue210.css b/tests/_test_files/css/issue210.css similarity index 100% rename from min_unit_tests/_test_files/css/issue210.css rename to tests/_test_files/css/issue210.css diff --git a/min_unit_tests/_test_files/css/issue210.min.css b/tests/_test_files/css/issue210.min.css similarity index 100% rename from min_unit_tests/_test_files/css/issue210.min.css rename to tests/_test_files/css/issue210.min.css diff --git a/min_unit_tests/_test_files/css/issue62.css b/tests/_test_files/css/issue62.css similarity index 100% rename from min_unit_tests/_test_files/css/issue62.css rename to tests/_test_files/css/issue62.css diff --git a/min_unit_tests/_test_files/css/issue62.min.css b/tests/_test_files/css/issue62.min.css similarity index 100% rename from min_unit_tests/_test_files/css/issue62.min.css rename to tests/_test_files/css/issue62.min.css diff --git a/min_unit_tests/_test_files/css/paths_prepend.css b/tests/_test_files/css/paths_prepend.css similarity index 100% rename from min_unit_tests/_test_files/css/paths_prepend.css rename to tests/_test_files/css/paths_prepend.css diff --git a/min_unit_tests/_test_files/css/paths_prepend.min.css b/tests/_test_files/css/paths_prepend.min.css similarity index 100% rename from min_unit_tests/_test_files/css/paths_prepend.min.css rename to tests/_test_files/css/paths_prepend.min.css diff --git a/min_unit_tests/_test_files/css/paths_rewrite.css b/tests/_test_files/css/paths_rewrite.css similarity index 100% rename from min_unit_tests/_test_files/css/paths_rewrite.css rename to tests/_test_files/css/paths_rewrite.css diff --git a/min_unit_tests/_test_files/css/paths_rewrite.min.css b/tests/_test_files/css/paths_rewrite.min.css similarity index 100% rename from min_unit_tests/_test_files/css/paths_rewrite.min.css rename to tests/_test_files/css/paths_rewrite.min.css diff --git a/min_unit_tests/_test_files/css/readme.txt b/tests/_test_files/css/readme.txt similarity index 100% rename from min_unit_tests/_test_files/css/readme.txt rename to tests/_test_files/css/readme.txt diff --git a/min_unit_tests/_test_files/css/selectors.css b/tests/_test_files/css/selectors.css similarity index 100% rename from min_unit_tests/_test_files/css/selectors.css rename to tests/_test_files/css/selectors.css diff --git a/min_unit_tests/_test_files/css/selectors.min.css b/tests/_test_files/css/selectors.min.css similarity index 100% rename from min_unit_tests/_test_files/css/selectors.min.css rename to tests/_test_files/css/selectors.min.css diff --git a/min_unit_tests/_test_files/css/styles.css b/tests/_test_files/css/styles.css similarity index 100% rename from min_unit_tests/_test_files/css/styles.css rename to tests/_test_files/css/styles.css diff --git a/min_unit_tests/_test_files/css/styles.min.css b/tests/_test_files/css/styles.min.css similarity index 100% rename from min_unit_tests/_test_files/css/styles.min.css rename to tests/_test_files/css/styles.min.css diff --git a/min_unit_tests/_test_files/css/subsilver.css b/tests/_test_files/css/subsilver.css similarity index 100% rename from min_unit_tests/_test_files/css/subsilver.css rename to tests/_test_files/css/subsilver.css diff --git a/min_unit_tests/_test_files/css/subsilver.min.css b/tests/_test_files/css/subsilver.min.css similarity index 100% rename from min_unit_tests/_test_files/css/subsilver.min.css rename to tests/_test_files/css/subsilver.min.css diff --git a/min_unit_tests/_test_files/css/unusual_strings.css b/tests/_test_files/css/unusual_strings.css similarity index 100% rename from min_unit_tests/_test_files/css/unusual_strings.css rename to tests/_test_files/css/unusual_strings.css diff --git a/min_unit_tests/_test_files/css/unusual_strings.min.css b/tests/_test_files/css/unusual_strings.min.css similarity index 100% rename from min_unit_tests/_test_files/css/unusual_strings.min.css rename to tests/_test_files/css/unusual_strings.min.css diff --git a/min_unit_tests/_test_files/css/vladmirated.css b/tests/_test_files/css/vladmirated.css similarity index 100% rename from min_unit_tests/_test_files/css/vladmirated.css rename to tests/_test_files/css/vladmirated.css diff --git a/min_unit_tests/_test_files/css/vladmirated.min.css b/tests/_test_files/css/vladmirated.min.css similarity index 100% rename from min_unit_tests/_test_files/css/vladmirated.min.css rename to tests/_test_files/css/vladmirated.min.css diff --git a/min_unit_tests/_test_files/css_uriRewriter/exp.css b/tests/_test_files/css_uriRewriter/exp.css similarity index 100% rename from min_unit_tests/_test_files/css_uriRewriter/exp.css rename to tests/_test_files/css_uriRewriter/exp.css diff --git a/min_unit_tests/_test_files/css_uriRewriter/exp_prepend.css b/tests/_test_files/css_uriRewriter/exp_prepend.css similarity index 100% rename from min_unit_tests/_test_files/css_uriRewriter/exp_prepend.css rename to tests/_test_files/css_uriRewriter/exp_prepend.css diff --git a/min_unit_tests/_test_files/css_uriRewriter/exp_prepend2.css b/tests/_test_files/css_uriRewriter/exp_prepend2.css similarity index 100% rename from min_unit_tests/_test_files/css_uriRewriter/exp_prepend2.css rename to tests/_test_files/css_uriRewriter/exp_prepend2.css diff --git a/min_unit_tests/_test_files/css_uriRewriter/in.css b/tests/_test_files/css_uriRewriter/in.css similarity index 100% rename from min_unit_tests/_test_files/css_uriRewriter/in.css rename to tests/_test_files/css_uriRewriter/in.css diff --git a/min_unit_tests/_test_files/html/before.html b/tests/_test_files/html/before.html similarity index 100% rename from min_unit_tests/_test_files/html/before.html rename to tests/_test_files/html/before.html diff --git a/min_unit_tests/_test_files/html/before.min.html b/tests/_test_files/html/before.min.html similarity index 100% rename from min_unit_tests/_test_files/html/before.min.html rename to tests/_test_files/html/before.min.html diff --git a/min_unit_tests/_test_files/html/before2.html b/tests/_test_files/html/before2.html similarity index 100% rename from min_unit_tests/_test_files/html/before2.html rename to tests/_test_files/html/before2.html diff --git a/min_unit_tests/_test_files/html/before2.min.html b/tests/_test_files/html/before2.min.html similarity index 100% rename from min_unit_tests/_test_files/html/before2.min.html rename to tests/_test_files/html/before2.min.html diff --git a/min_unit_tests/_test_files/htmlHelper_groupsConfig.php b/tests/_test_files/htmlHelper_groupsConfig.php similarity index 100% rename from min_unit_tests/_test_files/htmlHelper_groupsConfig.php rename to tests/_test_files/htmlHelper_groupsConfig.php diff --git a/min_unit_tests/_test_files/importProcessor/css/1/adjacent.css b/tests/_test_files/importProcessor/css/1/adjacent.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/css/1/adjacent.css rename to tests/_test_files/importProcessor/css/1/adjacent.css diff --git a/min_unit_tests/_test_files/importProcessor/css/1/tv.css b/tests/_test_files/importProcessor/css/1/tv.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/css/1/tv.css rename to tests/_test_files/importProcessor/css/1/tv.css diff --git a/min_unit_tests/_test_files/importProcessor/css/adjacent.css b/tests/_test_files/importProcessor/css/adjacent.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/css/adjacent.css rename to tests/_test_files/importProcessor/css/adjacent.css diff --git a/min_unit_tests/_test_files/importProcessor/css/input.css b/tests/_test_files/importProcessor/css/input.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/css/input.css rename to tests/_test_files/importProcessor/css/input.css diff --git a/min_unit_tests/_test_files/importProcessor/css/output.css b/tests/_test_files/importProcessor/css/output.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/css/output.css rename to tests/_test_files/importProcessor/css/output.css diff --git a/min_unit_tests/_test_files/importProcessor/lib/css/example.css b/tests/_test_files/importProcessor/lib/css/example.css similarity index 100% rename from min_unit_tests/_test_files/importProcessor/lib/css/example.css rename to tests/_test_files/importProcessor/lib/css/example.css diff --git a/min_unit_tests/_test_files/js/before.js b/tests/_test_files/js/before.js similarity index 100% rename from min_unit_tests/_test_files/js/before.js rename to tests/_test_files/js/before.js diff --git a/min_unit_tests/_test_files/js/before.min.js b/tests/_test_files/js/before.min.js similarity index 100% rename from min_unit_tests/_test_files/js/before.min.js rename to tests/_test_files/js/before.min.js diff --git a/min_unit_tests/_test_files/js/before.min_plus.js b/tests/_test_files/js/before.min_plus.js similarity index 100% rename from min_unit_tests/_test_files/js/before.min_plus.js rename to tests/_test_files/js/before.min_plus.js diff --git a/min_unit_tests/_test_files/js/condcomm.js b/tests/_test_files/js/condcomm.js similarity index 100% rename from min_unit_tests/_test_files/js/condcomm.js rename to tests/_test_files/js/condcomm.js diff --git a/min_unit_tests/_test_files/js/condcomm.min_plus.js b/tests/_test_files/js/condcomm.min_plus.js similarity index 100% rename from min_unit_tests/_test_files/js/condcomm.min_plus.js rename to tests/_test_files/js/condcomm.min_plus.js diff --git a/min_unit_tests/_test_files/js/issue132.js b/tests/_test_files/js/issue132.js similarity index 100% rename from min_unit_tests/_test_files/js/issue132.js rename to tests/_test_files/js/issue132.js diff --git a/min_unit_tests/_test_files/js/issue132.min.js b/tests/_test_files/js/issue132.min.js similarity index 100% rename from min_unit_tests/_test_files/js/issue132.min.js rename to tests/_test_files/js/issue132.min.js diff --git a/min_unit_tests/_test_files/js/issue141.min.js b/tests/_test_files/js/issue141.min.js similarity index 100% rename from min_unit_tests/_test_files/js/issue141.min.js rename to tests/_test_files/js/issue141.min.js diff --git a/min_unit_tests/_test_files/js/issue144.js b/tests/_test_files/js/issue144.js similarity index 100% rename from min_unit_tests/_test_files/js/issue144.js rename to tests/_test_files/js/issue144.js diff --git a/min_unit_tests/_test_files/js/issue144.min.js b/tests/_test_files/js/issue144.min.js similarity index 100% rename from min_unit_tests/_test_files/js/issue144.min.js rename to tests/_test_files/js/issue144.min.js diff --git a/min_unit_tests/_test_files/js/issue256.js b/tests/_test_files/js/issue256.js similarity index 100% rename from min_unit_tests/_test_files/js/issue256.js rename to tests/_test_files/js/issue256.js diff --git a/min_unit_tests/_test_files/js/issue256.min.js b/tests/_test_files/js/issue256.min.js similarity index 100% rename from min_unit_tests/_test_files/js/issue256.min.js rename to tests/_test_files/js/issue256.min.js diff --git a/min_unit_tests/_test_files/js/jquery-1.2.3.js b/tests/_test_files/js/jquery-1.2.3.js similarity index 100% rename from min_unit_tests/_test_files/js/jquery-1.2.3.js rename to tests/_test_files/js/jquery-1.2.3.js diff --git a/min_unit_tests/_test_files/js/regexes.js b/tests/_test_files/js/regexes.js similarity index 100% rename from min_unit_tests/_test_files/js/regexes.js rename to tests/_test_files/js/regexes.js diff --git a/min_unit_tests/_test_files/js/regexes.min.js b/tests/_test_files/js/regexes.min.js similarity index 100% rename from min_unit_tests/_test_files/js/regexes.min.js rename to tests/_test_files/js/regexes.min.js diff --git a/min_unit_tests/_test_files/minify/QueryString.js b/tests/_test_files/minify/QueryString.js similarity index 100% rename from min_unit_tests/_test_files/minify/QueryString.js rename to tests/_test_files/minify/QueryString.js diff --git a/min_unit_tests/_test_files/minify/email.js b/tests/_test_files/minify/email.js similarity index 100% rename from min_unit_tests/_test_files/minify/email.js rename to tests/_test_files/minify/email.js diff --git a/min_unit_tests/_test_files/minify/issue143.js b/tests/_test_files/minify/issue143.js similarity index 100% rename from min_unit_tests/_test_files/minify/issue143.js rename to tests/_test_files/minify/issue143.js diff --git a/min_unit_tests/_test_files/minify/issue73_1.js b/tests/_test_files/minify/issue73_1.js similarity index 100% rename from min_unit_tests/_test_files/minify/issue73_1.js rename to tests/_test_files/minify/issue73_1.js diff --git a/min_unit_tests/_test_files/minify/issue73_2.js b/tests/_test_files/minify/issue73_2.js similarity index 100% rename from min_unit_tests/_test_files/minify/issue73_2.js rename to tests/_test_files/minify/issue73_2.js diff --git a/min_unit_tests/_test_files/minify/issue89_1.css b/tests/_test_files/minify/issue89_1.css similarity index 100% rename from min_unit_tests/_test_files/minify/issue89_1.css rename to tests/_test_files/minify/issue89_1.css diff --git a/min_unit_tests/_test_files/minify/issue89_2.css b/tests/_test_files/minify/issue89_2.css similarity index 100% rename from min_unit_tests/_test_files/minify/issue89_2.css rename to tests/_test_files/minify/issue89_2.css diff --git a/min_unit_tests/_test_files/minify/issue89_out.min.css b/tests/_test_files/minify/issue89_out.min.css similarity index 100% rename from min_unit_tests/_test_files/minify/issue89_out.min.css rename to tests/_test_files/minify/issue89_out.min.css diff --git a/min_unit_tests/_test_files/minify/lines_bugs.js b/tests/_test_files/minify/lines_bugs.js similarity index 100% rename from min_unit_tests/_test_files/minify/lines_bugs.js rename to tests/_test_files/minify/lines_bugs.js diff --git a/min_unit_tests/_test_files/minify/lines_output.js b/tests/_test_files/minify/lines_output.js similarity index 100% rename from min_unit_tests/_test_files/minify/lines_output.js rename to tests/_test_files/minify/lines_output.js diff --git a/min_unit_tests/_test_files/minify/minified.css b/tests/_test_files/minify/minified.css similarity index 100% rename from min_unit_tests/_test_files/minify/minified.css rename to tests/_test_files/minify/minified.css diff --git a/min_unit_tests/_test_files/minify/minified.js b/tests/_test_files/minify/minified.js similarity index 100% rename from min_unit_tests/_test_files/minify/minified.js rename to tests/_test_files/minify/minified.js diff --git a/min_unit_tests/test_js_in_browser.html b/tests/test_js_in_browser.html similarity index 100% rename from min_unit_tests/test_js_in_browser.html rename to tests/test_js_in_browser.html