From 67d145e66ba1851e3ca88a58db7f8e02bdd4a2c5 Mon Sep 17 00:00:00 2001
From: Bryan Forbes <bryan@sitepen.com>
Date: Fri, 21 Oct 2011 12:22:49 -0500
Subject: [PATCH] Moved test_*.html to *.html and data files to test/data/*.

---
 test/{test_GridFromHtml.html => GridFromHtml.html}            | 4 ++--
 ...st_GridFromHtml_Editors.html => GridFromHtml_Editors.html} | 4 ++--
 test/{test_Grid_rendering.html => Grid_rendering.html}        | 4 ++--
 test/{test_JsonRest.html => JsonRest.html}                    | 2 +-
 test/{test_OnDemand.html => OnDemand.html}                    | 2 +-
 test/{test_addCssRule.html => addCssRule.html}                | 0
 test/{test_autoheight.html => autoheight.html}                | 2 +-
 test/{test_common_cases.html => common_cases.html}            | 2 +-
 test/{test_complex_column.html => complex_column.html}        | 2 +-
 test/{data.js => data/base.js}                                | 0
 test/{data_perf.js => data/perf.js}                           | 0
 test/{data_rest.js => data/rest.js}                           | 0
 test/{test_destroy.html => destroy.html}                      | 0
 test/{test_dijit_layout.html => dijit_layout.html}            | 4 ++--
 test/{test_editors.html => editors.html}                      | 2 +-
 test/{test_editors2.html => editors2.html}                    | 2 +-
 test/{test_editors_nostore.html => editors_nostore.html}      | 2 +-
 test/{test_extend_WidgetBase.html => extend_WidgetBase.html}  | 2 +-
 test/extensions/ColumnResizer.html                            | 2 +-
 test/extensions/ColumnResizer_complex.html                    | 2 +-
 test/extensions/DnD.html                                      | 4 ++--
 test/{test_headerless.html => headerless.html}                | 2 +-
 test/{test_mobile_grid.html => mobile_grid.html}              | 4 ++--
 test/{test_performance.html => performance.html}              | 2 +-
 ...ce_dojox_datagrid.html => performance_dojox_datagrid.html} | 2 +-
 ...test_performance_widgets.html => performance_widgets.html} | 2 +-
 test/{test_selection.html => selection.html}                  | 2 +-
 test/{test_selectors.html => selectors.html}                  | 2 +-
 test/{test_simple_grid.html => simple_grid.html}              | 0
 test/{test_skin.html => skin.html}                            | 4 ++--
 test/{test_sparse.html => sparse.html}                        | 0
 test/{test_treegrid.html => treegrid.html}                    | 2 +-
 test/{test_tundra_custom.html => tundra_custom.html}          | 2 +-
 test/{test_widths.html => widths.html}                        | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)
 rename test/{test_GridFromHtml.html => GridFromHtml.html} (99%)
 rename test/{test_GridFromHtml_Editors.html => GridFromHtml_Editors.html} (97%)
 rename test/{test_Grid_rendering.html => Grid_rendering.html} (98%)
 rename test/{test_JsonRest.html => JsonRest.html} (97%)
 rename test/{test_OnDemand.html => OnDemand.html} (98%)
 rename test/{test_addCssRule.html => addCssRule.html} (100%)
 rename test/{test_autoheight.html => autoheight.html} (94%)
 rename test/{test_common_cases.html => common_cases.html} (97%)
 rename test/{test_complex_column.html => complex_column.html} (99%)
 rename test/{data.js => data/base.js} (100%)
 rename test/{data_perf.js => data/perf.js} (100%)
 rename test/{data_rest.js => data/rest.js} (100%)
 rename test/{test_destroy.html => destroy.html} (100%)
 rename test/{test_dijit_layout.html => dijit_layout.html} (96%)
 rename test/{test_editors.html => editors.html} (97%)
 rename test/{test_editors2.html => editors2.html} (97%)
 rename test/{test_editors_nostore.html => editors_nostore.html} (98%)
 rename test/{test_extend_WidgetBase.html => extend_WidgetBase.html} (98%)
 rename test/{test_headerless.html => headerless.html} (98%)
 rename test/{test_mobile_grid.html => mobile_grid.html} (97%)
 rename test/{test_performance.html => performance.html} (97%)
 rename test/{test_performance_dojox_datagrid.html => performance_dojox_datagrid.html} (98%)
 rename test/{test_performance_widgets.html => performance_widgets.html} (97%)
 rename test/{test_selection.html => selection.html} (98%)
 rename test/{test_selectors.html => selectors.html} (98%)
 rename test/{test_simple_grid.html => simple_grid.html} (100%)
 rename test/{test_skin.html => skin.html} (97%)
 rename test/{test_sparse.html => sparse.html} (100%)
 rename test/{test_treegrid.html => treegrid.html} (98%)
 rename test/{test_tundra_custom.html => tundra_custom.html} (95%)
 rename test/{test_widths.html => widths.html} (97%)

diff --git a/test/test_GridFromHtml.html b/test/GridFromHtml.html
similarity index 99%
rename from test/test_GridFromHtml.html
rename to test/GridFromHtml.html
index 992870eeb..34ca09ea0 100644
--- a/test/test_GridFromHtml.html
+++ b/test/GridFromHtml.html
@@ -67,7 +67,7 @@
 
 	
 
-			require(["dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query", "dgrid/test/data/base", "dojo/domReady!"],
 			function(GridFromHtml, Memory, Observable, declare, parser, query){
 
 				// GridFromHtml tests
@@ -184,4 +184,4 @@ <h2>3a: Testing numeric and boolean property (un)specification in GridFromHtml</
 		</table>
 		
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_GridFromHtml_Editors.html b/test/GridFromHtml_Editors.html
similarity index 97%
rename from test/test_GridFromHtml_Editors.html
rename to test/GridFromHtml_Editors.html
index e8d61f19f..456833e5d 100644
--- a/test/test_GridFromHtml_Editors.html
+++ b/test/GridFromHtml_Editors.html
@@ -24,7 +24,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query","dgrid/Keyboard","dijit/form/Select", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dojo/data/ObjectStore","dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query","dgrid/Keyboard","dijit/form/Select", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dojo/data/ObjectStore","dgrid/test/data/base", "dojo/domReady!"],
 			function(GridFromHtml, Memory, Observable, declare, parser, query, Keyboard, Select, Editor, DateTextBox, Slider, NumberSpinner, ObjectStore){
 
 				window.dgrid = { GridFromHtml: GridFromHtml };
@@ -75,4 +75,4 @@ <h2>2: Fully declarative GridFromHtml,
 			</tr>
 		</table>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_Grid_rendering.html b/test/Grid_rendering.html
similarity index 98%
rename from test/test_Grid_rendering.html
rename to test/Grid_rendering.html
index 0e39181df..29c1632f7 100644
--- a/test/test_Grid_rendering.html
+++ b/test/Grid_rendering.html
@@ -90,7 +90,7 @@
 				name: {},
 				description: {label: "what to do", sortable: false}
 			};
-			require(["dgrid/Grid", "dgrid/OnDemandGrid", "dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/Grid", "dgrid/OnDemandGrid", "dgrid/GridFromHtml", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/parser", "dojo/query", "dgrid/test/data/base", "dojo/domReady!"],
 			function(Grid, OnDemandGrid, GridFromHtml, Memory, Observable, declare, parser, query){
 				
 				// fully-programmatic tests
@@ -178,4 +178,4 @@ <h2>2c: Grid with no srcNodeRef (placed inside another domNode), id specified as
 		<h2>2d: Grid with no srcNodeRef (placed inside another domNode), dgrid / DOM node id autogenerated</h2>
 		<div class="test2d"></div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_JsonRest.html b/test/JsonRest.html
similarity index 97%
rename from test/test_JsonRest.html
rename to test/JsonRest.html
index a6462f07d..b3776ee8a 100644
--- a/test/test_JsonRest.html
+++ b/test/JsonRest.html
@@ -31,7 +31,7 @@
 					];
 
 					window.grid = new (declare([Grid, Selection, Keyboard]))({
-						query: "data_rest.js",
+						query: "data/rest.js",
 						store: testStore,
 						columns: columns
 					}, "grid");
diff --git a/test/test_OnDemand.html b/test/OnDemand.html
similarity index 98%
rename from test/test_OnDemand.html
rename to test/OnDemand.html
index 79ec60590..c5cce1713 100644
--- a/test/test_OnDemand.html
+++ b/test/OnDemand.html
@@ -56,7 +56,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/OnDemandList", "dgrid/OnDemandGrid","dgrid/Keyboard", "dgrid/Selection", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner",  "dgrid/test/data", "dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/_base/Deferred", "dojo/dom-construct", "dojo/store/Memory", "dojo/domReady!"],
+			require(["dojo/on", "dgrid/OnDemandList", "dgrid/OnDemandGrid","dgrid/Keyboard", "dgrid/Selection", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner",  "dgrid/test/data/base", "dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/_base/Deferred", "dojo/dom-construct", "dojo/store/Memory", "dojo/domReady!"],
 				function(on, List, Grid, Keyboard, Selection, Editor, DateTextBox, Slider, NumberSpinner, data, lang, declare, arrayUtil, Deferred, domConstruct, Memory){
 					
 					// Create error store
diff --git a/test/test_addCssRule.html b/test/addCssRule.html
similarity index 100%
rename from test/test_addCssRule.html
rename to test/addCssRule.html
diff --git a/test/test_autoheight.html b/test/autoheight.html
similarity index 94%
rename from test/test_autoheight.html
rename to test/autoheight.html
index 49b62c8a6..1ecb9b23d 100644
--- a/test/test_autoheight.html
+++ b/test/autoheight.html
@@ -27,7 +27,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(List, Grid, Selection, Keyboard, declare){
 					var columns = [
 						{label: 'Column 1', field: 'name'},
diff --git a/test/test_common_cases.html b/test/common_cases.html
similarity index 97%
rename from test/test_common_cases.html
rename to test/common_cases.html
index 6640c193b..ce1f1e60a 100644
--- a/test/test_common_cases.html
+++ b/test/common_cases.html
@@ -64,7 +64,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dgrid/test/data", "dojo/_base/declare", "dojo/_base/array", "dojo/domReady!"], 
+			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dgrid/test/data/base", "dojo/_base/declare", "dojo/_base/array", "dojo/domReady!"], 
 				function(on, List, Grid, Tree, Editor, Selection, Keyboard, testStore, declare, arrayUtil){
 					console.log("loaded in " + (new Date().getTime() - start) + testStore);
 					var columns = { // you can declare columns as an object hash (key translates to field)
diff --git a/test/test_complex_column.html b/test/complex_column.html
similarity index 99%
rename from test/test_complex_column.html
rename to test/complex_column.html
index 99e15d9d5..3a5b4edd9 100644
--- a/test/test_complex_column.html
+++ b/test/complex_column.html
@@ -38,7 +38,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/parser", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/on", "dojo/parser", "dgrid/test/data/base", "dojo/domReady!"],
 				function(Grid, GridFromHtml, ColumnSet, Tree, Selection, Keyboard, declare, on, parser, testStore){
 					var columnSets1 = [
 							[
diff --git a/test/data.js b/test/data/base.js
similarity index 100%
rename from test/data.js
rename to test/data/base.js
diff --git a/test/data_perf.js b/test/data/perf.js
similarity index 100%
rename from test/data_perf.js
rename to test/data/perf.js
diff --git a/test/data_rest.js b/test/data/rest.js
similarity index 100%
rename from test/data_rest.js
rename to test/data/rest.js
diff --git a/test/test_destroy.html b/test/destroy.html
similarity index 100%
rename from test/test_destroy.html
rename to test/destroy.html
diff --git a/test/test_dijit_layout.html b/test/dijit_layout.html
similarity index 96%
rename from test/test_dijit_layout.html
rename to test/dijit_layout.html
index 88c579359..ee6cd4ca1 100644
--- a/test/test_dijit_layout.html
+++ b/test/dijit_layout.html
@@ -43,7 +43,7 @@
 				"dijit/Toolbar",
 				"dijit/form/Button",
 				// non-returns
-				"dgrid/test/data",
+				"dgrid/test/data/base",
 				"dojo/domReady!"
 			], function(Grid, Dialog, lang, declare, parser){
 			
@@ -124,4 +124,4 @@
 				data-dojo-props="store: testStore, columns: gridCols"></div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_editors.html b/test/editors.html
similarity index 97%
rename from test/test_editors.html
rename to test/editors.html
index 98d0892f7..087b4211b 100644
--- a/test/test_editors.html
+++ b/test/editors.html
@@ -32,7 +32,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(List, Grid, Tree, Selection, Keyboard, Editor, DateTextBox, Slider, NumberSpinner, declare){
 					var columns = [
 						Editor({label: 'A Date', field: 'date'}, DateTextBox),
diff --git a/test/test_editors2.html b/test/editors2.html
similarity index 97%
rename from test/test_editors2.html
rename to test/editors2.html
index b635b2e64..25613f7e1 100644
--- a/test/test_editors2.html
+++ b/test/editors2.html
@@ -32,7 +32,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/ToggleButton", "dijit/form/TimeTextBox",  "dijit/form/Select","dojo/data/ObjectStore", "dijit/form/FilteringSelect", "dijit/Editor", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/ToggleButton", "dijit/form/TimeTextBox",  "dijit/form/Select","dojo/data/ObjectStore", "dijit/form/FilteringSelect", "dijit/Editor", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(List, Grid, Tree, Selection, Keyboard, Editor, ToggleButton, TimeTextBox, Select, ObjectStore, FilteringSelect, DijitEditor, declare){
 
 					stateStore = new ObjectStore({
diff --git a/test/test_editors_nostore.html b/test/editors_nostore.html
similarity index 98%
rename from test/test_editors_nostore.html
rename to test/editors_nostore.html
index 8091a024e..77f38944b 100644
--- a/test/test_editors_nostore.html
+++ b/test/editors_nostore.html
@@ -32,7 +32,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/Grid", "dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/NumberSpinner", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/Grid", "dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/NumberSpinner", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(Grid, Selection, Keyboard, Editor, NumberSpinner, declare){
 					var columns = [
 						Editor({
diff --git a/test/test_extend_WidgetBase.html b/test/extend_WidgetBase.html
similarity index 98%
rename from test/test_extend_WidgetBase.html
rename to test/extend_WidgetBase.html
index 10cc4e950..3e74272af 100644
--- a/test/test_extend_WidgetBase.html
+++ b/test/extend_WidgetBase.html
@@ -46,7 +46,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/_base/array", "dijit/_WidgetBase", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/_base/array", "dijit/_WidgetBase", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, List, Grid, Tree, Editor, Selection, Keyboard, declare, arrayUtil, _WidgetBase, testStore){
 					var columns = { // you can declare columns as an object hash (key translates to field)
 						col1: Editor({label: 'Column 1 column 1 column 1'}, "text", "dblclick"),
diff --git a/test/extensions/ColumnResizer.html b/test/extensions/ColumnResizer.html
index d92f3d308..532017b07 100644
--- a/test/extensions/ColumnResizer.html
+++ b/test/extensions/ColumnResizer.html
@@ -48,7 +48,7 @@
 		<script type="text/javascript" src="../../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/OnDemandGrid", "dgrid/extensions/ColumnResizer", "dgrid/Selection", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/OnDemandGrid", "dgrid/extensions/ColumnResizer", "dgrid/Selection", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(Grid, ColumnResizer, Selection, declare, testStore){
 					columns = { // you can declare columns as an object hash (key translates to field)
 						col1: 'Column 1Column1Column 1 Column 1',
diff --git a/test/extensions/ColumnResizer_complex.html b/test/extensions/ColumnResizer_complex.html
index 8b52f725a..e37e8e90f 100644
--- a/test/extensions/ColumnResizer_complex.html
+++ b/test/extensions/ColumnResizer_complex.html
@@ -35,7 +35,7 @@
 		<script type="text/javascript" src="../../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dgrid/extensions/ColumnResizer", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dgrid/OnDemandGrid", "dgrid/GridWithColumnSetsFromHtml", "dgrid/ColumnSet", "dgrid/Tree", "dgrid/Selection", "dgrid/Keyboard", "dgrid/extensions/ColumnResizer", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(Grid, GridFromHtml, ColumnSet, Tree, Selection, Keyboard,ColumnResizer, declare, testStore){
 					window.grid = declare([Grid, ColumnSet, Selection, Keyboard, ColumnResizer])({
 						store: testStore,
diff --git a/test/extensions/DnD.html b/test/extensions/DnD.html
index cd676b960..001612a24 100644
--- a/test/extensions/DnD.html
+++ b/test/extensions/DnD.html
@@ -52,7 +52,7 @@
 		<script type="text/javascript" src="../../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo", "dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/extensions/DnD", "dgrid/Keyboard", "dojo/dnd/Source", "dojo/_base/declare", "dojo/_base/lang", "dojo/_base/array", "dojo/_base/Deferred",  "dgrid/test/data", "dojo/domReady!"],
+			require(["dojo", "dgrid/List", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Selection", "dgrid/extensions/DnD", "dgrid/Keyboard", "dojo/dnd/Source", "dojo/_base/declare", "dojo/_base/lang", "dojo/_base/array", "dojo/_base/Deferred",  "dgrid/test/data/base", "dojo/domReady!"],
 				function(dojo, List, Grid, Tree, Selection, DndRow, Keyboard, DnDSource, declare, lang, arrayUtil, Deferred){
 					var
 						DnDGrid = declare([Grid, Selection, DndRow, Keyboard]),
@@ -199,4 +199,4 @@ <h2>Example of 2 grids w/ inter-grid DnD, sharing the same store</h2>
 			<div id="grid4"></div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_headerless.html b/test/headerless.html
similarity index 98%
rename from test/test_headerless.html
rename to test/headerless.html
index 96385fbd2..9cbbb2b61 100644
--- a/test/test_headerless.html
+++ b/test/headerless.html
@@ -69,7 +69,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dijit/form/DateTextBox", "dijit/form/HorizontalSlider", "dijit/form/NumberSpinner", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, List, Grid, Tree, Editor, Selection, Keyboard, declare, DateTextBox, Slider, NumberSpinner, testStore){
 					var columns = { // you can declare columns as an object hash (key translates to field)
 						col1: Editor({label: 'Column 1 column 1 column 1'}, "text", "dblclick"),
diff --git a/test/test_mobile_grid.html b/test/mobile_grid.html
similarity index 97%
rename from test/test_mobile_grid.html
rename to test/mobile_grid.html
index 0cabe284a..0473b5f34 100644
--- a/test/test_mobile_grid.html
+++ b/test/mobile_grid.html
@@ -21,7 +21,7 @@
 		</script>
 		<script type="text/javascript"  src="../../dojo/dojo.js"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/OnDemandGrid", "dgrid/extensions/ColumnResizer", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"],
+			require(["dojo/on", "dgrid/OnDemandGrid", "dgrid/extensions/ColumnResizer", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"],
 				function(on, Grid, ColumnResizer, declare, testStore){
 					var columns = { // you can declare columns as an object hash (key translates to field)
 						col1: 'Status',
@@ -74,4 +74,4 @@ <h1 data-dojo-type="dojox.mobile.Heading">View 2</h1>
 			</ul>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/test_performance.html b/test/performance.html
similarity index 97%
rename from test/test_performance.html
rename to test/performance.html
index 0c3891102..4084a411a 100644
--- a/test/test_performance.html
+++ b/test/performance.html
@@ -31,7 +31,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data_perf", "dojo/domReady!"], 
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/perf", "dojo/domReady!"], 
 				function(List, Grid, Selection, Keyboard, declare, testPerfStore){
 					var columns = [
 						{ name: 'Column 0', field: 'id', width: '10%' },
diff --git a/test/test_performance_dojox_datagrid.html b/test/performance_dojox_datagrid.html
similarity index 98%
rename from test/test_performance_dojox_datagrid.html
rename to test/performance_dojox_datagrid.html
index c36c63ed4..8e88afda2 100644
--- a/test/test_performance_dojox_datagrid.html
+++ b/test/performance_dojox_datagrid.html
@@ -29,7 +29,7 @@
 		data-dojo-config="async: true"></script>
 
 	<script type="text/javascript">
-	require(["dojox/grid/DataGrid", "dojo/data/ObjectStore", "dgrid/test/data_perf", "dojo/domReady!"],
+	require(["dojox/grid/DataGrid", "dojo/data/ObjectStore", "dgrid/test/data/perf", "dojo/domReady!"],
 		function(DataGrid, ObjectStore, testPerfStore){
 			var layout = [
 					{ name: 'id', field: 'id', width: '10%' },
diff --git a/test/test_performance_widgets.html b/test/performance_widgets.html
similarity index 97%
rename from test/test_performance_widgets.html
rename to test/performance_widgets.html
index 441683f6e..b783f6250 100644
--- a/test/test_performance_widgets.html
+++ b/test/performance_widgets.html
@@ -30,7 +30,7 @@
 		<script src="../../dojo/dojo.js" data-dojo-config="async: true"></script>
 		<script>
 			var countWidgets; // function, defined within require callback
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/TextBox", "dijit/registry", "dojo/_base/declare", "dgrid/test/data_perf", "dojo/domReady!"], 
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor", "dijit/form/TextBox", "dijit/registry", "dojo/_base/declare", "dgrid/test/data/perf", "dojo/domReady!"], 
 				function(List, Grid, Selection, Keyboard, Editor, TextBox, registry, declare, testPerfStore){
 					var
 						TB = declare(TextBox, {
diff --git a/test/test_selection.html b/test/selection.html
similarity index 98%
rename from test/test_selection.html
rename to test/selection.html
index e9cf73a95..0ae0d8cda 100644
--- a/test/test_selection.html
+++ b/test/selection.html
@@ -21,7 +21,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dojo/_base/window", "dgrid/OnDemandGrid", "dgrid/Editor","dgrid/Selection", "dgrid/CellSelection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dojo/_base/window", "dgrid/OnDemandGrid", "dgrid/Editor","dgrid/Selection", "dgrid/CellSelection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, win, Grid, Editor, Selection, CellSelection, Keyboard, declare, testStore){
 					var columns = {
 							col1: 'Column 1',
diff --git a/test/test_selectors.html b/test/selectors.html
similarity index 98%
rename from test/test_selectors.html
rename to test/selectors.html
index fd3a1b908..e4f24be80 100644
--- a/test/test_selectors.html
+++ b/test/selectors.html
@@ -24,7 +24,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dojo/_base/window", "dgrid/OnDemandGrid", "dgrid/Selector", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dojo/_base/window", "dgrid/OnDemandGrid", "dgrid/Selector", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, win, Grid, Selector, Selection, Keyboard, declare, testStore){
 					var columns = { // you can declare columns as an object hash (key translates to field)
 							col1: Selector({ type: "checkbox" }),
diff --git a/test/test_simple_grid.html b/test/simple_grid.html
similarity index 100%
rename from test/test_simple_grid.html
rename to test/simple_grid.html
diff --git a/test/test_skin.html b/test/skin.html
similarity index 97%
rename from test/test_skin.html
rename to test/skin.html
index dd284fb27..154f572df 100644
--- a/test/test_skin.html
+++ b/test/skin.html
@@ -53,7 +53,7 @@ <h2>Test more skins!</h2>
 				// then add the rest of the dependencies for the test...
 				deps = deps.concat("dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree",
 					"dgrid/Selection", "dgrid/Keyboard", "dgrid/Editor",
-					"dojo/_base/declare", "dojo/dom-construct", "dgrid/test/data", "dojo/domReady!");
+					"dojo/_base/declare", "dojo/dom-construct", "dgrid/test/data/base", "dojo/domReady!");
 				
 				require(deps, 
 				function(css1, css2, List, Grid, Tree, Selection, Keyboard, Editor, declare, domConstruct, testStore){
@@ -79,7 +79,7 @@ <h2>Test more skins!</h2>
 					
 					// add links to test all skins, w/ dgrid.css loaded first/last
 					for(i = 0; i < l; i++){
-						href = "test_skin.html?skin=" + skins[i];
+						href = "skin.html?skin=" + skins[i];
 						slhtml.push('<a href="' + href + '">' + skins[i] + '</a>');
 						sfhtml.push('<a href="' + href + '&skinFirst=true">' + skins[i] + '</a>');
 					}
diff --git a/test/test_sparse.html b/test/sparse.html
similarity index 100%
rename from test/test_sparse.html
rename to test/sparse.html
diff --git a/test/test_treegrid.html b/test/treegrid.html
similarity index 98%
rename from test/test_treegrid.html
rename to test/treegrid.html
index 35bfe4446..43b5e55ff 100644
--- a/test/test_treegrid.html
+++ b/test/treegrid.html
@@ -26,7 +26,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dojo/on", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Editor", "dgrid/Keyboard", "dgrid/Selection", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dgrid/OnDemandGrid","dgrid/Tree","dgrid/Editor", "dgrid/Keyboard", "dgrid/Selection", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, Grid, Tree, Editor, Keyboard, Selection, declare, testStore){
 					var columns = [
 						Editor({label: ' ', field: 'bool', sortable: false}, "checkbox"),
diff --git a/test/test_tundra_custom.html b/test/tundra_custom.html
similarity index 95%
rename from test/test_tundra_custom.html
rename to test/tundra_custom.html
index b7268b2b9..2b1f4b483 100644
--- a/test/test_tundra_custom.html
+++ b/test/tundra_custom.html
@@ -42,7 +42,7 @@
 		<script type="text/javascript" src="../../dojo/dojo.js" 
 			data-dojo-config="async: true"></script>
 		<script type="text/javascript">
-			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dgrid/List", "dgrid/OnDemandGrid","dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(List, Grid, Selection, Keyboard, declare){
 					var columns = [
 						{label: 'Column 1', field: 'col1'},
diff --git a/test/test_widths.html b/test/widths.html
similarity index 97%
rename from test/test_widths.html
rename to test/widths.html
index b402b4fed..2abe41154 100644
--- a/test/test_widths.html
+++ b/test/widths.html
@@ -56,7 +56,7 @@
 			function toggleHeader(grid){
 				grid.setShowHeader(!grid.showHeader);
 			}
-			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/_base/array", "dgrid/test/data", "dojo/domReady!"], 
+			require(["dojo/on", "dgrid/List", "dgrid/OnDemandGrid", "dgrid/Tree", "dgrid/Editor", "dgrid/Selection", "dgrid/Keyboard", "dojo/_base/declare", "dojo/_base/array", "dgrid/test/data/base", "dojo/domReady!"], 
 				function(on, List, Grid, Tree, Editor, Selection, Keyboard, declare, arrayUtil, testStore){
 					var columns = { // you can declare columns as an object hash (key translates to field)
 							col1: Editor({label: 'Column 1 column 1 column 1'}, "text", "dblclick"),