Adapting tests.

Author: constantinius

test.eowcs.html

@@ -4,8 +4,7 @@
     <script type="text/javascript" src="http://code.jquery.com/jquery-latest.js"></script>
     <script type="text/javascript" src="http://www.rfk.id.au/static/scratch/jquery.xmlns.js"></script>
     <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.12.0.js"></script>
-    <script type="text/javascript" src="./libcoverage.wcs.js"></script>
-    <script type="text/javascript" src="./libcoverage.eowcs.js"></script>
+    <script type="text/javascript" src="./build/libcoverage.js"></script>
 
     <script>
     $(document).ready(function(){

test.html

@@ -5,7 +5,7 @@
     <!--<script type="text/javascript" src="http://www.rfk.id.au/static/scratch/jquery.xmlns.js"></script>-->
     <!--<script type="text/javascript" src="http://code.jquery.com/qunit/git/qunit.js"></script>-->
     <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.20.0.js"></script>
-    <script type="text/javascript" src="./libcoverage.wcs.js"></script>
+    <script type="text/javascript" src="./build/libcoverage.js"></script>
 
     <script>
     $(document).ready(function(){
@@ -56,22 +56,22 @@
     var url = wcsk.getCoverageURL(baseUrl, "id1", {
         bbox: [1, 2, 3, 4]
     });
-    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&subset=x,http://www.opengis.net/def/crs/EPSG/0/4326(1,3)&subset=y,http://www.opengis.net/def/crs/EPSG/0/4326(2,4)");
+    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&subset=x(1,3)&subset=y(2,4)");
 });
 
 test("GetCoverage subsetX", function() {
     var url = wcsk.getCoverageURL(baseUrl, "id1", {
         subsetX: [1, 3],
         subsetCRS: "http://www.opengis.net/def/crs/EPSG/0/3857"
     });
-    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&subset=x,http://www.opengis.net/def/crs/EPSG/0/3857(1,3)");
+    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&subset=x(1,3)&subsettingCrs=http://www.opengis.net/def/crs/EPSG/0/3857");
 });
 
 test("GetCoverage size", function() {
     var url = wcsk.getCoverageURL(baseUrl, "id1", {
         size: [100, 100]
     });
-    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&size=x(100)&size=y(100)");
+    equal(url, "http://www.example.com/?service=wcs&version=2.0.0&request=getcoverage&coverageid=id1&scalesize=x(100),y(100)");
 });
 
 // TODO: more GetCov tests
@@ -260,25 +260,16 @@
 });
 
 test("ExceptionReport", function() {
-    // save old config option
-    var originalOption = wcsp.options.throwOnException;
-
-    wcsp.options.throwOnException = false;
-
-    var obj = wcsp.parse($("#exceptionReport").text());
+    var obj = wcsp.parse($("#exceptionReport").text(), {throwOnException: false});
     deepEqual(obj, {
         code: "InvalidParameterValue",
         locator: "request",
         text: "Invalid parameter 'Foo'."
     });
 
-    wcsp.options.throwOnException = true;
     raises(function() {
-        wcsp.parse($("#exceptionReport").text());
+        wcsp.parse($("#exceptionReport").text(), {throwOnException: true});
     }, "Invalid parameter 'Foo'.");
-
-    // reset option
-    wcsp.options.throwOnException = originalOption;
 });
 
     });