From f8344cf48f429d3499579551955782076beb7829 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 17 Jul 2014 21:11:33 -0400 Subject: [PATCH] Add test for terrain/imagery credits. --- Specs/Scene/GlobeSurfaceTileProviderSpec.js | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Specs/Scene/GlobeSurfaceTileProviderSpec.js b/Specs/Scene/GlobeSurfaceTileProviderSpec.js index 5813eea21c7c..84766bff9e4b 100644 --- a/Specs/Scene/GlobeSurfaceTileProviderSpec.js +++ b/Specs/Scene/GlobeSurfaceTileProviderSpec.js @@ -2,6 +2,8 @@ defineSuite([ 'Scene/GlobeSurfaceTileProvider', 'Core/Cartesian3', + 'Core/CesiumTerrainProvider', + 'Core/Credit', 'Core/defined', 'Core/Ellipsoid', 'Core/EllipsoidTerrainProvider', @@ -27,6 +29,8 @@ defineSuite([ ], function( GlobeSurfaceTileProvider, Cartesian3, + CesiumTerrainProvider, + Credit, defined, Ellipsoid, EllipsoidTerrainProvider, @@ -576,6 +580,31 @@ defineSuite([ }); }); + it('adds terrain and imagery credits to the CreditDisplay', function() { + var layerCollection = globe.imageryLayers; + layerCollection.removeAll(); + + var imageryCredit = new Credit('imagery credit'); + layerCollection.addImageryProvider(new SingleTileImageryProvider({ + url : 'Data/Images/Red16x16.png', + credit : imageryCredit + })); + + var terrainCredit = new Credit('terrain credit'); + globe.terrainProvider = new CesiumTerrainProvider({ + url : 'http://cesiumjs.org/stk-terrain/tilesets/world/tiles', + credit : terrainCredit + }); + + updateUntilDone(globe); + + runs(function() { + var creditDisplay = frameState.creditDisplay; + expect(creditDisplay._currentFrameCredits.textCredits).toContain(imageryCredit); + expect(creditDisplay._currentFrameCredits.textCredits).toContain(terrainCredit); + }); + }); + describe('switching terrain providers', function() { it('clears the replacement queue', function() { updateUntilDone(globe);