From 250bb2f2be692486bbe28516beb474edbd6ca665 Mon Sep 17 00:00:00 2001
From: Peter Robins <github@peterrobins.co.uk>
Date: Fri, 24 Jun 2016 09:25:29 +0000
Subject: [PATCH] Remove goog.Uri from tests

---
 test/index.html                               |  2 +-
 .../ol/source/imagearcgisrestsource.test.js   | 43 ++++-----
 test/spec/ol/source/imagewmssource.test.js    | 85 +++++++++--------
 .../ol/source/tilearcgisrestsource.test.js    | 57 ++++++-----
 test/spec/ol/source/tilewmssource.test.js     | 94 +++++++++----------
 5 files changed, 136 insertions(+), 145 deletions(-)

diff --git a/test/index.html b/test/index.html
index 0426864072..4f0da62ad0 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,7 +15,7 @@
   <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
   <script type="text/javascript" src="../node_modules/proj4/dist/proj4.js"></script>
   <script type="text/javascript" src="test-extensions.js"></script>
-  <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList"></script>
+  <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
   <script>
     if (typeof initMochaPhantomJS === 'function') {
       initMochaPhantomJS()
diff --git a/test/spec/ol/source/imagearcgisrestsource.test.js b/test/spec/ol/source/imagearcgisrestsource.test.js
index 7977815346..64ec8b3ebc 100644
--- a/test/spec/ol/source/imagearcgisrestsource.test.js
+++ b/test/spec/ol/source/imagearcgisrestsource.test.js
@@ -20,11 +20,11 @@ describe('ol.source.ImageArcGISRest', function() {
     it('returns a image with the expected URL', function() {
       var source = new ol.source.ImageArcGISRest(options);
       var image = source.getImage([3, 2, -7, 1], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/MapServer/export');
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/MapServer/export');
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('5.5,2.25,-9.5,0.75');
       expect(queryData.get('FORMAT')).to.be('PNG32');
       expect(queryData.get('IMAGESR')).to.be('3857');
@@ -36,8 +36,8 @@ describe('ol.source.ImageArcGISRest', function() {
     it('returns a non floating point DPI value', function() {
       var source = new ol.source.ImageArcGISRest(options);
       var image = source.getImage([3, 2, -7, 1.12], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('DPI')).to.be('90');
     });
 
@@ -45,11 +45,11 @@ describe('ol.source.ImageArcGISRest', function() {
       options.url = 'http://example.com/ImageServer';
       var source = new ol.source.ImageArcGISRest(options);
       var image = source.getImage([3, 2, -7, 1], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/ImageServer/exportImage');
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/ImageServer/exportImage');
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('5.5,2.25,-9.5,0.75');
       expect(queryData.get('FORMAT')).to.be('PNG32');
       expect(queryData.get('IMAGESR')).to.be('3857');
@@ -62,8 +62,8 @@ describe('ol.source.ImageArcGISRest', function() {
       options.params.TRANSPARENT = false;
       var source = new ol.source.ImageArcGISRest(options);
       var image = source.getImage([3, 2, -3, 1], resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT')).to.be('png');
       expect(queryData.get('TRANSPARENT')).to.be('false');
     });
@@ -72,8 +72,8 @@ describe('ol.source.ImageArcGISRest', function() {
       options.params.LAYERS = 'show:1,3,4';
       var source = new ol.source.ImageArcGISRest(options);
       var image = source.getImage([3, 2, -3, 1], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('LAYERS')).to.be('show:1,3,4');
     });
   });
@@ -85,9 +85,8 @@ describe('ol.source.ImageArcGISRest', function() {
       source.updateParams({'TEST': 'value'});
 
       var image = source.getImage([3, 2, -7, 1], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
-
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('TEST')).to.be('value');
     });
 
@@ -98,9 +97,8 @@ describe('ol.source.ImageArcGISRest', function() {
       source.updateParams({'TEST':'newValue'});
 
       var image = source.getImage([3, 2, -7, 1], resolution, pixelRatio, proj3857);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
-
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('TEST')).to.be('newValue');
     });
 
@@ -183,6 +181,5 @@ describe('ol.source.ImageArcGISRest', function() {
 
 });
 
-goog.require('goog.Uri');
 goog.require('ol.source.ImageArcGISRest');
 goog.require('ol.proj');
diff --git a/test/spec/ol/source/imagewmssource.test.js b/test/spec/ol/source/imagewmssource.test.js
index 8640c0b2e8..d9e4420f3c 100644
--- a/test/spec/ol/source/imagewmssource.test.js
+++ b/test/spec/ol/source/imagewmssource.test.js
@@ -23,11 +23,11 @@ describe('ol.source.ImageWMS', function() {
     it('returns the expected image URL', function() {
       var source = new ol.source.ImageWMS(options);
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('20,10,40,30');
       expect(queryData.get('CRS')).to.be('EPSG:4326');
       expect(queryData.get('FORMAT')).to.be('image/png');
@@ -35,21 +35,21 @@ describe('ol.source.ImageWMS', function() {
       expect(queryData.get('LAYERS')).to.be('layer');
       expect(queryData.get('REQUEST')).to.be('GetMap');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('200');
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
 
     it('sets the SRS query value instead of CRS if version < 1.3', function() {
       options.params.VERSION = '1.2';
       var source = new ol.source.ImageWMS(options);
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
-      expect(queryData.get('CRS')).to.be(undefined);
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
+      expect(queryData.get('CRS')).to.be(null);
       expect(queryData.get('SRS')).to.be('EPSG:4326');
     });
 
@@ -58,8 +58,8 @@ describe('ol.source.ImageWMS', function() {
       options.params.TRANSPARENT = false;
       var source = new ol.source.ImageWMS(options);
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT')).to.be('image/jpeg');
       expect(queryData.get('TRANSPARENT')).to.be('false');
     });
@@ -68,8 +68,8 @@ describe('ol.source.ImageWMS', function() {
       options.params.STYLES = 'foo';
       var source = new ol.source.ImageWMS(options);
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('STYLES')).to.be('foo');
     });
 
@@ -77,8 +77,8 @@ describe('ol.source.ImageWMS', function() {
       var source = new ol.source.ImageWMS(options);
       projection = ol.proj.get('CRS:84');
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('10,20,30,40');
     });
 
@@ -87,8 +87,8 @@ describe('ol.source.ImageWMS', function() {
       var source = new ol.source.ImageWMS(options);
       var image =
           source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('10,20,30,40');
     });
 
@@ -97,8 +97,8 @@ describe('ol.source.ImageWMS', function() {
       var source = new ol.source.ImageWMS(options);
       pixelRatio = 2;
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('MAP_RESOLUTION')).to.be('180');
     });
 
@@ -107,8 +107,8 @@ describe('ol.source.ImageWMS', function() {
       var source = new ol.source.ImageWMS(options);
       pixelRatio = 2;
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT_OPTIONS')).to.be('dpi:180');
     });
 
@@ -118,8 +118,8 @@ describe('ol.source.ImageWMS', function() {
       options.params.FORMAT_OPTIONS = 'param1:value1';
       pixelRatio = 2;
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT_OPTIONS')).to.be('param1:value1;dpi:180');
     });
 
@@ -130,8 +130,8 @@ describe('ol.source.ImageWMS', function() {
          pixelRatio = 1.325;
          var image =
              source.getImage(extent, resolution, pixelRatio, projection);
-         var uri = new goog.Uri(image.src_);
-         var queryData = uri.getQueryData();
+         var uri = new URL(image.src_);
+         var queryData = uri.searchParams;
          expect(queryData.get('FORMAT_OPTIONS')).to.be('dpi:119');
        });
 
@@ -140,8 +140,8 @@ describe('ol.source.ImageWMS', function() {
       var source = new ol.source.ImageWMS(options);
       pixelRatio = 2;
       var image = source.getImage(extent, resolution, pixelRatio, projection);
-      var uri = new goog.Uri(image.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(image.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('DPI')).to.be('180');
     });
 
@@ -190,11 +190,11 @@ describe('ol.source.ImageWMS', function() {
       var url = source.getGetFeatureInfoUrl(
           [20, 30], resolution, projection,
           {INFO_FORMAT: 'text/plain'});
-      var uri = new goog.Uri(url);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('24.95,14.95,35.05,25.05');
       expect(queryData.get('CRS')).to.be('EPSG:4326');
       expect(queryData.get('FORMAT')).to.be('image/png');
@@ -205,12 +205,12 @@ describe('ol.source.ImageWMS', function() {
       expect(queryData.get('QUERY_LAYERS')).to.be('layer');
       expect(queryData.get('REQUEST')).to.be('GetFeatureInfo');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('101');
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
 
     it('sets the QUERY_LAYERS param as expected', function() {
@@ -218,11 +218,11 @@ describe('ol.source.ImageWMS', function() {
       var url = source.getGetFeatureInfoUrl(
           [20, 30], resolution, projection,
           {INFO_FORMAT: 'text/plain', QUERY_LAYERS: 'foo,bar'});
-      var uri = new goog.Uri(url);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('24.95,14.95,35.05,25.05');
       expect(queryData.get('CRS')).to.be('EPSG:4326');
       expect(queryData.get('FORMAT')).to.be('image/png');
@@ -233,19 +233,18 @@ describe('ol.source.ImageWMS', function() {
       expect(queryData.get('QUERY_LAYERS')).to.be('foo,bar');
       expect(queryData.get('REQUEST')).to.be('GetFeatureInfo');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('101');
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
   });
 
 });
 
 
-goog.require('goog.Uri');
 goog.require('ol.source.ImageWMS');
 goog.require('ol.proj');
 goog.require('ol.source.wms.ServerType');
diff --git a/test/spec/ol/source/tilearcgisrestsource.test.js b/test/spec/ol/source/tilearcgisrestsource.test.js
index c76b210a5d..c709288af9 100644
--- a/test/spec/ol/source/tilearcgisrestsource.test.js
+++ b/test/spec/ol/source/tilearcgisrestsource.test.js
@@ -17,11 +17,11 @@ describe('ol.source.TileArcGISRest', function() {
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
       expect(tile).to.be.an(ol.ImageTile);
-      var uri = new goog.Uri(tile.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/MapServer/export');
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/MapServer/export');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -38,8 +38,8 @@ describe('ol.source.TileArcGISRest', function() {
     it('returns a non floating point DPI value', function() {
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -7, 1.12, ol.proj.get('EPSG:3857'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('DPI')).to.be('101');
     });
 
@@ -47,8 +47,8 @@ describe('ol.source.TileArcGISRest', function() {
       options.params.DPI = 96;
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -7, 1.12, ol.proj.get('EPSG:3857'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('DPI')).to.be('108');
       delete options.params.DPI;
     });
@@ -61,11 +61,11 @@ describe('ol.source.TileArcGISRest', function() {
 
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
       expect(tile).to.be.an(ol.ImageTile);
-      var uri = new goog.Uri(tile.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.match(/test[12]\.com/);
-      expect(uri.getPath()).to.be('/MapServer/export');
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.match(/test[12]\.com/);
+      expect(uri.pathname).to.be('/MapServer/export');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -84,11 +84,11 @@ describe('ol.source.TileArcGISRest', function() {
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
       expect(tile).to.be.an(ol.ImageTile);
-      var uri = new goog.Uri(tile.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/ImageServer/exportImage');
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/ImageServer/exportImage');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -106,8 +106,8 @@ describe('ol.source.TileArcGISRest', function() {
       options.params.TRANSPARENT = false;
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT')).to.be('png');
       expect(queryData.get('TRANSPARENT')).to.be('false');
     });
@@ -116,8 +116,8 @@ describe('ol.source.TileArcGISRest', function() {
       options.params.LAYERS = 'show:1,3,4';
       var source = new ol.source.TileArcGISRest(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('LAYERS')).to.be('show:1,3,4');
     });
   });
@@ -129,9 +129,8 @@ describe('ol.source.TileArcGISRest', function() {
       source.updateParams({'TEST': 'value'});
 
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
-
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('TEST')).to.be('value');
     });
 
@@ -142,9 +141,8 @@ describe('ol.source.TileArcGISRest', function() {
       source.updateParams({'TEST': 'newValue'});
 
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
-
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('TEST')).to.be('newValue');
     });
 
@@ -263,7 +261,6 @@ describe('ol.source.TileArcGISRest', function() {
 
 });
 
-goog.require('goog.Uri');
 goog.require('ol.ImageTile');
 goog.require('ol.source.TileArcGISRest');
 goog.require('ol.proj');
diff --git a/test/spec/ol/source/tilewmssource.test.js b/test/spec/ol/source/tilewmssource.test.js
index f79f207f79..6970099b1d 100644
--- a/test/spec/ol/source/tilewmssource.test.js
+++ b/test/spec/ol/source/tilewmssource.test.js
@@ -29,11 +29,11 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
       expect(tile).to.be.an(ol.ImageTile);
-      var uri = new goog.Uri(tile.src_);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -45,12 +45,12 @@ describe('ol.source.TileWMS', function() {
       expect(queryData.get('LAYERS')).to.be('layer');
       expect(queryData.get('REQUEST')).to.be('GetMap');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('256');
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
 
     it('returns a larger tile when a gutter is specified', function() {
@@ -58,8 +58,8 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -7, 1, ol.proj.get('EPSG:3857'));
       expect(tile).to.be.an(ol.ImageTile);
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',');
       var expected = [-10331840.239250705, -15341217.324948018,
         -4696291.017841229, -9705668.103538541];
@@ -74,9 +74,9 @@ describe('ol.source.TileWMS', function() {
       options.params.VERSION = '1.2';
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
-      expect(queryData.get('CRS')).to.be(undefined);
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
+      expect(queryData.get('CRS')).to.be(null);
       expect(queryData.get('SRS')).to.be('EPSG:4326');
     });
 
@@ -85,8 +85,8 @@ describe('ol.source.TileWMS', function() {
       options.params.TRANSPARENT = false;
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT')).to.be('image/jpeg');
       expect(queryData.get('TRANSPARENT')).to.be('false');
     });
@@ -95,16 +95,16 @@ describe('ol.source.TileWMS', function() {
       options.params.STYLES = 'foo';
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('STYLES')).to.be('foo');
     });
 
     it('changes the BBOX order for EN axis orientations', function() {
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('-45,-90,0,-45');
     });
 
@@ -112,8 +112,8 @@ describe('ol.source.TileWMS', function() {
       options.params.VERSION = '1.1.0';
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 1, ol.proj.get('CRS:84'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('-90,-45,-45,0');
     });
 
@@ -121,8 +121,8 @@ describe('ol.source.TileWMS', function() {
       options.serverType = ol.source.wms.ServerType.GEOSERVER;
       var source = new ol.source.TileWMS(options);
       var tile = source.getTile(3, 2, -3, 2, ol.proj.get('CRS:84'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT_OPTIONS')).to.be('dpi:180');
     });
 
@@ -131,8 +131,8 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       options.params.FORMAT_OPTIONS = 'param1:value1';
       var tile = source.getTile(3, 2, -3, 2, ol.proj.get('CRS:84'));
-      var uri = new goog.Uri(tile.src_);
-      var queryData = uri.getQueryData();
+      var uri = new URL(tile.src_);
+      var queryData = uri.searchParams;
       expect(queryData.get('FORMAT_OPTIONS')).to.be('param1:value1;dpi:180');
     });
 
@@ -141,8 +141,8 @@ describe('ol.source.TileWMS', function() {
          options.serverType = ol.source.wms.ServerType.GEOSERVER;
          var source = new ol.source.TileWMS(options);
          var tile = source.getTile(3, 2, -3, 1.325, ol.proj.get('CRS:84'));
-         var uri = new goog.Uri(tile.src_);
-         var queryData = uri.getQueryData();
+         var uri = new URL(tile.src_);
+         var queryData = uri.searchParams;
          expect(queryData.get('FORMAT_OPTIONS')).to.be('dpi:119');
        });
 
@@ -155,8 +155,8 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       var tileCoord = [3, 2, -3];
       var url = source.tileUrlFunction(tileCoord, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(url);
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('-45,-90,0,-45');
     });
 
@@ -165,8 +165,8 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       var tileCoord = [3, 3, -3];
       var url = source.tileUrlFunction(tileCoord, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(url);
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      var queryData = uri.searchParams;
       expect(queryData.get('BBOX')).to.be('-45,-45,0,0');
     });
 
@@ -179,8 +179,8 @@ describe('ol.source.TileWMS', function() {
       var source = new ol.source.TileWMS(options);
       var tileCoord = [3, 3, -3];
       var url = source.tileUrlFunction(tileCoord, 1, ol.proj.get('EPSG:4326'));
-      var uri = new goog.Uri(url);
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      var queryData = uri.searchParams;
       expect(queryData.get('WIDTH')).to.be('640');
       expect(queryData.get('HEIGHT')).to.be('320');
     });
@@ -196,11 +196,11 @@ describe('ol.source.TileWMS', function() {
           [-7000000, -12000000],
           19567.87924100512, ol.proj.get('EPSG:3857'),
           {INFO_FORMAT: 'text/plain'});
-      var uri = new goog.Uri(url);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -215,12 +215,12 @@ describe('ol.source.TileWMS', function() {
       expect(queryData.get('QUERY_LAYERS')).to.be('layer');
       expect(queryData.get('REQUEST')).to.be('GetFeatureInfo');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('256');
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
 
     it('sets the QUERY_LAYERS param as expected', function() {
@@ -230,11 +230,11 @@ describe('ol.source.TileWMS', function() {
           [-7000000, -12000000],
           19567.87924100512, ol.proj.get('EPSG:3857'),
           {INFO_FORMAT: 'text/plain', QUERY_LAYERS: 'foo,bar'});
-      var uri = new goog.Uri(url);
-      expect(uri.getScheme()).to.be('http');
-      expect(uri.getDomain()).to.be('example.com');
-      expect(uri.getPath()).to.be('/wms');
-      var queryData = uri.getQueryData();
+      var uri = new URL(url);
+      expect(uri.protocol).to.be('http:');
+      expect(uri.hostname).to.be('example.com');
+      expect(uri.pathname).to.be('/wms');
+      var queryData = uri.searchParams;
       var bbox = queryData.get('BBOX').split(',').map(parseFloat);
       expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9);
       expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9);
@@ -249,13 +249,12 @@ describe('ol.source.TileWMS', function() {
       expect(queryData.get('QUERY_LAYERS')).to.be('foo,bar');
       expect(queryData.get('REQUEST')).to.be('GetFeatureInfo');
       expect(queryData.get('SERVICE')).to.be('WMS');
-      expect(queryData.get('SRS')).to.be(undefined);
+      expect(queryData.get('SRS')).to.be(null);
       expect(queryData.get('STYLES')).to.be('');
       expect(queryData.get('TRANSPARENT')).to.be('true');
       expect(queryData.get('VERSION')).to.be('1.3.0');
       expect(queryData.get('WIDTH')).to.be('256');
-      expect(uri.getFragment()).to.be.empty();
-      expect(uri.getFragment()).to.be.empty();
+      expect(uri.hash.replace('#', '')).to.be.empty();
     });
   });
 
@@ -269,7 +268,6 @@ describe('ol.source.TileWMS', function() {
 });
 
 
-goog.require('goog.Uri');
 goog.require('ol.ImageTile');
 goog.require('ol.source.TileWMS');
 goog.require('ol.source.wms.ServerType');