From dcac8c1f29cd718c949c1b2c48681a90b0f647ed Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 28 Oct 2011 15:58:33 -0400
Subject: Tests: Added ability to run tests against minified files via ?min=1

---
 build/build.xml                                |  7 +++++
 tests/resource_loader.js                       | 39 ++++++++++++++++++++++++++
 tests/unit/accordion/accordion.html            | 17 +++++++----
 tests/unit/accordion/accordion_deprecated.html | 17 +++++++----
 tests/unit/autocomplete/autocomplete.html      | 21 ++++++++------
 tests/unit/button/button.html                  | 17 +++++++----
 tests/unit/core/core.html                      |  8 ++++--
 tests/unit/datepicker/datepicker.html          | 22 +++++++++------
 tests/unit/dialog/dialog.html                  | 25 ++++++++++-------
 tests/unit/draggable/draggable.html            | 16 ++++++++---
 tests/unit/droppable/droppable.html            | 18 ++++++++----
 tests/unit/effects/effects.html                | 35 ++++++++++++++---------
 tests/unit/menu/menu.html                      | 16 +++++++----
 tests/unit/position/position.html              |  7 ++++-
 tests/unit/position/position_deprecated.html   |  7 ++++-
 tests/unit/progressbar/progressbar.html        | 17 +++++++----
 tests/unit/resizable/resizable.html            | 19 ++++++++-----
 tests/unit/selectable/selectable.html          | 16 ++++++++---
 tests/unit/slider/slider.html                  | 18 ++++++++----
 tests/unit/sortable/sortable.html              | 16 ++++++++---
 tests/unit/spinner/spinner.html                | 18 ++++++++----
 tests/unit/tabs/tabs.html                      | 16 +++++++----
 tests/unit/tabs/tabs_deprecated.html           | 16 +++++++----
 tests/unit/tooltip/tooltip.html                | 18 ++++++++----
 tests/unit/widget/widget.html                  | 11 ++++++--
 25 files changed, 309 insertions(+), 128 deletions(-)
 create mode 100644 tests/resource_loader.js

diff --git a/build/build.xml b/build/build.xml
index aef5e5fb3..1e5ab842b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -148,6 +148,13 @@
 			<fileset dir="${ui.dir}/themes/base/images" />
 		</copy>
 
+		<!-- make a copy of the minified files for use in tests -->
+		<copy todir="dist" file="${min.dir}/jquery-ui.min.js" />
+		<copy todir="dist/theme" file="${dist.dir}/themes/base/minified/jquery-ui.min.css" />
+		<copy todir="dist/theme/images" >
+			<fileset dir="${ui.dir}/themes/base/images" />
+		</copy>
+
 		<echo message="Minified ui/ built." />
 	</target>
 
diff --git a/tests/resource_loader.js b/tests/resource_loader.js
new file mode 100644
index 000000000..c8dec4881
--- /dev/null
+++ b/tests/resource_loader.js
@@ -0,0 +1,39 @@
+(function( $ ) {
+
+var parts = document.location.search.slice( 1 ).split( "&" ),
+	length = parts.length,
+	i = 0,
+	current,
+	min;
+
+for ( ; i < length; i++ ) {
+	current = parts[ i ].split( "=" );
+	if ( current[ 0 ] === "min" ) {
+		min = current[ 1 ];
+		break;
+	}
+}
+
+function includeStyle( url ) {
+	document.write( "<link rel='stylesheet' href='../../../" + url + "'>" );
+}
+
+function includeScript( url ) {
+	document.write( "<script src='../../../" + url + "'></script>" );
+}
+
+window.loadResources = min ?
+	function() {
+		includeStyle( "build/dist/theme/jquery-ui.min.css" );
+		includeScript( "build/dist/jquery-ui.min.js" );
+	} :
+	function( resources ) {
+		$.each( resources.css || [], function( i, resource ) {
+			includeStyle( "themes/base/jquery." + resource + ".css" );
+		});
+		$.each( resources.js || [], function( i, resource ) {
+			includeScript( resource );
+		});
+	};
+
+})( jQuery );
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index b3c3b59ac..ed9b1aa1d 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -4,16 +4,21 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
-
 	<script src="../../jquery.js"></script>
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.accordion.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.accordion" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.accordion.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index 3a7ad86f2..f730d8029 100644
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -4,13 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.accordion.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.accordion.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.accordion" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.accordion.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index e5987350b..70d2ecfd1 100644
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -4,15 +4,20 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.autocomplete.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
-	<script src="../../../ui/jquery.ui.menu.js"></script>
-	<script src="../../../ui/jquery.ui.autocomplete.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.menu", "ui.autocomplete" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.menu.js",
+			"ui/jquery.ui.autocomplete.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 7fcf07eec..5ec7e316a 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -4,13 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.button.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.button.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.button" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.button.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index e2d988806..3b1dc1fc8 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -5,8 +5,12 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		js: [ "ui/jquery.ui.core.js" ]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 108023372..592db53cc 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -4,16 +4,20 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.datepicker.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.datepicker.js"></script>
-	<script src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
-	<script src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
-	<script src="../../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.datepicker" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.datepicker.js",
+			"ui/i18n/jquery.ui.datepicker-fr.js",
+			"ui/i18n/jquery.ui.datepicker-he.js",
+			"ui/i18n/jquery.ui.datepicker-zh-CN.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index b35ae5823..94b20a225 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -4,18 +4,23 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.dialog.css">
-
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.bgiframe-2.1.2.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.draggable.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
-	<script src="../../../ui/jquery.ui.resizable.js"></script>
-	<script src="../../../ui/jquery.ui.dialog.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.dialog" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.draggable.js",
+			"ui/jquery.ui.resizable.js",
+			"ui/jquery.ui.dialog.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index e5006bf17..5be71f460 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -5,10 +5,18 @@
 	<title>jQuery UI Draggable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.draggable.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.draggable.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index 149430bcf..abf94f0c7 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -5,11 +5,19 @@
 	<title>jQuery UI Droppable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.draggable.js"></script>
-	<script src="../../../ui/jquery.ui.droppable.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.draggable.js",
+			"ui/jquery.ui.droppable.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index f5dac54c7..06023c55d 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -8,20 +8,27 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../../ui/jquery.effects.core.js"></script>
-	<script src="../../../ui/jquery.effects.blind.js"></script>
-	<script src="../../../ui/jquery.effects.bounce.js"></script>
-	<script src="../../../ui/jquery.effects.clip.js"></script>
-	<script src="../../../ui/jquery.effects.drop.js"></script>
-	<script src="../../../ui/jquery.effects.explode.js"></script>
-	<script src="../../../ui/jquery.effects.fade.js"></script>
-	<script src="../../../ui/jquery.effects.fold.js"></script>
-	<script src="../../../ui/jquery.effects.highlight.js"></script>
-	<script src="../../../ui/jquery.effects.pulsate.js"></script>
-	<script src="../../../ui/jquery.effects.scale.js"></script>
-	<script src="../../../ui/jquery.effects.shake.js"></script>
-	<script src="../../../ui/jquery.effects.slide.js"></script>
-	<script src="../../../ui/jquery.effects.transfer.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		js: [
+			"ui/jquery.effects.core.js",
+			"ui/jquery.effects.blind.js",
+			"ui/jquery.effects.bounce.js",
+			"ui/jquery.effects.clip.js",
+			"ui/jquery.effects.drop.js",
+			"ui/jquery.effects.explode.js",
+			"ui/jquery.effects.fade.js",
+			"ui/jquery.effects.fold.js",
+			"ui/jquery.effects.highlight.js",
+			"ui/jquery.effects.pulsate.js",
+			"ui/jquery.effects.scale.js",
+			"ui/jquery.effects.shake.js",
+			"ui/jquery.effects.slide.js",
+			"ui/jquery.effects.transfer.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 014123144..76f4a7a31 100644
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -4,12 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Menu Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.menu.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.menu" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.menu.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index a3a97911c..17ee20258 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -8,7 +8,12 @@
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		js: [ "ui/jquery.ui.position.js" ]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
index c80490f74..ee9be189d 100644
--- a/tests/unit/position/position_deprecated.html
+++ b/tests/unit/position/position_deprecated.html
@@ -5,7 +5,12 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		js: [ "ui/jquery.ui.position.js" ]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index b708af265..8b55f5a89 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -4,13 +4,18 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.progressbar.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.progressbar.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.progressbar" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.progressbar.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index f1b2f1bc3..4e886d2fd 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -4,14 +4,19 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.resizable.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.resizable" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.resizable.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 4d6150691..4f70e8dd4 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,10 +5,18 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.selectable.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.selectable" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.selectable.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 3fe3b3588..60d124b7a 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -4,13 +4,19 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.slider.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.slider.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.slider" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.slider.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index 40eed6652..a20eb7109 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -5,10 +5,18 @@
 	<title>jQuery UI Sortable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.mouse.js"></script>
-	<script src="../../../ui/jquery.ui.sortable.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.sortable" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.sortable.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index 321c16b4c..0c01a5f48 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -4,16 +4,22 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner Test Suite</title>
 	
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.spinner.css">
-
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
 	<script src="../../../external/globalize.js"></script>
 	<script src="../../../external/globalize.culture.ja-JP.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.button.js"></script>
-	<script src="../../../ui/jquery.ui.spinner.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.button", "ui.spinner" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.button.js",
+			"ui/jquery.ui.spinner.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 688b2642f..f2a672b2e 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -4,15 +4,21 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.tabs.css">
-
 	<script src="../../jquery.js"></script>
 	<script>
 	$.uiBackCompat = false;
 	</script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.tabs.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.tabs" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.tabs.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index 322cec163..92d9be81c 100644
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -4,13 +4,19 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.tabs.css">
-
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.cookie.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.tabs.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.tabs" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.tabs.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 82070fbfd..b5e8558e5 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -4,13 +4,19 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.tooltip.css">
-
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.position.js"></script>
-	<script src="../../../ui/jquery.ui.tooltip.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core", "ui.tooltip" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.tooltip.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html
index 7ae41f264..6f4caaa6c 100644
--- a/tests/unit/widget/widget.html
+++ b/tests/unit/widget/widget.html
@@ -5,8 +5,15 @@
 	<title>jQuery UI Widget Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
+	<script src="../../resource_loader.js"></script>
+	<script>
+	loadResources({
+		css: [ "ui.core" ],
+		js: [
+			"ui/jquery.ui.widget.js"
+		]
+	});
+	</script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
-- 
cgit v1.2.3