diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 4bb8bfba..f72dbaeb 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -36,7 +36,6 @@ test: - test/formats/kml/features/KmlPhotoOverlay.test.js - test/formats/kml/features/KmlPlacemark.test.js - test/formats/kml/geom/KmlPoint.test.js - - test/formats/kml/geom/KmlPolygon.test.js - test/formats/kml/styles/KmlPolyStyle.test.js - test/formats/kml/KmlRegion.test.js - test/formats/kml/features/KmlScreenOverlay.test.js @@ -55,9 +54,12 @@ test: serve: - src/error/AbstractError.js + - src/shapes/AbstractMesh.js - src/shapes/AbstractShape.js - src/util/AbsentResourceList.js - src/geom/Angle.js + - src/shapes/Annotation.js + - src/shapes/AnnotationAttributes.js - src/error/ArgumentError.js - src/shaders/BasicProgram.js - src/shaders/BasicTextureProgram.js @@ -71,7 +73,6 @@ serve: - src/layer/BMNGLandsatLayer.js - src/layer/BMNGLayer.js - src/layer/BMNGOneImageLayer.js - - src/layer/BMNGRestLayer.js - src/geom/BoundingBox.js - src/util/ByteBuffer.js - test/CatchTest.js @@ -83,6 +84,7 @@ serve: - src/formats/shapefile/DBaseField.js - src/formats/shapefile/DBaseFile.js - src/formats/shapefile/DBaseRecord.js + - src/layer/DigitalGlobeTiledImageLayer.js - src/gesture/DragRecognizer.js - src/render/DrawContext.js - src/globe/EarthElevationModel.js @@ -90,6 +92,8 @@ serve: - src/globe/ElevationImage.js - src/globe/ElevationModel.js - src/globe/ElevationTile.js + - src/util/es6-promise.js + - src/util/extend.js - src/util/Font.js - src/util/FrameStatistics.js - src/layer/FrameStatisticsLayer.js @@ -100,6 +104,19 @@ serve: - src/shapes/GeographicMesh.js - src/projections/GeographicProjection.js - src/shapes/GeographicText.js + - src/formats/geojson/GeoJSONConstants.js + - src/formats/geojson/GeoJSONCRS.js + - src/formats/geojson/GeoJSONFeature.js + - src/formats/geojson/GeoJSONFeatureCollection.js + - src/formats/geojson/GeoJSONGeometry.js + - src/formats/geojson/GeoJSONGeometryCollection.js + - src/formats/geojson/GeoJSONGeometryLineString.js + - src/formats/geojson/GeoJSONGeometryMultiLineString.js + - src/formats/geojson/GeoJSONGeometryMultiPolygon.js + - src/formats/geojson/GeoJSONGeometryMultiPoint.js + - src/formats/geojson/GeoJSONGeometryPoint.js + - src/formats/geojson/GeoJSONGeometryPolygon.js + - src/formats/geojson/GeoJSONParser.js - src/gesture/GestureRecognizer.js - src/globe/Globe.js - src/globe/Globe2D.js @@ -111,6 +128,7 @@ serve: - src/formats/kml/util/ImagePyramid.js - src/util/ImageSource.js - src/render/ImageTile.js + - src/util/Insets.js - src/formats/kml/util/ItemIcon.js - src/util/jszip.js - src/formats/kml/KmlAbstractView.js @@ -122,6 +140,7 @@ serve: - src/formats/kml/KmlElements.js - src/formats/kml/features/KmlFeature.js - src/formats/kml/KmlFile.js + - src/formats/kml/KmlFileCache.js - src/formats/kml/features/KmlFolder.js - src/formats/kml/geom/KmlGeometry.js - src/formats/kml/features/KmlGroundOverlay.js @@ -182,9 +201,15 @@ serve: - src/error/NotYetImplementedError.js - src/util/Offset.js - src/layer/OpenStreetMapImageLayer.js + - src/ogc/OwsConstraint.js + - src/ogc/OwsLanguageString.js + - src/ogc/OwsOperationsMetadata.js + - src/ogc/OwsServiceIdentification.js + - src/ogc/OwsServiceProvider.js - src/formats/kml/util/Pair.js - src/gesture/PanRecognizer.js - src/shapes/Path.js + - src/util/PeriodicTimeSequence.js - src/pick/PickedObject.js - src/pick/PickedObjectList.js - src/gesture/PinchRecognizer.js @@ -194,14 +219,19 @@ serve: - src/shapes/Polygon.js - src/geom/Position.js - src/formats/shapefile/PrjFile.js + - src/util/proj4-src.js - src/projections/ProjectionEquirectangular.js + - src/projections/ProjectionGnomonic.js - src/projections/ProjectionMercator.js - src/projections/ProjectionPolarEquidistant.js - src/projections/ProjectionUPS.js + - src/projections/ProjectionWgs84.js + - src/util/Promise.js - src/geom/Rectangle.js - src/util/Remote.js - src/render/Renderable.js - src/layer/RenderableLayer.js + - src/layer/RestTiledImageLayer.js - src/gesture/RotationRecognizer.js - src/formats/kml/util/Scale.js - src/formats/kml/util/Schema.js @@ -218,6 +248,7 @@ serve: - src/formats/shapefile/ShapefileRecordPolygon.js - src/formats/shapefile/ShapefileRecordPolyline.js - src/layer/ShowTessellationLayer.js + - src/formats/kml/util/StyleResolver.js - src/shapes/SurfaceImage.js - src/shapes/SurfaceCircle.js - src/shapes/SurfaceEllipse.js @@ -233,6 +264,7 @@ serve: - src/render/SurfaceTileRenderer.js - src/shaders/SurfaceTileRendererProgram.js - src/gesture/TapRecognizer.js + - src/layer/TectonicPlatesLayer.js - src/globe/Terrain.js - src/globe/TerrainTile.js - src/globe/TerrainTileList.js @@ -248,6 +280,7 @@ serve: - src/util/TileFactory.js - src/gesture/TiltRecognizer.js - src/gesture/Touch.js + - src/shapes/TriangleMesh.js - src/error/UnsupportedOperationError.js - src/geom/Vec2.js - src/geom/Vec3.js @@ -256,10 +289,16 @@ serve: - src/ogc/WmsCapabilities.js - src/layer/WmsLayer.js - src/ogc/WmsLayerCapabilities.js + - src/layer/WmsTimeDimensionedLayer.js - src/util/WmsUrlBuilder.js + - src/ogc/WmtsCapabilities.js + - src/layer/WmtsLayer.js + - src/ogc/WmtsLayerCapabilities.js + - src/layer/WmtsLayerTile.js - src/WorldWind.js - src/WorldWindow.js - src/util/WWMath.js + - src/util/WWMessage.js - src/util/WWUtil.js - src/util/XmlDocument.js - src/globe/ZeroElevationModel.js \ No newline at end of file diff --git a/src/formats/kml/geom/KmlLineString.js b/src/formats/kml/geom/KmlLineString.js index 5278cc66..727882d3 100644 --- a/src/formats/kml/geom/KmlLineString.js +++ b/src/formats/kml/geom/KmlLineString.js @@ -188,9 +188,9 @@ define([ if (!toCompare) { return false; } - var positionsEquals = WWUtil.arrayEquals(toCompare.positions, this.kmlPositions); - return positionsEquals && toCompare.extrude == this.kmlExtrude && toCompare.tessellate == this.kmlTessellate && - toCompare.altitudeMode == this.kmlAltitudeMode; + var positionsEquals = WWUtil.arrayEquals(toCompare.kmlPositions, this.kmlPositions); + return positionsEquals && toCompare.kmlExtrude == this.kmlExtrude && toCompare.kmlTessellate == this.kmlTessellate && + toCompare.kmlAltitudeMode == this.kmlAltitudeMode; }; /** diff --git a/src/formats/kml/styles/KmlListStyle.js b/src/formats/kml/styles/KmlListStyle.js index 31970c5e..21372945 100644 --- a/src/formats/kml/styles/KmlListStyle.js +++ b/src/formats/kml/styles/KmlListStyle.js @@ -76,7 +76,7 @@ define([ kmlItemIcon: { get: function () { return this.createChildElement({ - name: ItemIcon.prototype.tagName + name: ItemIcon.prototype.getTagNames() }); } } diff --git a/src/util/WWUtil.js b/src/util/WWUtil.js index d9e8fec1..02b1f991 100644 --- a/src/util/WWUtil.js +++ b/src/util/WWUtil.js @@ -6,10 +6,16 @@ * @version $Id: WWUtil.js 3402 2015-08-14 17:28:09Z tgaskins $ */ define([ - './Date' -], function ( - Date - ) { + '../error/ArgumentError', + '../geom/Line', + '../util/Logger', + '../geom/Rectangle', + '../geom/Vec3'], + function (ArgumentError, + Line, + Logger, + Rectangle, + Vec3) { "use strict"; /** * Provides math constants and functions. diff --git a/test/formats/kml/KmlAbstractView.test.js b/test/formats/kml/KmlAbstractView.test.js index 9fe1bc94..78272711 100644 --- a/test/formats/kml/KmlAbstractView.test.js +++ b/test/formats/kml/KmlAbstractView.test.js @@ -28,7 +28,7 @@ require({ var overlay = new KmlAbstractView( kmlRepresentation.getElementsByTagName("AbstractView")[0]); - assertTrue(overlay.TimePrimitive instanceof KmlTimeSpan); + assertTrue(overlay.kmlTimePrimitive instanceof KmlTimeSpan); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlCamera.test.js b/test/formats/kml/KmlCamera.test.js index 77591fd6..e18372e0 100644 --- a/test/formats/kml/KmlCamera.test.js +++ b/test/formats/kml/KmlCamera.test.js @@ -32,13 +32,13 @@ require({ var camera = new KmlCamera( kmlRepresentation.getElementsByTagName("Camera")[0]); - assertEquals(10, camera.longitude); - assertEquals(9, camera.latitude); - assertEquals(8, camera.altitude); - assertEquals(1, camera.heading); - assertEquals(7, camera.tilt); - assertEquals(6, camera.roll); - assertEquals("clampToGround", camera.altitudeMode); + assertEquals(10, camera.kmlLongitude); + assertEquals(9, camera.kmlLatitude); + assertEquals(8, camera.kmlAltitude); + assertEquals(1, camera.kmlHeading); + assertEquals(7, camera.kmlTilt); + assertEquals(6, camera.kmlRoll); + assertEquals("clampToGround", camera.kmlAltitudeMode); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlFile.test.js b/test/formats/kml/KmlFile.test.js index 410bbf2a..e47c443b 100644 --- a/test/formats/kml/KmlFile.test.js +++ b/test/formats/kml/KmlFile.test.js @@ -11,7 +11,7 @@ require({ KmlFile) { "use strict"; AsyncTestCase("KmlFile", { - "testSimpleKml": CatchTest(function () { + "testSimpleKml": CatchTest(function (queue) { var kmlFileXml = "" + "" + "" + @@ -21,27 +21,41 @@ require({ "" + ""; - var kmlFile = new KmlFile({local: true, document: kmlFileXml}); - assertEquals(1, kmlFile.shapes.length); - }), - - "testLoadingKmlFromRelativeRemote": CatchTest(function (queue) { - var kmlLocation = "/test/test/testFile.kml"; - var kmlFile = null; var loadedFile = null; queue.call('Load the file remotely', function (callbacks) { // callback is called when loaded. - kmlFile = new KmlFile({ - url: kmlLocation, callback: callbacks.add(function (loaded) { - // This means we are at the end. - loadedFile = loaded; - }) + var callback = callbacks.add(function (loaded) { + // This means we are at the end. + loadedFile = loaded; }); + var kmlFile = new KmlFile({local: true, document: kmlFileXml}); + kmlFile.then(callback); }); queue.call('File was loaded.', function () { assertTrue(loadedFile != null); - assertEquals(kmlFile.shapes.length, 1); + assertEquals(loadedFile.shapes.length, 1); + }); + }), + + "testLoadingKmlFromRelativeRemote": CatchTest(function (queue) { + var kmlLocation = "/test/test/testFile.kml"; + var loadedFile = null; + queue.call('Load the file remotely', function (callbacks) { + // callback is called when loaded. + var callback = callbacks.add(function (loaded) { + // This means we are at the end. + loadedFile = loaded; + }); + var kmlFile = new KmlFile({ + url: kmlLocation + }); + kmlFile.then(callback); + }); + + queue.call('File was loaded.', function () { + assertTrue(loadedFile != null); + assertEquals(loadedFile.shapes.length, 1); }); }), diff --git a/test/formats/kml/KmlIcon.test.js b/test/formats/kml/KmlIcon.test.js index 4e052250..d2919520 100644 --- a/test/formats/kml/KmlIcon.test.js +++ b/test/formats/kml/KmlIcon.test.js @@ -37,18 +37,18 @@ require({ var link = new KmlIcon( kmlRepresentation.getElementsByTagName("Icon")[0]); - assertEquals(0, link.x); - assertEquals(0, link.y); - assertEquals(-1, link.w); - assertEquals(-1, link.h); - assertEquals('link', link.href); - assertEquals('onChange', link.refreshMode); - assertEquals(4, link.refreshInterval); - assertEquals('never', link.viewRefreshMode); - assertEquals(4, link.viewRefreshTime); - assertEquals(1, link.viewBoundScale); - assertEquals('BBOX=10,10,10,10', link.viewFormat); - assertEquals('validQuery', link.httpQuery); + assertEquals(0, link.kmlX); + assertEquals(0, link.kmlY); + assertEquals(-1, link.kmlW); + assertEquals(-1, link.kmlH); + assertEquals('link', link.kmlHref); + assertEquals('onChange', link.kmlRefreshMode); + assertEquals(4, link.kmlRefreshInterval); + assertEquals('never', link.kmlViewRefreshMode); + assertEquals(4, link.kmlViewRefreshTime); + assertEquals(1, link.kmlViewBoundScale); + assertEquals('BBOX=10,10,10,10', link.kmlViewFormat); + assertEquals('validQuery', link.kmlHttpQuery); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLatLonAltBox.test.js b/test/formats/kml/KmlLatLonAltBox.test.js index 67a4b3b9..9e04f64b 100644 --- a/test/formats/kml/KmlLatLonAltBox.test.js +++ b/test/formats/kml/KmlLatLonAltBox.test.js @@ -31,12 +31,12 @@ require({ var lod = new KmlLatLonAltBox( kmlRepresentation.getElementsByTagName("LatLonAltBox")[0]); - assertEquals(48.25475939255556, lod.north); - assertEquals(48.25207367852141, lod.south); - assertEquals(-90.86591508839973, lod.east); - assertEquals(-90.8714285289695, lod.west); - assertEquals(10, lod.minAltitude); - assertEquals(20, lod.maxAltitude); + assertEquals(48.25475939255556, lod.kmlNorth); + assertEquals(48.25207367852141, lod.kmlSouth); + assertEquals(-90.86591508839973, lod.kmlEast); + assertEquals(-90.8714285289695, lod.kmlWest); + assertEquals(10, lod.kmlMinAltitude); + assertEquals(20, lod.kmlMaxAltitude); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLatLonBox.test.js b/test/formats/kml/KmlLatLonBox.test.js index eaf297f2..8dd4cf99 100644 --- a/test/formats/kml/KmlLatLonBox.test.js +++ b/test/formats/kml/KmlLatLonBox.test.js @@ -30,11 +30,11 @@ require({ var lod = new KmlLatLonBox( kmlRepresentation.getElementsByTagName("LatLonBox")[0]); - assertEquals(48.25475939255556, lod.north); - assertEquals(48.25207367852141, lod.south); - assertEquals(-90.86591508839973, lod.east); - assertEquals(-90.8714285289695, lod.west); - assertEquals(39.37878630116985, lod.rotation); + assertEquals(48.25475939255556, lod.kmlNorth); + assertEquals(48.25207367852141, lod.kmlSouth); + assertEquals(-90.86591508839973, lod.kmlEast); + assertEquals(-90.8714285289695, lod.kmlWest); + assertEquals(39.37878630116985, lod.kmlRotation); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLatLonQuad.test.js b/test/formats/kml/KmlLatLonQuad.test.js index 93df0bda..2582c53d 100644 --- a/test/formats/kml/KmlLatLonQuad.test.js +++ b/test/formats/kml/KmlLatLonQuad.test.js @@ -27,7 +27,7 @@ require({ kmlRepresentation.getElementsByTagName("LatLonQuad")[0]); assertEquals("81.601884,44.160723 83.529902,43.665148 82.947737,44.248831 81.509322,44.321015", - latLonQuad.coordinates); + latLonQuad.kmlCoordinates); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLink.test.js b/test/formats/kml/KmlLink.test.js index 7c3b8f98..f18312bd 100644 --- a/test/formats/kml/KmlLink.test.js +++ b/test/formats/kml/KmlLink.test.js @@ -33,14 +33,14 @@ require({ var link = new KmlLink( kmlRepresentation.getElementsByTagName("Link")[0]); - assertEquals('link', link.href); - assertEquals('onChange', link.refreshMode); - assertEquals(4, link.refreshInterval); - assertEquals('never', link.viewRefreshMode); - assertEquals(4, link.viewRefreshTime); - assertEquals(1, link.viewBoundScale); - assertEquals('BBOX=10,10,10,10', link.viewFormat); - assertEquals('validQuery', link.httpQuery); + assertEquals('link', link.kmlHref); + assertEquals('onChange', link.kmlRefreshMode); + assertEquals(4, link.kmlRefreshInterval); + assertEquals('never', link.kmlViewRefreshMode); + assertEquals(4, link.kmlViewRefreshTime); + assertEquals(1, link.kmlViewBoundScale); + assertEquals('BBOX=10,10,10,10', link.kmlViewFormat); + assertEquals('validQuery', link.kmlHttpQuery); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLocation.test.js b/test/formats/kml/KmlLocation.test.js index 4b77b201..b408e594 100644 --- a/test/formats/kml/KmlLocation.test.js +++ b/test/formats/kml/KmlLocation.test.js @@ -28,9 +28,9 @@ require({ var location = new KmlLocation( kmlRepresentation.getElementsByTagName("Location")[0]); - assertEquals(45.0, location.longitude); - assertEquals(10.0, location.latitude); - assertEquals(0.0, location.altitude); + assertEquals(45.0, location.kmlLongitude); + assertEquals(10.0, location.kmlLatitude); + assertEquals(0.0, location.kmlAltitude); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLod.test.js b/test/formats/kml/KmlLod.test.js index 4344e10d..1b706971 100644 --- a/test/formats/kml/KmlLod.test.js +++ b/test/formats/kml/KmlLod.test.js @@ -29,10 +29,10 @@ require({ var lod = new KmlLod( kmlRepresentation.getElementsByTagName("Lod")[0]); - assertEquals(256, lod.minLodPixels); - assertEquals(-1, lod.maxLodPixels); - assertEquals(0, lod.minFadeExtent); - assertEquals(0, lod.maxFadeExtent); + assertEquals(256, lod.kmlMinLodPixels); + assertEquals(-1, lod.kmlMaxLodPixels); + assertEquals(0, lod.kmlMinFadeExtent); + assertEquals(0, lod.kmlMaxFadeExtent); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlLookAt.test.js b/test/formats/kml/KmlLookAt.test.js index 57af4f15..590880ed 100644 --- a/test/formats/kml/KmlLookAt.test.js +++ b/test/formats/kml/KmlLookAt.test.js @@ -32,13 +32,13 @@ require({ var lookAt = new KmlLookAt( kmlRepresentation.getElementsByTagName("LookAt")[0]); - assertEquals(10, lookAt.longitude); - assertEquals(9, lookAt.latitude); - assertEquals(8, lookAt.altitude); - assertEquals(1, lookAt.heading); - assertEquals(7, lookAt.tilt); - assertEquals(6, lookAt.range); - assertEquals("clampToGround", lookAt.altitudeMode); + assertEquals(10, lookAt.kmlLongitude); + assertEquals(9, lookAt.kmlLatitude); + assertEquals(8, lookAt.kmlAltitude); + assertEquals(1, lookAt.kmlHeading); + assertEquals(7, lookAt.kmlTilt); + assertEquals(6, lookAt.kmlRange); + assertEquals("clampToGround", lookAt.kmlAltitudeMode); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlOrientation.test.js b/test/formats/kml/KmlOrientation.test.js index a0c7e821..4cbc7b81 100644 --- a/test/formats/kml/KmlOrientation.test.js +++ b/test/formats/kml/KmlOrientation.test.js @@ -28,9 +28,9 @@ require({ var orientation = new KmlOrientation( kmlRepresentation.getElementsByTagName("Orientation")[0]); - assertEquals(45.0, orientation.heading); - assertEquals(10.0, orientation.tilt); - assertEquals(0.0, orientation.roll); + assertEquals(45.0, orientation.kmlHeading); + assertEquals(10.0, orientation.kmlTilt); + assertEquals(0.0, orientation.kmlRoll); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlRegion.test.js b/test/formats/kml/KmlRegion.test.js index 6d896295..5526217e 100644 --- a/test/formats/kml/KmlRegion.test.js +++ b/test/formats/kml/KmlRegion.test.js @@ -31,8 +31,8 @@ require({ var style = new KmlRegion( kmlRepresentation.getElementsByTagName("Region")[0]); - assertTrue(style.LatLonAltBox instanceof KmlLatLonAltBox); - assertTrue(style.Lod instanceof KmlLod); + assertTrue(style.kmlLatLonAltBox instanceof KmlLatLonAltBox); + assertTrue(style.kmlLod instanceof KmlLod); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/KmlTimeSpan.test.js b/test/formats/kml/KmlTimeSpan.test.js index 696a5a38..a389994a 100644 --- a/test/formats/kml/KmlTimeSpan.test.js +++ b/test/formats/kml/KmlTimeSpan.test.js @@ -26,8 +26,8 @@ require({ var kmlRepresentation = new XmlDocument(validTimeSpanXml).dom(); var timeSpan = new KmlTimeSpan(kmlRepresentation.getElementsByTagName("TimeSpan")[0],{}); - assertEquals("1997-07-16T07:30:15Z", timeSpan.begin); - assertEquals("1997-07-16T08:30:15Z", timeSpan.end); + assertEquals("1997-07-16T07:30:15Z", timeSpan.kmlBegin); + assertEquals("1997-07-16T08:30:15Z", timeSpan.kmlEnd); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/KmlTimeStamp.test.js b/test/formats/kml/KmlTimeStamp.test.js index 7b494598..1a1b561e 100644 --- a/test/formats/kml/KmlTimeStamp.test.js +++ b/test/formats/kml/KmlTimeStamp.test.js @@ -23,7 +23,7 @@ require({ var kmlRepresentation = new XmlDocument(validTimeStampXml).dom(); var timeStamp = new KmlTimeStamp(kmlRepresentation.getElementsByTagName("TimeStamp")[0],{}); - assertEquals("1997-07-16T07:30:15Z", timeStamp.when); + assertEquals("1997-07-16T07:30:15Z", timeStamp.kmlWhen); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlDocument.test.js b/test/formats/kml/features/KmlDocument.test.js index 5fa0ce05..2d0da21c 100644 --- a/test/formats/kml/features/KmlDocument.test.js +++ b/test/formats/kml/features/KmlDocument.test.js @@ -28,8 +28,8 @@ require({ var document = new KmlDocument( kmlRepresentation.getElementsByTagName("Document")[0]); - assertEquals(1, document.shapes.length); - assertTrue(document.shapes[0] instanceof KmlPlacemark); + assertEquals(1, document.kmlShapes.length); + assertTrue(document.kmlShapes[0] instanceof KmlPlacemark); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlFeature.test.js b/test/formats/kml/features/KmlFeature.test.js index d1aafd64..5db628ea 100644 --- a/test/formats/kml/features/KmlFeature.test.js +++ b/test/formats/kml/features/KmlFeature.test.js @@ -45,19 +45,19 @@ require({ var feature = new KmlFeature( kmlRepresentation.getElementsByTagName("Feature")[0]); - assertEquals('featureName', feature.name); - assertEquals(true, feature.visibility); - assertEquals(false, feature.open); - assertEquals('validAddress', feature.address); - assertEquals('validPhoneNumber', feature.phoneNumber); - assertEquals('validSnippet', feature.Snippet); - assertEquals('validDescription', feature.description); - assertEquals('someUrl', feature.styleUrl); + assertEquals('featureName', feature.kmlName); + assertEquals(true, feature.kmlVisibility); + assertEquals(false, feature.kmlOpen); + assertEquals('validAddress', feature.kmlAddress); + assertEquals('validPhoneNumber', feature.kmlPhoneNumber); + assertEquals('validSnippet', feature.kmlSnippet); + assertEquals('validDescription', feature.kmlDescription); + assertEquals('someUrl', feature.kmlStyleUrl); - assertTrue(feature.AbstractView instanceof KmlCamera); - assertTrue(feature.TimePrimitive instanceof KmlTimeSpan); - assertTrue(feature.StyleSelector instanceof KmlStyle); - assertTrue(feature.Region instanceof KmlRegion); + assertTrue(feature.kmlAbstractView instanceof KmlCamera); + assertTrue(feature.kmlTimePrimitive instanceof KmlTimeSpan); + assertTrue(feature.kmlStyleSelector instanceof KmlStyle); + assertTrue(feature.kmlRegion instanceof KmlRegion); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlFolder.test.js b/test/formats/kml/features/KmlFolder.test.js index 84fe50eb..716df64e 100644 --- a/test/formats/kml/features/KmlFolder.test.js +++ b/test/formats/kml/features/KmlFolder.test.js @@ -28,8 +28,8 @@ require({ var folder = new KmlFolder( kmlRepresentation.getElementsByTagName("Document")[0]); - assertEquals(1, folder.shapes.length); - assertTrue(folder.shapes[0] instanceof KmlPlacemark); + assertEquals(1, folder.kmlShapes.length); + assertTrue(folder.kmlShapes[0] instanceof KmlPlacemark); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlGroundOverlay.test.js b/test/formats/kml/features/KmlGroundOverlay.test.js index 7b7879cb..dd84d203 100644 --- a/test/formats/kml/features/KmlGroundOverlay.test.js +++ b/test/formats/kml/features/KmlGroundOverlay.test.js @@ -33,11 +33,11 @@ require({ var groundOverlay = new KmlGroundOverlay( kmlRepresentation.getElementsByTagName("GroundOverlay")[0]); - assertEquals(0, groundOverlay.altitude); - assertEquals('clampToGround', groundOverlay.altitudeMode); + assertEquals(0, groundOverlay.kmlAltitude); + assertEquals('clampToGround', groundOverlay.kmlAltitudeMode); - assertTrue(groundOverlay.LatLonBox instanceof KmlLatLonBox); - assertTrue(groundOverlay.LatLonQuad instanceof KmlLatLonQuad); + assertTrue(groundOverlay.kmlLatLonBox instanceof KmlLatLonBox); + assertTrue(groundOverlay.kmlLatLonQuad instanceof KmlLatLonQuad); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlNetworkLink.test.js b/test/formats/kml/features/KmlNetworkLink.test.js index 8649e12e..308b5908 100644 --- a/test/formats/kml/features/KmlNetworkLink.test.js +++ b/test/formats/kml/features/KmlNetworkLink.test.js @@ -30,10 +30,10 @@ require({ var networkLink = new KmlNetworkLink( kmlRepresentation.getElementsByTagName("NetworkLink")[0]); - assertEquals(true, networkLink.refreshVisibility); - assertEquals(true, networkLink.flyToView); + assertEquals(true, networkLink.kmlRefreshVisibility); + assertEquals(true, networkLink.kmlFlyToView); - assertTrue(networkLink.Link instanceof KmlLink); + assertTrue(networkLink.kmlLink instanceof KmlLink); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlOverlay.test.js b/test/formats/kml/features/KmlOverlay.test.js index a9dd4c85..198a5c29 100644 --- a/test/formats/kml/features/KmlOverlay.test.js +++ b/test/formats/kml/features/KmlOverlay.test.js @@ -30,10 +30,10 @@ require({ var overlay = new KmlOverlay( kmlRepresentation.getElementsByTagName("Overlay")[0]); - assertEquals('ffffffff', overlay.color); - assertEquals(1, overlay.drawOrder); + assertEquals('ffffffff', overlay.kmlColor); + assertEquals(1, overlay.kmlDrawOrder); - assertTrue(overlay.Icon instanceof KmlIcon); + assertTrue(overlay.kmlIcon instanceof KmlIcon); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlPhotoOverlay.test.js b/test/formats/kml/features/KmlPhotoOverlay.test.js index 0f5f9714..c008be08 100644 --- a/test/formats/kml/features/KmlPhotoOverlay.test.js +++ b/test/formats/kml/features/KmlPhotoOverlay.test.js @@ -36,12 +36,12 @@ require({ var photoOverlay = new KmlPhotoOverlay( kmlRepresentation.getElementsByTagName("PhotoOverlay")[0]); - assertEquals(0, photoOverlay.rotation); - assertEquals('rectangle', photoOverlay.shape); + assertEquals(0, photoOverlay.kmlRotation); + assertEquals('rectangle', photoOverlay.kmlShape); - assertTrue(photoOverlay.ViewVolume instanceof ViewVolume); - assertTrue(photoOverlay.ImagePyramid instanceof ImagePyramid); - assertTrue(photoOverlay.Point instanceof KmlPoint); + assertTrue(photoOverlay.kmlViewVolume instanceof ViewVolume); + assertTrue(photoOverlay.kmlImagePyramid instanceof ImagePyramid); + assertTrue(photoOverlay.kmlPoint instanceof KmlPoint); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlPlacemark.test.js b/test/formats/kml/features/KmlPlacemark.test.js index 3492028d..9552ad30 100644 --- a/test/formats/kml/features/KmlPlacemark.test.js +++ b/test/formats/kml/features/KmlPlacemark.test.js @@ -30,7 +30,7 @@ require({ var placemark = new KmlPlacemark( kmlRepresentation.getElementsByTagName("Placemark")[0]); - assertTrue(placemark.geometry instanceof KmlPoint); + assertTrue(placemark.kmlGeometry instanceof KmlPoint); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/features/KmlScreenOverlay.test.js b/test/formats/kml/features/KmlScreenOverlay.test.js index d6b2cd6a..2e540673 100644 --- a/test/formats/kml/features/KmlScreenOverlay.test.js +++ b/test/formats/kml/features/KmlScreenOverlay.test.js @@ -26,7 +26,7 @@ require({ var screenOverlay = new KmlScreenOverlay( kmlRepresentation.getElementsByTagName("ScreenOverlay")[0]); - assertEquals(0, screenOverlay.rotation); + assertEquals(0, screenOverlay.kmlRotation); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/geom/KmlLineString.test.js b/test/formats/kml/geom/KmlLineString.test.js index ede2869d..bda31bad 100644 --- a/test/formats/kml/geom/KmlLineString.test.js +++ b/test/formats/kml/geom/KmlLineString.test.js @@ -29,22 +29,22 @@ require({ TestCase("KmlLineString", { setUp: function(){ var kmlRepresentation = new XmlDocument(kmlContainingLineString).dom(); - lineString = new KmlLineString(kmlRepresentation.getElementsByTagName("LineString")[0],{}); + lineString = new KmlLineString(kmlRepresentation.getElementsByTagName("LineString")[0],{then: function(){}}); }, "testParsing": CatchTest(function() { - assertEquals(2, lineString.positions.length); - assertEqualsPosition(new Position(37.824787,-122.364167,0), lineString.positions[0]); - assertEqualsPosition(new Position(37.824423,-122.363917,0), lineString.positions[1]); + assertEquals(2, lineString.kmlPositions.length); + assertEqualsPosition(new Position(37.824787,-122.364167,0), lineString.kmlPositions[0]); + assertEqualsPosition(new Position(37.824423,-122.363917,0), lineString.kmlPositions[1]); }), testValidEquals: CatchTest(function(){ - assertTrue(lineString.equals({positions: [ + assertTrue(lineString.equals({kmlPositions: [ new Position(37.824787,-122.364167,0), new Position(37.824423,-122.363917,0)], - altitudeMode: 'absolute', - extrude: false, - tessellate: false + kmlAltitudeMode: 'absolute', + kmlExtrude: false, + kmlTessellate: false })); }), diff --git a/test/formats/kml/geom/KmlMultiGeometry.test.js b/test/formats/kml/geom/KmlMultiGeometry.test.js index 24330581..95cf7ae8 100644 --- a/test/formats/kml/geom/KmlMultiGeometry.test.js +++ b/test/formats/kml/geom/KmlMultiGeometry.test.js @@ -31,7 +31,7 @@ require({ var kmlRepresentation = new XmlDocument(validKml).dom(); var multiGeometry = new KmlMultiGeometry(kmlRepresentation.getElementsByTagName("MultiGeometry")[0]); - assertEquals(multiGeometry.shapes.length, 2); + assertEquals(multiGeometry.kmlShapes.length, 2); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/geom/KmlPoint.test.js b/test/formats/kml/geom/KmlPoint.test.js index fb089d6e..867c21c3 100644 --- a/test/formats/kml/geom/KmlPoint.test.js +++ b/test/formats/kml/geom/KmlPoint.test.js @@ -28,12 +28,12 @@ require({ var kmlRepresentation = new XmlDocument(kmlFile).dom(); var point = new KmlPoint(kmlRepresentation.getElementsByTagName("Point")[0]); - assertEquals(-122.0822035425683, point.position.longitude); - assertEquals(37.42228990140251, point.position.latitude); - assertEquals(0, point.position.altitude); + assertEquals(-122.0822035425683, point.kmlPosition.longitude); + assertEquals(37.42228990140251, point.kmlPosition.latitude); + assertEquals(0, point.kmlPosition.altitude); - assertEquals(true, point.extrude); - assertEquals("clampToGround", point.altitudeMode); + assertEquals(true, point.kmlExtrude); + assertEquals("clampToGround", point.kmlAltitudeMode); assertEquals("1", point.id); }) diff --git a/test/formats/kml/geom/KmlPolygon.test.js b/test/formats/kml/geom/KmlPolygon.test.js deleted file mode 100644 index ef961e1a..00000000 --- a/test/formats/kml/geom/KmlPolygon.test.js +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2014 United States Government as represented by the Administrator of the - * National Aeronautics and Space Administration. All Rights Reserved. - */ -require({ - baseUrl: '/test/' -},[ - 'test/CatchTest', - 'src/geom/Position', - 'src/formats/kml/geom/KmlPolygon', - 'src/formats/kml/geom/KmlLinearRing', - 'src/util/XmlDocument' -], function ( - CatchTest, - Position, - KmlPolygon, - KmlLinearRing, - XmlDocument -) { - "use strict"; - TestCase("KmlPolygonTestCase", { - "testValidKml": CatchTest(function() { - var validPolygonKml = "" + - "" + - "" + - " " + - " " + - " -60,30,0 -30,30,0 -30,0,0 -60,0,0" + - " " + - " " + - " " + - " " + - " -50,20,0 -40,20,0 -40,10,0 -50,10,0" + - " " + - " " + - " 1" + - " 0" + - " clampToGround" + - "" + - ""; - var kmlRepresentation = new XmlDocument(validPolygonKml).dom(); - var polygon = new KmlPolygon(kmlRepresentation.getElementsByTagName("Polygon")[0]); - - assertTrue(polygon.extrude); - assertFalse(polygon.tessellate); - assertEquals("clampToGround", polygon.altitudeMode); - assertTrue(polygon.center.equals(new Position(15, -45, 0))); - assertTrue(polygon.outerBoundary.equals({ - extrude: false, - tessellate: false, - altitudeMode: WorldWind.ABSOLUTE, - positions: [ - new Position(30,-60,0), - new Position(30,-30,0), - new Position(0,-30,0), - new Position(0,-60,0)] - })); - assertTrue(polygon.innerBoundary.equals({ - extrude: false, - tessellate: false, - altitudeMode: WorldWind.ABSOLUTE, - positions: [ - new Position(20,-50,0), - new Position(20,-40,0), - new Position(10,-40,0), - new Position(10,-50,0)] - })); - }) - }); -}); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlBalloonStyle.test.js b/test/formats/kml/styles/KmlBalloonStyle.test.js index f42254c5..900d1297 100644 --- a/test/formats/kml/styles/KmlBalloonStyle.test.js +++ b/test/formats/kml/styles/KmlBalloonStyle.test.js @@ -30,10 +30,10 @@ require({ var balloonStyle = new KmlBalloonStyle( kmlRepresentation.getElementsByTagName("BalloonStyle")[0]); - assertEquals('ffffffff', balloonStyle.bgColor); - assertEquals('ff000000', balloonStyle.textColor); - assertEquals('TextToTest', balloonStyle.text); - assertEquals('default', balloonStyle.displayMode); + assertEquals('ffffffff', balloonStyle.kmlBgColor); + assertEquals('ff000000', balloonStyle.kmlTextColor); + assertEquals('TextToTest', balloonStyle.kmlText); + assertEquals('default', balloonStyle.kmlDisplayMode); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlIconStyle.test.js b/test/formats/kml/styles/KmlIconStyle.test.js index 565802b6..232603f0 100644 --- a/test/formats/kml/styles/KmlIconStyle.test.js +++ b/test/formats/kml/styles/KmlIconStyle.test.js @@ -34,11 +34,11 @@ require({ var iconStyle = new KmlIconStyle( kmlRepresentation.getElementsByTagName("IconStyle")[0]); - assertEquals('ffffffff', iconStyle.color); - assertEquals('normal', iconStyle.colorMode); - assertEquals(1, iconStyle.scale); - assertEquals(0, iconStyle.heading); - assertEquals('test', iconStyle.Icon.href); + assertEquals('ffffffff', iconStyle.kmlColor); + assertEquals('normal', iconStyle.kmlColorMode); + assertEquals(1, iconStyle.kmlScale); + assertEquals(0, iconStyle.kmlHeading); + assertEquals('test', iconStyle.kmlIcon.kmlHref); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlLabelStyle.test.js b/test/formats/kml/styles/KmlLabelStyle.test.js index d8a97fc3..300cae50 100644 --- a/test/formats/kml/styles/KmlLabelStyle.test.js +++ b/test/formats/kml/styles/KmlLabelStyle.test.js @@ -30,7 +30,7 @@ require({ var labelStyle = new KmlLabelStyle( kmlRepresentation.getElementsByTagName("LabelStyle")[0]); - assertEquals(1, labelStyle.scale); + assertEquals(1, labelStyle.kmlScale); }) }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlLineStyle.test.js b/test/formats/kml/styles/KmlLineStyle.test.js index 0caeb671..394cd4a6 100644 --- a/test/formats/kml/styles/KmlLineStyle.test.js +++ b/test/formats/kml/styles/KmlLineStyle.test.js @@ -34,11 +34,11 @@ require({ var lineStyle = new KmlLineStyle( kmlRepresentation.getElementsByTagName("LineStyle")[0]); - assertEquals(1, lineStyle.width); - assertEquals('ffffffff', lineStyle.outerColor); - assertEquals(0.5, lineStyle.outerWidth); - assertEquals(0.4, lineStyle.physicalWidth); - assertEquals(false, lineStyle.labelVisibility); + assertEquals(1, lineStyle.kmlWidth); + assertEquals('ffffffff', lineStyle.kmlOuterColor); + assertEquals(0.5, lineStyle.kmlOuterWidth); + assertEquals(0.4, lineStyle.kmlPhysicalWidth); + assertEquals(false, lineStyle.kmlLabelVisibility); } }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlListStyle.test.js b/test/formats/kml/styles/KmlListStyle.test.js index 0657589a..a2a133ad 100644 --- a/test/formats/kml/styles/KmlListStyle.test.js +++ b/test/formats/kml/styles/KmlListStyle.test.js @@ -31,10 +31,10 @@ require({ var listStyle = new KmlListStyle( kmlRepresentation.getElementsByTagName("ListStyle")[0]); - assertEquals('check', listStyle.listItemType); - assertEquals('ffffffff', listStyle.bgColor); + assertEquals('check', listStyle.kmlListItemType); + assertEquals('ffffffff', listStyle.kmlBgColor); - assertTrue(listStyle.ItemIcon instanceof ItemIcon); + assertTrue(listStyle.kmlItemIcon instanceof ItemIcon); } }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlPolyStyle.test.js b/test/formats/kml/styles/KmlPolyStyle.test.js index 84a314cb..77b605c7 100644 --- a/test/formats/kml/styles/KmlPolyStyle.test.js +++ b/test/formats/kml/styles/KmlPolyStyle.test.js @@ -29,8 +29,8 @@ require({ var polyStyle = new KmlPolyStyle( kmlRepresentation.getElementsByTagName("PolyStyle")[0]); - assertEquals(true, polyStyle.fill); - assertEquals(false, polyStyle.outline); + assertEquals(true, polyStyle.kmlFill); + assertEquals(false, polyStyle.kmlOutline); } }); }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlStyle.test.js b/test/formats/kml/styles/KmlStyle.test.js index 446f3da1..889932ef 100644 --- a/test/formats/kml/styles/KmlStyle.test.js +++ b/test/formats/kml/styles/KmlStyle.test.js @@ -43,12 +43,12 @@ require({ var style = new KmlStyle( kmlRepresentation.getElementsByTagName("Style")[0]); - assertTrue(style.IconStyle instanceof KmlIconStyle); - assertTrue(style.LabelStyle instanceof KmlLabelStyle); - assertTrue(style.LineStyle instanceof KmlLineStyle); - assertTrue(style.PolyStyle instanceof KmlPolyStyle); - assertTrue(style.BalloonStyle instanceof KmlBalloonStyle); - assertTrue(style.ListStyle instanceof KmlListStyle); + assertTrue(style.kmlIconStyle instanceof KmlIconStyle); + assertTrue(style.kmlLabelStyle instanceof KmlLabelStyle); + assertTrue(style.kmlLineStyle instanceof KmlLineStyle); + assertTrue(style.kmlPolyStyle instanceof KmlPolyStyle); + assertTrue(style.kmlBalloonStyle instanceof KmlBalloonStyle); + assertTrue(style.kmlListStyle instanceof KmlListStyle); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/styles/KmlStyleMap.test.js b/test/formats/kml/styles/KmlStyleMap.test.js index 5e56501c..ba508b94 100644 --- a/test/formats/kml/styles/KmlStyleMap.test.js +++ b/test/formats/kml/styles/KmlStyleMap.test.js @@ -28,7 +28,7 @@ require({ var styleMap = new KmlStyleMap( kmlRepresentation.getElementsByTagName("StyleMap")[0]); - assertTrue(styleMap.Pair instanceof Pair); + assertTrue(styleMap.kmlPairs[0] instanceof Pair); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/util/ImagePyramid.test.js b/test/formats/kml/util/ImagePyramid.test.js index e89b65bb..df9ba76e 100644 --- a/test/formats/kml/util/ImagePyramid.test.js +++ b/test/formats/kml/util/ImagePyramid.test.js @@ -29,10 +29,10 @@ require({ var imagePyramid = new ImagePyramid( kmlRepresentation.getElementsByTagName("ImagePyramid")[0]); - assertEquals(256, imagePyramid.tileSize); - assertEquals(10, imagePyramid.maxWidth); - assertEquals(10, imagePyramid.maxHeight); - assertEquals("lowerLeft", imagePyramid.gridOrigin); + assertEquals(256, imagePyramid.kmlTileSize); + assertEquals(10, imagePyramid.kmlMaxWidth); + assertEquals(10, imagePyramid.kmlMaxHeight); + assertEquals("lowerLeft", imagePyramid.kmlGridOrigin); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/util/ItemIcon.test.js b/test/formats/kml/util/ItemIcon.test.js index 8595bef6..541078b3 100644 --- a/test/formats/kml/util/ItemIcon.test.js +++ b/test/formats/kml/util/ItemIcon.test.js @@ -27,8 +27,8 @@ require({ var scale = new ItemIcon( kmlRepresentation.getElementsByTagName("ItemIcon")[0]); - assertEquals("open", scale.state); - assertEquals("validUrl", scale.href); + assertEquals("open", scale.kmlState); + assertEquals("validUrl", scale.kmlHref); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/util/Pair.test.js b/test/formats/kml/util/Pair.test.js index 63a5bdda..2ad1a110 100644 --- a/test/formats/kml/util/Pair.test.js +++ b/test/formats/kml/util/Pair.test.js @@ -7,12 +7,12 @@ require({ }, [ 'test/CatchTest', 'src/formats/kml/util/Pair', - 'src/formats/kml/styles/KmlStyleSelector', + 'src/formats/kml/styles/KmlStyle', 'src/util/XmlDocument' ], function ( CatchTest, Pair, - KmlStyleSelector, + KmlStyle, XmlDocument ) { "use strict"; @@ -30,10 +30,10 @@ require({ var scale = new Pair( kmlRepresentation.getElementsByTagName("Pair")[0]); - assertEquals('normal', scale.key); - assertEquals('validUrl', scale.styleUrl); + assertEquals('normal', scale.kmlKey); + assertEquals('validUrl', scale.kmlStyleUrl); - assertTrue(scale.Style instanceof KmlStyleSelector); + assertTrue(scale.kmlStyleSelector instanceof KmlStyle); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/util/Scale.test.js b/test/formats/kml/util/Scale.test.js index 92e012a7..02a284e1 100644 --- a/test/formats/kml/util/Scale.test.js +++ b/test/formats/kml/util/Scale.test.js @@ -28,9 +28,9 @@ require({ var scale = new Scale( kmlRepresentation.getElementsByTagName("Scale")[0]); - assertEquals(1, scale.x); - assertEquals(1, scale.y); - assertEquals(1, scale.z); + assertEquals(1, scale.kmlX); + assertEquals(1, scale.kmlY); + assertEquals(1, scale.kmlZ); }) }) }); \ No newline at end of file diff --git a/test/formats/kml/util/ViewVolume.test.js b/test/formats/kml/util/ViewVolume.test.js index acaeb052..477379ab 100644 --- a/test/formats/kml/util/ViewVolume.test.js +++ b/test/formats/kml/util/ViewVolume.test.js @@ -30,11 +30,11 @@ require({ var viewVolume = new ViewVolume( kmlRepresentation.getElementsByTagName("ViewVolume")[0]); - assertEquals(0, viewVolume.leftFov); - assertEquals(0, viewVolume.rightFov); - assertEquals(0, viewVolume.bottomFov); - assertEquals(0, viewVolume.topFov); - assertEquals(0, viewVolume.near); + assertEquals(0, viewVolume.kmlLeftFov); + assertEquals(0, viewVolume.kmlRightFov); + assertEquals(0, viewVolume.kmlBottomFov); + assertEquals(0, viewVolume.kmlTopFov); + assertEquals(0, viewVolume.kmlNear); }) }) }); \ No newline at end of file diff --git a/test/util/Remote.test.js b/test/util/Remote.test.js index dea504e1..bc6d8759 100644 --- a/test/util/Remote.test.js +++ b/test/util/Remote.test.js @@ -18,7 +18,8 @@ require({ var success = callbacks.add(function (fileContent) { loadedFile = fileContent; }); - new Remote({url: fileLocation, ajax: true, success: success}); + var promise = new Remote({url: fileLocation, ajax: true}); + promise.then(success); }); queue.call('Remote request finished', function () {