From 9001fe9a5e86c77d002432059d0c4bc0da88a473 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 13 May 2013 10:50:43 -0700
Subject: [PATCH] Generalized format test and added DZI XML

---
 test/data/testpattern.xml         |  1 +
 test/{dzi-jsonp.js => formats.js} | 41 ++++++++++++++++++++-----------
 test/test.html                    |  2 +-
 3 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 test/data/testpattern.xml
 rename test/{dzi-jsonp.js => formats.js} (54%)

diff --git a/test/data/testpattern.xml b/test/data/testpattern.xml
new file mode 100644
index 00000000..6d93c763
--- /dev/null
+++ b/test/data/testpattern.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><Image TileSize="254" Overlap="1" Format="jpg" xmlns="http://schemas.microsoft.com/deepzoom/2008"><Size Width="1000" Height="1000"/></Image>
\ No newline at end of file
diff --git a/test/dzi-jsonp.js b/test/formats.js
similarity index 54%
rename from test/dzi-jsonp.js
rename to test/formats.js
index 08b7da22..23ef1cc4 100644
--- a/test/dzi-jsonp.js
+++ b/test/formats.js
@@ -1,18 +1,21 @@
 (function() {
 
-    module('DZI JSONp');
+    // This module tests whether our various file formats can be opened.
+    // TODO: Add more file formats (with corresponding test data).
+
+    module('Formats');
 
     var viewer = null;
 
     // ----------
-    asyncTest('Open', function() {
+    var testOpen = function(name) {
         $(document).ready(function() {
             var timeWatcher = Util.timeWatcher();
 
             viewer = OpenSeadragon({
                 id:            'example',
                 prefixUrl:     '/build/openseadragon/images/',
-                tileSources:   '/test/data/testpattern.js'
+                tileSources:   '/test/data/' + name
             });
 
             ok(viewer, 'Viewer exists');
@@ -27,24 +30,34 @@
             var tileDrawnHandler = function(eventSender, eventData) {
                 viewer.removeHandler('tile-drawn', tileDrawnHandler);
                 ok(true, 'A tile has been drawn');
+                viewer.addHandler('close', closeHandler);
+                viewer.close();
+            };
+
+            var closeHandler = function() {
+                viewer.removeHandler('close', closeHandler);
+                $('#example').empty();
+                ok(true, 'Close event was sent');
                 timeWatcher.done();
             };
 
             viewer.addHandler('open', openHandler);
         });
+    };
+
+    // ----------
+    asyncTest('DZI', function() {
+        testOpen('testpattern.dzi');
     });
 
     // ----------
-    asyncTest('Close', function() {
-        var closeHandler = function() {
-            viewer.removeHandler('close', closeHandler);
-            $('#example').empty();
-            ok(true, 'Close event was sent');
-            start();
-        };
-
-        viewer.addHandler('close', closeHandler);
-        viewer.close();
+    asyncTest('DZI JSONp', function() {
+        testOpen('testpattern.js');
     });
-  
+
+    // ----------
+    asyncTest('DZI XML', function() {
+        testOpen('testpattern.xml');
+    });
+
 })();
diff --git a/test/test.html b/test/test.html
index 92344f56..e34f8bd0 100644
--- a/test/test.html
+++ b/test/test.html
@@ -17,6 +17,6 @@
     <script src="/test/util.js"></script>
     <script src="/test/basic.js"></script>
     <script src="/test/strings.js"></script>
-    <script src="/test/dzi-jsonp.js"></script>
+    <script src="/test/formats.js"></script>
 </body>
 </html>