From d0af657b508756016008f4387f87ae9daad4dd68 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Sat, 31 Aug 2019 16:09:04 -0400 Subject: [PATCH] Get rid of defineSuite Cesium traditionally had a custom `defineSuite` function that wrapped both the `define` used for importing requrejs modules and the `describe` used to define a jasmine test block. In order to move to ES6, we need to get rid of this helper function and just use separate`define`/`describe` calls. Then, when we move to ES6, the describe calls will stay as-is and the define call will be replaced with ES6 module imports. Since we also overloaded describe calls for category support, this was an easy change to make and has zero functional changes. To make the diff easy, I left indentation as-is. When we move to ES6, the indentation will actually go back to being correct. --- .../Contributors/TestingGuide/README.md | 28 +++-- Specs/.eslintrc.json | 3 - Specs/Core/ApproximateTerrainHeightsSpec.js | 25 ++-- ...ArcGISTiledElevationTerrainProviderSpec.js | 57 +++++----- Specs/Core/AssociativeArraySpec.js | 7 +- Specs/Core/AttributeCompressionSpec.js | 7 +- Specs/Core/AxisAlignedBoundingBoxSpec.js | 7 +- Specs/Core/BingMapsApiSpec.js | 7 +- Specs/Core/BingMapsGeocoderServiceSpec.js | 7 +- Specs/Core/BoundingRectangleSpec.js | 7 +- Specs/Core/BoundingSphereSpec.js | 7 +- Specs/Core/BoxGeometrySpec.js | 7 +- Specs/Core/BoxOutlineGeometrySpec.js | 7 +- Specs/Core/Cartesian2Spec.js | 7 +- Specs/Core/Cartesian3Spec.js | 7 +- Specs/Core/Cartesian4Spec.js | 7 +- Specs/Core/CartographicGeocoderServiceSpec.js | 7 +- Specs/Core/CartographicSpec.js | 7 +- Specs/Core/CatmullRomSplineSpec.js | 7 +- Specs/Core/CesiumTerrainProviderSpec.js | 7 +- Specs/Core/CheckSpec.js | 7 +- Specs/Core/CircleGeometrySpec.js | 7 +- Specs/Core/CircleOutlineGeometrySpec.js | 7 +- Specs/Core/ClockSpec.js | 7 +- .../ColorGeometryInstanceAttributeSpec.js | 7 +- Specs/Core/ColorSpec.js | 7 +- Specs/Core/ComponentDatatypeSpec.js | 7 +- Specs/Core/CoplanarPolygonGeometrySpec.js | 33 +++--- .../CoplanarPolygonOutlineGeometrySpec.js | 29 ++--- Specs/Core/CorridorGeometrySpec.js | 7 +- Specs/Core/CorridorOutlineGeometrySpec.js | 7 +- Specs/Core/CubicRealPolynomialSpec.js | 7 +- Specs/Core/CullingVolumeSpec.js | 7 +- Specs/Core/CylinderGeometrySpec.js | 7 +- Specs/Core/CylinderOutlineGeometrySpec.js | 7 +- Specs/Core/DeveloperErrorSpec.js | 7 +- ...yConditionGeometryInstanceAttributeSpec.js | 7 +- Specs/Core/DistanceDisplayConditionSpec.js | 7 +- Specs/Core/DoublyLinkedListSpec.js | 7 +- Specs/Core/EarthOrientationParametersSpec.js | 7 +- Specs/Core/EllipseGeometrySpec.js | 7 +- Specs/Core/EllipseOutlineGeometrySpec.js | 7 +- Specs/Core/EllipsoidGeodesicSpec.js | 7 +- Specs/Core/EllipsoidGeometrySpec.js | 7 +- Specs/Core/EllipsoidOutlineGeometrySpec.js | 7 +- Specs/Core/EllipsoidRhumbLineSpec.js | 7 +- Specs/Core/EllipsoidSpec.js | 7 +- Specs/Core/EllipsoidTangentPlaneSpec.js | 7 +- Specs/Core/EllipsoidTerrainProviderSpec.js | 7 +- Specs/Core/EllipsoidalOccluderSpec.js | 7 +- Specs/Core/EncodedCartesian3Spec.js | 7 +- Specs/Core/EventSpec.js | 7 +- Specs/Core/FeatureDetectionSpec.js | 7 +- Specs/Core/FrustumGeometrySpec.js | 7 +- Specs/Core/FrustumOutlineGeometrySpec.js | 7 +- Specs/Core/FullscreenSpec.js | 7 +- Specs/Core/GeographicProjectionSpec.js | 7 +- Specs/Core/GeographicTilingSchemeSpec.js | 7 +- Specs/Core/GeometryAttributeSpec.js | 7 +- Specs/Core/GeometryInstanceAttributeSpec.js | 7 +- Specs/Core/GeometryInstanceSpec.js | 7 +- Specs/Core/GeometryPipelineSpec.js | 7 +- Specs/Core/GeometrySpec.js | 11 +- .../Core/GoogleEarthEnterpriseMetadataSpec.js | 7 +- .../GoogleEarthEnterpriseTerrainDataSpec.js | 7 +- ...oogleEarthEnterpriseTerrainProviderSpec.js | 7 +- Specs/Core/GroundPolylineGeometrySpec.js | 7 +- Specs/Core/HeadingPitchRangeSpec.js | 7 +- Specs/Core/HeadingPitchRollSpec.js | 8 +- Specs/Core/HeapSpec.js | 7 +- Specs/Core/HeightmapTerrainDataSpec.js | 7 +- .../HermitePolynomialApproximationSpec.js | 7 +- Specs/Core/HermiteSplineSpec.js | 7 +- Specs/Core/Iau2000OrientationSpec.js | 7 +- Specs/Core/Iau2006XysDataSpec.js | 7 +- Specs/Core/IauOrientationAxesSpec.js | 7 +- Specs/Core/IndexDatatypeSpec.js | 7 +- Specs/Core/IntersectionTestsSpec.js | 7 +- Specs/Core/Intersections2DSpec.js | 7 +- Specs/Core/IntervalSpec.js | 7 +- Specs/Core/IonGeocoderServiceSpec.js | 19 ++-- Specs/Core/IonResourceSpec.js | 7 +- Specs/Core/JulianDateSpec.js | 7 +- .../LagrangePolynomialApproximationSpec.js | 7 +- Specs/Core/LeapSecondSpec.js | 7 +- Specs/Core/LinearApproximationSpec.js | 7 +- Specs/Core/LinearSplineSpec.js | 7 +- Specs/Core/ManagedArraySpec.js | 7 +- Specs/Core/MapboxApiSpec.js | 7 +- Specs/Core/MathSpec.js | 7 +- Specs/Core/Matrix2Spec.js | 7 +- Specs/Core/Matrix3Spec.js | 7 +- Specs/Core/Matrix4Spec.js | 7 +- Specs/Core/NearFarScalarSpec.js | 7 +- Specs/Core/OccluderSpec.js | 7 +- Specs/Core/OpenCageGeocoderServiceSpec.js | 11 +- Specs/Core/OrientedBoundingBoxSpec.js | 7 +- Specs/Core/OrthographicFrustumSpec.js | 7 +- .../Core/OrthographicOffCenterFrustumSpec.js | 7 +- Specs/Core/PeliasGeocoderServiceSpec.js | 11 +- Specs/Core/PerspectiveFrustumSpec.js | 7 +- Specs/Core/PerspectiveOffCenterFrustumSpec.js | 7 +- Specs/Core/PinBuilderSpec.js | 7 +- Specs/Core/PlaneGeometrySpec.js | 7 +- Specs/Core/PlaneOutlineGeometrySpec.js | 7 +- Specs/Core/PlaneSpec.js | 7 +- Specs/Core/PolygonGeometrySpec.js | 7 +- Specs/Core/PolygonOutlineGeometrySpec.js | 7 +- Specs/Core/PolygonPipelineSpec.js | 7 +- Specs/Core/PolylineGeometrySpec.js | 7 +- Specs/Core/PolylinePipelineSpec.js | 7 +- Specs/Core/PolylineVolumeGeometrySpec.js | 8 +- .../Core/PolylineVolumeOutlineGeometrySpec.js | 7 +- Specs/Core/QuadraticRealPolynomialSpec.js | 7 +- Specs/Core/QuantizedMeshTerrainDataSpec.js | 7 +- Specs/Core/QuarticRealPolynomialSpec.js | 7 +- Specs/Core/QuaternionSpec.js | 7 +- Specs/Core/QuaternionSplineSpec.js | 7 +- Specs/Core/QueueSpec.js | 7 +- Specs/Core/RaySpec.js | 7 +- Specs/Core/RectangleCollisionCheckerSpec.js | 7 +- Specs/Core/RectangleGeometrySpec.js | 7 +- Specs/Core/RectangleOutlineGeometrySpec.js | 11 +- Specs/Core/RectangleSpec.js | 7 +- Specs/Core/RequestErrorEventSpec.js | 7 +- Specs/Core/RequestSchedulerSpec.js | 7 +- Specs/Core/ResourceSpec.js | 11 +- Specs/Core/RuntimeErrorSpec.js | 7 +- Specs/Core/ScreenSpaceEventHandlerSpec.js | 7 +- .../Core/ShowGeometryInstanceAttributeSpec.js | 7 +- Specs/Core/Simon1994PlanetaryPositionsSpec.js | 7 +- Specs/Core/SimplePolylineGeometrySpec.js | 7 +- Specs/Core/SphereGeometrySpec.js | 7 +- Specs/Core/SphereOutlineGeometrySpec.js | 7 +- Specs/Core/SphericalSpec.js | 7 +- Specs/Core/SplineSpec.js | 7 +- Specs/Core/TaskProcessorSpec.js | 19 ++-- Specs/Core/TerrainEncodingSpec.js | 7 +- Specs/Core/TileAvailabilitySpec.js | 7 +- Specs/Core/TimeIntervalCollectionSpec.js | 7 +- Specs/Core/TimeIntervalSpec.js | 7 +- Specs/Core/TipsifySpec.js | 7 +- Specs/Core/TransformsSpec.js | 7 +- Specs/Core/TranslationRotationScaleSpec.js | 7 +- Specs/Core/TridiagonalSystemSolverSpec.js | 7 +- Specs/Core/TrustedServersSpec.js | 7 +- Specs/Core/VRTheWorldTerrainProviderSpec.js | 7 +- Specs/Core/VertexFormatSpec.js | 7 +- Specs/Core/VideoSynchronizerSpec.js | 7 +- Specs/Core/WallGeometrySpec.js | 7 +- Specs/Core/WallOutlineGeometrySpec.js | 7 +- Specs/Core/WebMercatorProjectionSpec.js | 7 +- Specs/Core/WebMercatorTilingSchemeSpec.js | 7 +- Specs/Core/appendForwardSlashSpec.js | 7 +- Specs/Core/arrayFillSpec.js | 7 +- Specs/Core/arrayRemoveDuplicatesSpec.js | 7 +- Specs/Core/arraySliceSpec.js | 7 +- Specs/Core/barycentricCoordinatesSpec.js | 7 +- Specs/Core/binarySearchSpec.js | 7 +- Specs/Core/buildModuleUrlSpec.js | 7 +- Specs/Core/cloneSpec.js | 7 +- Specs/Core/combineSpec.js | 7 +- Specs/Core/createGuidSpec.js | 7 +- Specs/Core/defaultValueSpec.js | 7 +- Specs/Core/definedSpec.js | 7 +- Specs/Core/deprecationWarningSpec.js | 7 +- Specs/Core/getAbsoluteUriSpec.js | 7 +- Specs/Core/getBaseUriSpec.js | 7 +- Specs/Core/getExtensionFromUriSpec.js | 7 +- Specs/Core/getFilenameFromUriSpec.js | 7 +- Specs/Core/getStringFromTypedArraySpec.js | 7 +- Specs/Core/isBlobUriSpec.js | 7 +- Specs/Core/isCrossOriginUrlSpec.js | 7 +- Specs/Core/isDataUriSpec.js | 7 +- Specs/Core/isLeapYearSpec.js | 7 +- Specs/Core/loadCRNSpec.js | 7 +- Specs/Core/loadImageFromTypedArraySpec.js | 7 +- Specs/Core/loadKTXSpec.js | 7 +- Specs/Core/mergeSortSpec.js | 7 +- Specs/Core/objectToQuerySpec.js | 7 +- Specs/Core/oneTimeWarningSpec.js | 7 +- Specs/Core/parseResponseHeadersSpec.js | 7 +- Specs/Core/pointInsideTriangleSpec.js | 7 +- Specs/Core/queryToObjectSpec.js | 7 +- Specs/Core/requestAnimationFrameSpec.js | 7 +- Specs/Core/sampleTerrainMostDetailedSpec.js | 7 +- Specs/Core/sampleTerrainSpec.js | 7 +- Specs/Core/subdivideArraySpec.js | 7 +- Specs/Core/writeTextToCanvasSpec.js | 7 +- Specs/DataSources/BillboardGraphicsSpec.js | 7 +- Specs/DataSources/BillboardVisualizerSpec.js | 7 +- Specs/DataSources/BoxGeometryUpdaterSpec.js | 7 +- Specs/DataSources/BoxGraphicsSpec.js | 7 +- Specs/DataSources/CallbackPropertySpec.js | 7 +- .../CheckerboardMaterialPropertySpec.js | 7 +- .../DataSources/ColorMaterialPropertySpec.js | 7 +- .../CompositeEntityCollectionSpec.js | 7 +- .../CompositeMaterialPropertySpec.js | 7 +- .../CompositePositionPropertySpec.js | 7 +- Specs/DataSources/CompositePropertySpec.js | 7 +- .../ConstantPositionPropertySpec.js | 7 +- Specs/DataSources/ConstantPropertySpec.js | 7 +- .../CorridorGeometryUpdaterSpec.js | 7 +- Specs/DataSources/CorridorGraphicsSpec.js | 7 +- Specs/DataSources/CustomDataSourceSpec.js | 7 +- .../CylinderGeometryUpdaterSpec.js | 7 +- Specs/DataSources/CylinderGraphicsSpec.js | 7 +- Specs/DataSources/CzmlDataSourceSpec.js | 7 +- Specs/DataSources/DataSourceClockSpec.js | 7 +- Specs/DataSources/DataSourceCollectionSpec.js | 7 +- Specs/DataSources/DataSourceDisplaySpec.js | 15 ++- .../DataSources/DynamicGeometryUpdaterSpec.js | 7 +- .../DataSources/EllipseGeometryUpdaterSpec.js | 7 +- Specs/DataSources/EllipseGraphicsSpec.js | 7 +- .../EllipsoidGeometryUpdaterSpec.js | 7 +- Specs/DataSources/EllipsoidGraphicsSpec.js | 7 +- Specs/DataSources/EntityClusterSpec.js | 7 +- Specs/DataSources/EntityCollectionSpec.js | 7 +- Specs/DataSources/EntitySpec.js | 7 +- Specs/DataSources/EntityViewSpec.js | 7 +- Specs/DataSources/GeoJsonDataSourceSpec.js | 7 +- Specs/DataSources/GeometryUpdaterSpec.js | 7 +- Specs/DataSources/GeometryVisualizerSpec.js | 7 +- Specs/DataSources/GridMaterialPropertySpec.js | 7 +- .../DataSources/GroundGeometryUpdaterSpec.js | 41 +++---- .../DataSources/ImageMaterialPropertySpec.js | 7 +- Specs/DataSources/KmlDataSourceSpec.js | 7 +- Specs/DataSources/KmlTourFlyToSpec.js | 7 +- Specs/DataSources/KmlTourSpec.js | 7 +- Specs/DataSources/LabelGraphicsSpec.js | 7 +- Specs/DataSources/LabelVisualizerSpec.js | 7 +- Specs/DataSources/ModelGraphicsSpec.js | 7 +- Specs/DataSources/ModelVisualizerSpec.js | 7 +- .../NodeTransformationPropertySpec.js | 7 +- Specs/DataSources/PathGraphicsSpec.js | 7 +- Specs/DataSources/PathVisualizerSpec.js | 7 +- Specs/DataSources/PlaneGeometryUpdaterSpec.js | 7 +- Specs/DataSources/PlaneGraphicsSpec.js | 7 +- Specs/DataSources/PointGraphicsSpec.js | 7 +- Specs/DataSources/PointVisualizerSpec.js | 7 +- .../DataSources/PolygonGeometryUpdaterSpec.js | 19 ++-- Specs/DataSources/PolygonGraphicsSpec.js | 7 +- .../PolylineArrowMaterialPropertySpec.js | 7 +- .../PolylineDashMaterialPropertySpec.js | 7 +- .../PolylineGeometryUpdaterSpec.js | 7 +- .../PolylineGlowMaterialPropertySpec.js | 7 +- Specs/DataSources/PolylineGraphicsSpec.js | 9 +- .../PolylineOutlineMaterialPropertySpec.js | 7 +- Specs/DataSources/PolylineVisualizerSpec.js | 7 +- .../PolylineVolumeGeometryUpdaterSpec.js | 7 +- .../DataSources/PolylineVolumeGraphicsSpec.js | 7 +- .../DataSources/PositionPropertyArraySpec.js | 7 +- Specs/DataSources/PropertyArraySpec.js | 7 +- Specs/DataSources/PropertyBagSpec.js | 7 +- .../RectangleGeometryUpdaterSpec.js | 7 +- Specs/DataSources/RectangleGraphicsSpec.js | 7 +- Specs/DataSources/ReferencePropertySpec.js | 7 +- Specs/DataSources/RotationSpec.js | 7 +- .../SampledPositionPropertySpec.js | 7 +- Specs/DataSources/SampledPropertySpec.js | 7 +- .../StaticGeometryColorBatchSpec.js | 85 +++++++------- .../StaticGeometryPerMaterialBatchSpec.js | 7 +- .../StaticGroundGeometryColorBatchSpec.js | 11 +- ...taticGroundGeometryPerMaterialBatchSpec.js | 7 +- ...taticGroundPolylinePerMaterialBatchSpec.js | 11 +- .../StaticOutlineGeometryBatchSpec.js | 7 +- .../DataSources/StripeMaterialPropertySpec.js | 7 +- .../DataSources/TerrainOffsetPropertySpec.js | 49 ++++---- ...eIntervalCollectionPositionPropertySpec.js | 7 +- .../TimeIntervalCollectionPropertySpec.js | 7 +- .../VelocityOrientationPropertySpec.js | 7 +- .../DataSources/VelocityVectorPropertySpec.js | 7 +- Specs/DataSources/WallGeometryUpdaterSpec.js | 7 +- Specs/DataSources/WallGraphicsSpec.js | 7 +- .../createMaterialPropertyDescriptorSpec.js | 7 +- Specs/DataSources/exportKmlSpec.js | 107 +++++++++--------- Specs/Renderer/AutomaticUniformSpec.js | 7 +- Specs/Renderer/BufferSpec.js | 7 +- Specs/Renderer/BuiltinFunctionsSpec.js | 11 +- Specs/Renderer/ClearCommandSpec.js | 7 +- Specs/Renderer/ClearSpec.js | 7 +- Specs/Renderer/ComputeCommandSpec.js | 7 +- Specs/Renderer/ContextSpec.js | 7 +- Specs/Renderer/CubeMapSpec.js | 7 +- Specs/Renderer/DrawCommandSpec.js | 7 +- Specs/Renderer/DrawSpec.js | 7 +- Specs/Renderer/FramebufferSpec.js | 7 +- Specs/Renderer/PassStateSpec.js | 7 +- Specs/Renderer/RenderStateSpec.js | 7 +- Specs/Renderer/RenderbufferSpec.js | 7 +- Specs/Renderer/SamplerSpec.js | 7 +- Specs/Renderer/ShaderCacheSpec.js | 7 +- Specs/Renderer/ShaderProgramSpec.js | 7 +- Specs/Renderer/ShaderSourceSpec.js | 7 +- Specs/Renderer/TextureCacheSpec.js | 5 +- Specs/Renderer/TextureSpec.js | 7 +- Specs/Renderer/UniformSpec.js | 7 +- Specs/Renderer/VertexArrayFacadeSpec.js | 7 +- Specs/Renderer/VertexArrayFactorySpec.js | 7 +- Specs/Renderer/VertexArraySpec.js | 7 +- Specs/Renderer/freezeRenderStateSpec.js | 7 +- Specs/Renderer/loadCubeMapSpec.js | 7 +- Specs/Renderer/modernizeShaderSpec.js | 7 +- Specs/Scene/AppearanceSpec.js | 7 +- .../ArcGisMapServerImageryProviderSpec.js | 7 +- Specs/Scene/AxisSpec.js | 7 +- Specs/Scene/BatchTableSpec.js | 7 +- ...d3DModel3DTileContentClassificationSpec.js | 7 +- .../Scene/Batched3DModel3DTileContentSpec.js | 7 +- Specs/Scene/BillboardCollectionSpec.js | 7 +- Specs/Scene/BingMapsImageryProviderSpec.js | 7 +- Specs/Scene/BoxEmitterSpec.js | 7 +- Specs/Scene/CameraEventAggregatorSpec.js | 7 +- Specs/Scene/CameraFlightPathSpec.js | 7 +- Specs/Scene/CameraSpec.js | 7 +- Specs/Scene/Cesium3DTileBatchTableSpec.js | 7 +- Specs/Scene/Cesium3DTileContentSpec.js | 7 +- Specs/Scene/Cesium3DTileFeatureTableSpec.js | 7 +- Specs/Scene/Cesium3DTilePassStateSpec.js | 7 +- Specs/Scene/Cesium3DTileSpec.js | 7 +- Specs/Scene/Cesium3DTileStyleSpec.js | 7 +- Specs/Scene/Cesium3DTilesetHeatmapSpec.js | 15 ++- Specs/Scene/Cesium3DTilesetSpec.js | 11 +- Specs/Scene/CircleEmitterSpec.js | 7 +- Specs/Scene/ClassificationModelSpec.js | 7 +- Specs/Scene/ClassificationPrimitiveSpec.js | 7 +- Specs/Scene/ClippingPlaneCollectionSpec.js | 7 +- Specs/Scene/ClippingPlaneSpec.js | 7 +- Specs/Scene/Composite3DTileContentSpec.js | 7 +- Specs/Scene/ConditionsExpressionSpec.js | 7 +- Specs/Scene/ConeEmitterSpec.js | 7 +- Specs/Scene/CreditDisplaySpec.js | 7 +- Specs/Scene/DebugAppearanceSpec.js | 7 +- Specs/Scene/DebugCameraPrimitiveSpec.js | 7 +- Specs/Scene/DebugModelMatrixPrimitiveSpec.js | 7 +- .../DeviceOrientationCameraControllerSpec.js | 7 +- .../Scene/DiscardEmptyTileImagePolicySpec.js | 7 +- .../DiscardMissingTileImagePolicySpec.js | 7 +- Specs/Scene/EllipsoidPrimitiveSpec.js | 7 +- Specs/Scene/EllipsoidSurfaceAppearanceSpec.js | 7 +- Specs/Scene/Empty3DTileContentSpec.js | 7 +- Specs/Scene/ExpressionSpec.js | 7 +- Specs/Scene/FrameRateMonitorSpec.js | 7 +- Specs/Scene/FrustumCommandsSpec.js | 7 +- Specs/Scene/Geometry3DTileContentSpec.js | 7 +- Specs/Scene/GeometryRenderingSpec.js | 15 ++- Specs/Scene/GlobeSpec.js | 7 +- Specs/Scene/GlobeSurfaceTileProviderSpec.js | 7 +- Specs/Scene/GlobeSurfaceTileSpec.js | 23 ++-- ...oogleEarthEnterpriseImageryProviderSpec.js | 7 +- .../GoogleEarthEnterpriseMapsProviderSpec.js | 7 +- Specs/Scene/GridImageryProviderSpec.js | 7 +- Specs/Scene/GroundPolylinePrimitiveSpec.js | 11 +- Specs/Scene/GroundPrimitiveSpec.js | 7 +- Specs/Scene/HeightmapTessellatorSpec.js | 7 +- Specs/Scene/ImageryLayerCollectionSpec.js | 7 +- Specs/Scene/ImageryLayerSpec.js | 7 +- .../Instanced3DModel3DTileContentSpec.js | 7 +- Specs/Scene/IonImageryProviderSpec.js | 7 +- Specs/Scene/JobSchedulerSpec.js | 7 +- Specs/Scene/LabelCollectionSpec.js | 7 +- Specs/Scene/MapboxImageryProviderSpec.js | 7 +- Specs/Scene/MapboxStyleImageryProviderSpec.js | 7 +- Specs/Scene/MaterialAppearanceSpec.js | 7 +- Specs/Scene/MaterialSpec.js | 7 +- Specs/Scene/ModelInstanceCollectionSpec.js | 7 +- Specs/Scene/ModelSpec.js | 7 +- Specs/Scene/MoonSpec.js | 7 +- Specs/Scene/MultifrustumSpec.js | 7 +- Specs/Scene/OctahedralProjectedCubeMapSpec.js | 7 +- .../OrderedGroundPrimitiveCollectionSpec.js | 17 +-- Specs/Scene/ParticleSpec.js | 7 +- Specs/Scene/ParticleSystemSpec.js | 7 +- Specs/Scene/PerInstanceColorAppearanceSpec.js | 7 +- Specs/Scene/PickSpec.js | 7 +- Specs/Scene/PointCloud3DTileContentSpec.js | 7 +- Specs/Scene/PointCloudEyeDomeLightingSpec.js | 7 +- Specs/Scene/PointCloudShadingSpec.js | 7 +- Specs/Scene/PointPrimitiveCollectionSpec.js | 7 +- Specs/Scene/PolylineCollectionSpec.js | 7 +- Specs/Scene/PolylineColorAppearanceSpec.js | 7 +- Specs/Scene/PolylineMaterialAppearanceSpec.js | 7 +- Specs/Scene/PostProcessStageCollectionSpec.js | 7 +- Specs/Scene/PostProcessStageCompositeSpec.js | 7 +- Specs/Scene/PostProcessStageLibrarySpec.js | 19 ++-- Specs/Scene/PostProcessStageSpec.js | 7 +- Specs/Scene/PrimitiveCollectionSpec.js | 7 +- Specs/Scene/PrimitiveCullingSpec.js | 7 +- Specs/Scene/PrimitivePipelineSpec.js | 7 +- Specs/Scene/PrimitiveSpec.js | 7 +- Specs/Scene/QuadtreePrimitiveSpec.js | 19 ++-- Specs/Scene/QuadtreeTileSpec.js | 7 +- Specs/Scene/SceneSpec.js | 7 +- Specs/Scene/SceneTransformsSpec.js | 7 +- .../Scene/ScreenSpaceCameraControllerSpec.js | 7 +- Specs/Scene/ShadowMapSpec.js | 7 +- Specs/Scene/ShadowVolumeAppearanceSpec.js | 65 ++++++----- Specs/Scene/SingleTileImageryProviderSpec.js | 7 +- Specs/Scene/SkyAtmosphereSpec.js | 7 +- Specs/Scene/SkyBoxSpec.js | 7 +- Specs/Scene/SphereEmitterSpec.js | 7 +- Specs/Scene/StyleExpressionSpec.js | 7 +- Specs/Scene/SunSpec.js | 7 +- Specs/Scene/TerrainFillMeshSpec.js | 19 ++-- Specs/Scene/TextureAtlasSpec.js | 7 +- Specs/Scene/TileBoundingRegionSpec.js | 7 +- Specs/Scene/TileBoundingSphereSpec.js | 7 +- Specs/Scene/TileBoundingVolumeSpec.js | 7 +- .../TileCoordinatesImageryProviderSpec.js | 7 +- Specs/Scene/TileImagerySpec.js | 7 +- Specs/Scene/TileOrientedBoundingBoxSpec.js | 7 +- Specs/Scene/TileReplacementQueueSpec.js | 7 +- Specs/Scene/Tileset3DTileContentSpec.js | 7 +- Specs/Scene/TimeDynamicImagerySpec.js | 7 +- Specs/Scene/TimeDynamicPointCloudSpec.js | 7 +- Specs/Scene/TweenCollectionSpec.js | 7 +- Specs/Scene/UrlTemplateImageryProviderSpec.js | 7 +- Specs/Scene/Vector3DTileContentSpec.js | 7 +- Specs/Scene/Vector3DTileGeometrySpec.js | 7 +- Specs/Scene/Vector3DTilePointsSpec.js | 7 +- Specs/Scene/Vector3DTilePolygonsSpec.js | 7 +- Specs/Scene/Vector3DTilePolylinesSpec.js | 7 +- Specs/Scene/ViewportQuadSpec.js | 7 +- .../Scene/WebMapServiceImageryProviderSpec.js | 7 +- .../WebMapTileServiceImageryProviderSpec.js | 7 +- .../computeFlyToLocationForRectangleSpec.js | 7 +- .../createOpenStreetMapImageryProviderSpec.js | 7 +- .../createTangentSpaceDebugPrimitiveSpec.js | 7 +- ...createTileMapServiceImageryProviderSpec.js | 7 +- Specs/ThirdParty/knockoutSpec.js | 7 +- Specs/ThirdParty/whenSpec.js | 7 +- Specs/Widgets/Animation/AnimationSpec.js | 7 +- .../Animation/AnimationViewModelSpec.js | 7 +- .../BaseLayerPicker/BaseLayerPickerSpec.js | 7 +- .../BaseLayerPickerViewModelSpec.js | 7 +- .../BaseLayerPicker/ProviderViewModelSpec.js | 7 +- .../Cesium3DTilesInspectorSpec.js | 7 +- .../Cesium3DTilesInspectorViewModelSpec.js | 7 +- .../CesiumInspector/CesiumInspectorSpec.js | 7 +- .../CesiumInspectorViewModelSpec.js | 7 +- .../Widgets/CesiumWidget/CesiumWidgetSpec.js | 7 +- Specs/Widgets/ClockViewModelSpec.js | 7 +- .../FullscreenButton/FullscreenButtonSpec.js | 7 +- .../FullscreenButtonViewModelSpec.js | 7 +- Specs/Widgets/Geocoder/GeocoderSpec.js | 7 +- .../Widgets/Geocoder/GeocoderViewModelSpec.js | 7 +- Specs/Widgets/HomeButton/HomeButtonSpec.js | 7 +- .../HomeButton/HomeButtonViewModelSpec.js | 7 +- Specs/Widgets/InfoBox/InfoBoxSpec.js | 7 +- Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js | 7 +- .../NavigationHelpButtonSpec.js | 7 +- .../NavigationHelpButtonViewModelSpec.js | 7 +- .../PerformanceWatchdogSpec.js | 7 +- .../PerformanceWatchdogViewModelSpec.js | 7 +- .../ProjectionPicker/ProjectionPickerSpec.js | 7 +- .../ProjectionPickerViewModelSpec.js | 7 +- .../SceneModePicker/SceneModePickerSpec.js | 7 +- .../SceneModePickerViewModelSpec.js | 7 +- .../SelectionIndicatorSpec.js | 7 +- .../SelectionIndicatorViewModelSpec.js | 7 +- Specs/Widgets/SvgPathBindingHandlerSpec.js | 7 +- Specs/Widgets/Timeline/TimelineSpec.js | 7 +- Specs/Widgets/VRButton/VRButtonSpec.js | 7 +- .../Widgets/VRButton/VRButtonViewModelSpec.js | 7 +- Specs/Widgets/Viewer/ViewerSpec.js | 7 +- .../Widgets/Viewer/viewerDragDropMixinSpec.js | 7 +- .../viewerPerformanceWatchdogMixinSpec.js | 7 +- Specs/Widgets/createCommandSpec.js | 7 +- Specs/customizeJasmine.js | 42 ------- Specs/spec-main.js | 21 +--- 470 files changed, 2644 insertions(+), 1304 deletions(-) diff --git a/Documentation/Contributors/TestingGuide/README.md b/Documentation/Contributors/TestingGuide/README.md index 2f5572131d22..001f39fb7d71 100644 --- a/Documentation/Contributors/TestingGuide/README.md +++ b/Documentation/Contributors/TestingGuide/README.md @@ -192,7 +192,7 @@ It is also possible for Karma to run all tests against each browser installed on #### Run a Single Test or Suite -Sometimes it is useful to run a single test or suite for easier debugging purposes. To do this simply change the `it` function call for the desired test to `fit`, the `f` stands for `focused` in Jasmine speak. Likewise, to run an entire suite, use `fdefineSuite` instead of `defineSuite`. +Sometimes it is useful to run a single test or suite for easier debugging purposes. To do this simply change the `it` function call for the desired test to `fit`, the `f` stands for `focused` in Jasmine speak. Likewise, to run an entire suite, use `fdescribe` instead of `describe`. ## Testing Previous Versions of CesiumJS @@ -233,22 +233,24 @@ Tests are written in JavaScript using Jasmine. It is important to realize that Here is a stripped down version of the tests: ```javascript -defineSuite([ +define([ 'Core/Cartesian3' ], function( Cartesian3) { 'use strict'; - it('construct with default values', function() { - var cartesian = new Cartesian3(); - expect(cartesian.x).toEqual(0.0); - expect(cartesian.y).toEqual(0.0); - expect(cartesian.z).toEqual(0.0); + describe('Cartesian3', function(){ + it('construct with default values', function() { + var cartesian = new Cartesian3(); + expect(cartesian.x).toEqual(0.0); + expect(cartesian.y).toEqual(0.0); + expect(cartesian.z).toEqual(0.0); + }); }); }); ``` -`defineSuite` identifies this file as a test suite and include modules the same way `define` is used in engine code. The modules are listed in alphabetical order as usual _except_ that the module being tested is listed first. +`describe` identifies this file as a test suite and we include modules the same way `define` is used in engine code. Using Jasmine, each test is defined by calling `it` and passing a string that describes the test and a function that is the test. @@ -692,10 +694,10 @@ This test is more cohesive and easier to debug than if it were written using a _ ### Categories -As mentioned above, some tests are in the `'WebGL'` category. To assign a category to a suite, pass the category to `defineSuite`. +As mentioned above, some tests are in the `'WebGL'` category. To assign a category to a suite, pass the category to `describe`. ```javascript -defineSuite([ +define([ 'Scene/DebugModelMatrixPrimitive', 'Specs/createScene' ], function( @@ -703,6 +705,7 @@ defineSuite([ createScene) { 'use strict'; +describe('Scene/DebugModelMatrixPrimitive', function(){ var scene; beforeAll(function() { @@ -716,9 +719,10 @@ defineSuite([ // ... }, 'WebGL'); +}); ``` -`defineSuite` is a custom CesiumJS function that wraps Jasmine define calls and provides the category capability. +CesiumJS uses a customized `describe` function that wraps Jasmine describe calls and provides the category capability. ## Manual Testing @@ -756,7 +760,7 @@ You can run or debug the tests by using the first two buttons. The third button ![](webstorm-test-runner.png) -This runner has lots of options, such as only showing failing tests or automatically re-running the tests on a test interval (great for development when combined with `fdefineSuite`!). You can hover over each of the buttons to see what they do. +This runner has lots of options, such as only showing failing tests or automatically re-running the tests on a test interval (great for development when combined with `fdescribe`!). You can hover over each of the buttons to see what they do. To make jumping between the source and spec files easier download the [Cesium WebStorm plugin](https://github.com/AnalyticalGraphicsInc/cesium-webstorm-plugin). diff --git a/Specs/.eslintrc.json b/Specs/.eslintrc.json index 3e3ca9ba4037..e7375baba9c6 100644 --- a/Specs/.eslintrc.json +++ b/Specs/.eslintrc.json @@ -3,9 +3,6 @@ "env": { "jasmine": true }, - "globals": { - "defineSuite": true - }, "rules": { "no-self-assign": "off" } diff --git a/Specs/Core/ApproximateTerrainHeightsSpec.js b/Specs/Core/ApproximateTerrainHeightsSpec.js index c716284c6483..976195d82f7f 100644 --- a/Specs/Core/ApproximateTerrainHeightsSpec.js +++ b/Specs/Core/ApproximateTerrainHeightsSpec.js @@ -1,14 +1,16 @@ -defineSuite([ - 'Core/ApproximateTerrainHeights', - 'Core/Cartesian3', - 'Core/Math', - 'Core/Rectangle' -], function( - ApproximateTerrainHeights, - Cartesian3, - CesiumMath, - Rectangle) { - 'use strict'; +define([ + 'Core/ApproximateTerrainHeights', + 'Core/Cartesian3', + 'Core/Math', + 'Core/Rectangle' + ], function( + ApproximateTerrainHeights, + Cartesian3, + CesiumMath, + Rectangle) { + 'use strict'; + +describe('Core/ApproximateTerrainHeights', function() { beforeAll(function() { return ApproximateTerrainHeights.initialize(); @@ -68,3 +70,4 @@ defineSuite([ ApproximateTerrainHeights._terrainHeights = heights; }); }); +}); diff --git a/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js b/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js index a359e22a859d..f70c450e1ccf 100644 --- a/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js +++ b/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js @@ -1,30 +1,32 @@ -defineSuite([ - 'Core/ArcGISTiledElevationTerrainProvider', - 'Core/DefaultProxy', - 'Core/GeographicTilingScheme', - 'Core/HeightmapTerrainData', - 'Core/Math', - 'Core/Request', - 'Core/RequestScheduler', - 'Core/Resource', - 'Core/RuntimeError', - 'Core/TerrainProvider', - 'Core/WebMercatorTilingScheme', - 'Specs/pollToPromise' -], function( - ArcGISTiledElevationTerrainProvider, - DefaultProxy, - GeographicTilingScheme, - HeightmapTerrainData, - CesiumMath, - Request, - RequestScheduler, - Resource, - RuntimeError, - TerrainProvider, - WebMercatorTilingScheme, - pollToPromise) { -'use strict'; +define([ + 'Core/ArcGISTiledElevationTerrainProvider', + 'Core/DefaultProxy', + 'Core/GeographicTilingScheme', + 'Core/HeightmapTerrainData', + 'Core/Math', + 'Core/Request', + 'Core/RequestScheduler', + 'Core/Resource', + 'Core/RuntimeError', + 'Core/TerrainProvider', + 'Core/WebMercatorTilingScheme', + 'Specs/pollToPromise' + ], function( + ArcGISTiledElevationTerrainProvider, + DefaultProxy, + GeographicTilingScheme, + HeightmapTerrainData, + CesiumMath, + Request, + RequestScheduler, + Resource, + RuntimeError, + TerrainProvider, + WebMercatorTilingScheme, + pollToPromise) { + 'use strict'; + +describe('Core/ArcGISTiledElevationTerrainProvider', function() { var lercTileUrl = 'Data/Images/Red16x16.png'; var availability; @@ -476,3 +478,4 @@ describe('requestTileGeometry', function() { }); }); }); +}); diff --git a/Specs/Core/AssociativeArraySpec.js b/Specs/Core/AssociativeArraySpec.js index 499cd2ba1cde..b33745443c6d 100644 --- a/Specs/Core/AssociativeArraySpec.js +++ b/Specs/Core/AssociativeArraySpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/AssociativeArray' ], function( AssociativeArray) { - 'use strict'; + 'use strict'; + +describe('Core/AssociativeArray', function() { it('constructor has expected default values', function() { var associativeArray = new AssociativeArray(); @@ -76,3 +78,4 @@ defineSuite([ expect(associativeArray.remove(undefined)).toBe(false); }); }); +}); diff --git a/Specs/Core/AttributeCompressionSpec.js b/Specs/Core/AttributeCompressionSpec.js index 4addf8add446..55ce4c469301 100644 --- a/Specs/Core/AttributeCompressionSpec.js +++ b/Specs/Core/AttributeCompressionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/AttributeCompression', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Cartesian4, defined, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/AttributeCompression', function() { var negativeUnitZ = new Cartesian3(0.0, 0.0, -1.0); it('oct decode(0, 0)', function() { @@ -742,3 +744,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/AxisAlignedBoundingBoxSpec.js b/Specs/Core/AxisAlignedBoundingBoxSpec.js index 04cf929e20e5..6b5cf9237b8c 100644 --- a/Specs/Core/AxisAlignedBoundingBoxSpec.js +++ b/Specs/Core/AxisAlignedBoundingBoxSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/AxisAlignedBoundingBox', 'Core/Cartesian3', 'Core/Intersect', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, Intersect, Plane) { - 'use strict'; + 'use strict'; + +describe('Core/AxisAlignedBoundingBox', function() { var positions = [ new Cartesian3(3, -1, -3), @@ -162,3 +164,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/BingMapsApiSpec.js b/Specs/Core/BingMapsApiSpec.js index b8fd17921bfc..6d1f1e839c76 100644 --- a/Specs/Core/BingMapsApiSpec.js +++ b/Specs/Core/BingMapsApiSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/BingMapsApi' ], function( BingMapsApi) { - 'use strict'; + 'use strict'; + +describe('Core/BingMapsApi', function() { it('getKey returns provided key if one is provided', function() { expect(BingMapsApi.getKey('foo')).toEqual('foo'); @@ -15,3 +17,4 @@ defineSuite([ BingMapsApi.defaultKey = oldKey; }); }); +}); diff --git a/Specs/Core/BingMapsGeocoderServiceSpec.js b/Specs/Core/BingMapsGeocoderServiceSpec.js index b659e28215d5..560a01e21789 100644 --- a/Specs/Core/BingMapsGeocoderServiceSpec.js +++ b/Specs/Core/BingMapsGeocoderServiceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BingMapsGeocoderService', 'Core/Rectangle', 'Core/Resource' @@ -6,7 +6,9 @@ defineSuite([ BingMapsGeocoderService, Rectangle, Resource) { - 'use strict'; + 'use strict'; + +describe('Core/BingMapsGeocoderService', function() { afterAll(function() { Resource._Implementations.loadAndExecuteScript = Resource._DefaultImplementations.loadAndExecuteScript; @@ -66,3 +68,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/BoundingRectangleSpec.js b/Specs/Core/BoundingRectangleSpec.js index bc849a0dffb0..8c0871779d2b 100644 --- a/Specs/Core/BoundingRectangleSpec.js +++ b/Specs/Core/BoundingRectangleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingRectangle', 'Core/Cartesian2', 'Core/Ellipsoid', @@ -14,7 +14,9 @@ defineSuite([ Intersect, Rectangle, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingRectangle', function() { it('default constructor sets expected values', function() { var rectangle = new BoundingRectangle(); @@ -257,3 +259,4 @@ defineSuite([ createPackableSpecs(BoundingRectangle, new BoundingRectangle(1, 2, 3, 4), [1, 2, 3, 4]); }); +}); diff --git a/Specs/Core/BoundingSphereSpec.js b/Specs/Core/BoundingSphereSpec.js index 1dcc7711dab7..183c92835338 100644 --- a/Specs/Core/BoundingSphereSpec.js +++ b/Specs/Core/BoundingSphereSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingSphere', 'Core/Cartesian3', 'Core/Cartographic', @@ -28,7 +28,9 @@ defineSuite([ Plane, Rectangle, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingSphere', function() { var positionsRadius = 1.0; var positionsCenter = new Cartesian3(10000001.0, 0.0, 0.0); @@ -915,3 +917,4 @@ defineSuite([ createPackableSpecs(BoundingSphere, new BoundingSphere(new Cartesian3(1.0, 2.0, 3.0), 4.0), [1.0, 2.0, 3.0, 4.0]); }); +}); diff --git a/Specs/Core/BoxGeometrySpec.js b/Specs/Core/BoxGeometrySpec.js index 6f8e4cdd70e8..77fd20b5188d 100644 --- a/Specs/Core/BoxGeometrySpec.js +++ b/Specs/Core/BoxGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoxGeometry', 'Core/arrayFill', 'Core/AxisAlignedBoundingBox', @@ -14,7 +14,9 @@ defineSuite([ GeometryOffsetAttribute, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/BoxGeometry', function() { it('constructor throws without maximum corner', function() { expect(function() { @@ -140,3 +142,4 @@ defineSuite([ vertexFormat : VertexFormat.POSITION_AND_NORMAL }), [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, -1.0]); }); +}); diff --git a/Specs/Core/BoxOutlineGeometrySpec.js b/Specs/Core/BoxOutlineGeometrySpec.js index d5a8e34d1631..eac48a86ec07 100644 --- a/Specs/Core/BoxOutlineGeometrySpec.js +++ b/Specs/Core/BoxOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoxOutlineGeometry', 'Core/arrayFill', 'Core/AxisAlignedBoundingBox', @@ -12,7 +12,9 @@ defineSuite([ Cartesian3, GeometryOffsetAttribute, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/BoxOutlineGeometry', function() { it('constructor throws without maximum corner', function() { expect(function() { @@ -110,3 +112,4 @@ defineSuite([ maximum : new Cartesian3(4.0, 5.0, 6.0) }), [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, -1.0]); }); +}); diff --git a/Specs/Core/Cartesian2Spec.js b/Specs/Core/Cartesian2Spec.js index 16ba027c7cea..3a82479eb9db 100644 --- a/Specs/Core/Cartesian2Spec.js +++ b/Specs/Core/Cartesian2Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian2', 'Core/Math', 'Specs/createPackableArraySpecs', @@ -8,7 +8,9 @@ defineSuite([ CesiumMath, createPackableArraySpecs, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian2', function() { it('construct with default values', function() { var cartesian = new Cartesian2(); @@ -850,3 +852,4 @@ defineSuite([ createPackableSpecs(Cartesian2, new Cartesian2(1, 2), [1, 2]); createPackableArraySpecs(Cartesian2, [new Cartesian2(1, 2), new Cartesian2(3, 4)], [1, 2, 3, 4]); }); +}); diff --git a/Specs/Core/Cartesian3Spec.js b/Specs/Core/Cartesian3Spec.js index 0238e56a7650..1b8c5437d6a9 100644 --- a/Specs/Core/Cartesian3Spec.js +++ b/Specs/Core/Cartesian3Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Cartographic', 'Core/Ellipsoid', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, createPackableArraySpecs, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { it('construct with default values', function() { var cartesian = new Cartesian3(); @@ -1296,3 +1298,4 @@ defineSuite([ createPackableSpecs(Cartesian3, new Cartesian3(1, 2, 3), [1, 2, 3]); createPackableArraySpecs(Cartesian3, [new Cartesian3(1, 2, 3), new Cartesian3(4, 5, 6)], [1, 2, 3, 4, 5, 6]); }); +}); diff --git a/Specs/Core/Cartesian4Spec.js b/Specs/Core/Cartesian4Spec.js index 69c00533355d..d922f5d05e13 100644 --- a/Specs/Core/Cartesian4Spec.js +++ b/Specs/Core/Cartesian4Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian4', 'Core/Color', 'Core/Math', @@ -10,7 +10,9 @@ defineSuite([ CesiumMath, createPackableArraySpecs, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian4', function() { it('construct with default values', function() { var cartesian = new Cartesian4(); @@ -964,3 +966,4 @@ defineSuite([ createPackableSpecs(Cartesian4, new Cartesian4(1, 2, 3, 4), [1, 2, 3, 4]); createPackableArraySpecs(Cartesian4, [new Cartesian4(1, 2, 3, 4), new Cartesian4(5, 6, 7, 8)], [1, 2, 3, 4, 5, 6, 7, 8]); }); +}); diff --git a/Specs/Core/CartographicGeocoderServiceSpec.js b/Specs/Core/CartographicGeocoderServiceSpec.js index 87aba42c956c..57f705fb6e1e 100644 --- a/Specs/Core/CartographicGeocoderServiceSpec.js +++ b/Specs/Core/CartographicGeocoderServiceSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/CartographicGeocoderService', 'Core/Cartesian3' ], function( CartographicGeocoderService, Cartesian3) { - 'use strict'; + 'use strict'; + +describe('Core/CartographicGeocoderService', function() { var service = new CartographicGeocoderService(); @@ -78,3 +80,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/CartographicSpec.js b/Specs/Core/CartographicSpec.js index d312e3fc9a57..002f7a794c5c 100644 --- a/Specs/Core/CartographicSpec.js +++ b/Specs/Core/CartographicSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartographic', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, Ellipsoid, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/Cartographic', function() { var surfaceCartesian = new Cartesian3(4094327.7921465295, 1909216.4044747739, 4487348.4088659193); var surfaceCartographic = new Cartographic(CesiumMath.toRadians(25.0), CesiumMath.toRadians(45.0), 0.0); @@ -195,3 +197,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/CatmullRomSplineSpec.js b/Specs/Core/CatmullRomSplineSpec.js index 685ad309c458..f1b85d377de3 100644 --- a/Specs/Core/CatmullRomSplineSpec.js +++ b/Specs/Core/CatmullRomSplineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CatmullRomSpline', 'Core/Cartesian3', 'Core/HermiteSpline', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, HermiteSpline, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/CatmullRomSpline', function() { var points; var times; @@ -171,3 +173,4 @@ defineSuite([ expect(actual).toEqual(Cartesian3.lerp(points[0], points[1], t, new Cartesian3())); }); }); +}); diff --git a/Specs/Core/CesiumTerrainProviderSpec.js b/Specs/Core/CesiumTerrainProviderSpec.js index df0b4d2bb816..8219829dcc50 100644 --- a/Specs/Core/CesiumTerrainProviderSpec.js +++ b/Specs/Core/CesiumTerrainProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CesiumTerrainProvider', 'Core/DefaultProxy', 'Core/Ellipsoid', @@ -30,7 +30,9 @@ defineSuite([ TerrainProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Core/CesiumTerrainProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -868,3 +870,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/CheckSpec.js b/Specs/Core/CheckSpec.js index 714da0248acb..0aee5fb6ab9f 100644 --- a/Specs/Core/CheckSpec.js +++ b/Specs/Core/CheckSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Check' ], function( Check) { - 'use strict'; + 'use strict'; + +describe('Core/Check', function() { describe('type checks', function () { it('Check.typeOf.bool does not throw when passed a boolean', function () { @@ -255,3 +257,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/CircleGeometrySpec.js b/Specs/Core/CircleGeometrySpec.js index aa4e4a2dc35e..3d0c4b42011e 100644 --- a/Specs/Core/CircleGeometrySpec.js +++ b/Specs/Core/CircleGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CircleGeometry', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CircleGeometry', function() { it('throws without a center', function() { expect(function() { @@ -196,3 +198,4 @@ defineSuite([ var packedInstance = [center.x, center.y, center.z, ellipsoid.radii.x, ellipsoid.radii.y, ellipsoid.radii.z, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, CesiumMath.PI_OVER_TWO, 0.0, 0.1, 0.0, 0.0, -1]; createPackableSpecs(CircleGeometry, packableInstance, packedInstance); }); +}); diff --git a/Specs/Core/CircleOutlineGeometrySpec.js b/Specs/Core/CircleOutlineGeometrySpec.js index 916e1c203e35..d5a00de27ecd 100644 --- a/Specs/Core/CircleOutlineGeometrySpec.js +++ b/Specs/Core/CircleOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CircleOutlineGeometry', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, Ellipsoid, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CircleOutlineGeometry', function() { it('throws without a center', function() { expect(function() { @@ -119,3 +121,4 @@ defineSuite([ packedInstance = [center.x, center.y, center.z, ellipsoid.radii.x, ellipsoid.radii.y, ellipsoid.radii.z, 2, 2, 0, 5, 1, 5, 4, -1]; createPackableSpecs(CircleOutlineGeometry, packableInstance, packedInstance, 'at height'); }); +}); diff --git a/Specs/Core/ClockSpec.js b/Specs/Core/ClockSpec.js index c2a26142df60..8a7b05a5cb89 100644 --- a/Specs/Core/ClockSpec.js +++ b/Specs/Core/ClockSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Clock', 'Core/ClockRange', 'Core/ClockStep', @@ -10,7 +10,9 @@ defineSuite([ ClockStep, defined, JulianDate) { - 'use strict'; + 'use strict'; + +describe('Core/Clock', function() { it('sets default parameters when constructed', function() { var clock = new Clock(); @@ -604,3 +606,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/ColorGeometryInstanceAttributeSpec.js b/Specs/Core/ColorGeometryInstanceAttributeSpec.js index ff55201dc65b..607149bd12c2 100644 --- a/Specs/Core/ColorGeometryInstanceAttributeSpec.js +++ b/Specs/Core/ColorGeometryInstanceAttributeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/ColorGeometryInstanceAttribute', 'Core/Color', 'Core/ComponentDatatype' @@ -6,7 +6,9 @@ defineSuite([ ColorGeometryInstanceAttribute, Color, ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Core/ColorGeometryInstanceAttribute', function() { it('constructor', function() { var attribute = new ColorGeometryInstanceAttribute(1.0, 1.0, 0.0, 0.5); @@ -68,3 +70,4 @@ defineSuite([ expect(ColorGeometryInstanceAttribute.equals(undefined, color)).toEqual(false); }); }); +}); diff --git a/Specs/Core/ColorSpec.js b/Specs/Core/ColorSpec.js index 2b36be98da71..b36b064dff0b 100644 --- a/Specs/Core/ColorSpec.js +++ b/Specs/Core/ColorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Color', 'Core/Cartesian4', 'Core/Math', @@ -8,7 +8,9 @@ defineSuite([ Cartesian4, CesiumMath, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Color', function() { it('Constructing without arguments produces expected defaults', function() { var v = new Color(); @@ -750,3 +752,4 @@ defineSuite([ createPackableSpecs(Color, new Color(0.1, 0.2, 0.3, 0.4), [0.1, 0.2, 0.3, 0.4]); }); +}); diff --git a/Specs/Core/ComponentDatatypeSpec.js b/Specs/Core/ComponentDatatypeSpec.js index 6e41114fc2cd..6f33cabd16c7 100644 --- a/Specs/Core/ComponentDatatypeSpec.js +++ b/Specs/Core/ComponentDatatypeSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/ComponentDatatype' ], function( ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Core/ComponentDatatype', function() { it('fromTypedArray works', function() { expect(ComponentDatatype.fromTypedArray(new Int8Array())).toBe(ComponentDatatype.BYTE); @@ -166,3 +168,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/CoplanarPolygonGeometrySpec.js b/Specs/Core/CoplanarPolygonGeometrySpec.js index 4fbfc82bbcbf..72968e49bbf7 100644 --- a/Specs/Core/CoplanarPolygonGeometrySpec.js +++ b/Specs/Core/CoplanarPolygonGeometrySpec.js @@ -1,18 +1,20 @@ -defineSuite([ - 'Core/CoplanarPolygonGeometry', - 'Core/Cartesian3', - 'Core/Ellipsoid', - 'Core/Math', - 'Core/VertexFormat', - 'Specs/createPackableSpecs' -], function( - CoplanarPolygonGeometry, - Cartesian3, - Ellipsoid, - CesiumMath, - VertexFormat, - createPackableSpecs) { - 'use strict'; +define([ + 'Core/CoplanarPolygonGeometry', + 'Core/Cartesian3', + 'Core/Ellipsoid', + 'Core/Math', + 'Core/VertexFormat', + 'Specs/createPackableSpecs' + ], function( + CoplanarPolygonGeometry, + Cartesian3, + Ellipsoid, + CesiumMath, + VertexFormat, + createPackableSpecs) { + 'use strict'; + +describe('Core/CoplanarPolygonGeometry', function() { it('throws with no hierarchy', function() { expect(function() { @@ -172,3 +174,4 @@ defineSuite([ createPackableSpecs(CoplanarPolygonGeometry, polygon, packedInstance); }); +}); diff --git a/Specs/Core/CoplanarPolygonOutlineGeometrySpec.js b/Specs/Core/CoplanarPolygonOutlineGeometrySpec.js index def211582b09..426cb474abb5 100644 --- a/Specs/Core/CoplanarPolygonOutlineGeometrySpec.js +++ b/Specs/Core/CoplanarPolygonOutlineGeometrySpec.js @@ -1,16 +1,18 @@ -defineSuite([ - 'Core/CoplanarPolygonOutlineGeometry', - 'Core/Cartesian3', - 'Core/Ellipsoid', - 'Core/Math', - 'Specs/createPackableSpecs' -], function( - CoplanarPolygonOutlineGeometry, - Cartesian3, - Ellipsoid, - CesiumMath, - createPackableSpecs) { - 'use strict'; +define([ + 'Core/CoplanarPolygonOutlineGeometry', + 'Core/Cartesian3', + 'Core/Ellipsoid', + 'Core/Math', + 'Specs/createPackableSpecs' + ], function( + CoplanarPolygonOutlineGeometry, + Cartesian3, + Ellipsoid, + CesiumMath, + createPackableSpecs) { + 'use strict'; + +describe('Core/CoplanarPolygonOutlineGeometry', function() { it('throws with no hierarchy', function() { expect(function() { @@ -124,3 +126,4 @@ defineSuite([ createPackableSpecs(CoplanarPolygonOutlineGeometry, polygon, packedInstance); }); +}); diff --git a/Specs/Core/CorridorGeometrySpec.js b/Specs/Core/CorridorGeometrySpec.js index ad44edadd265..15afc0d8a8b3 100644 --- a/Specs/Core/CorridorGeometrySpec.js +++ b/Specs/Core/CorridorGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CorridorGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -20,7 +20,9 @@ defineSuite([ Rectangle, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CorridorGeometry', function() { it('throws without positions', function() { expect(function() { @@ -435,3 +437,4 @@ defineSuite([ packedInstance.push(30000.0, 0.0, 0.0, 2.0, 0.1, 0.0, -1); createPackableSpecs(CorridorGeometry, corridor, packedInstance); }); +}); diff --git a/Specs/Core/CorridorOutlineGeometrySpec.js b/Specs/Core/CorridorOutlineGeometrySpec.js index c1b31b935174..f327b85f17b1 100644 --- a/Specs/Core/CorridorOutlineGeometrySpec.js +++ b/Specs/Core/CorridorOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CorridorOutlineGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ Ellipsoid, GeometryOffsetAttribute, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CorridorOutlineGeometry', function() { it('throws without positions', function() { expect(function() { @@ -248,3 +250,4 @@ defineSuite([ packedInstance.push(30000.0, 0.0, 0.0, 2.0, 0.1, -1); createPackableSpecs(CorridorOutlineGeometry, corridor, packedInstance); }); +}); diff --git a/Specs/Core/CubicRealPolynomialSpec.js b/Specs/Core/CubicRealPolynomialSpec.js index e43d66886fea..628c36d1726f 100644 --- a/Specs/Core/CubicRealPolynomialSpec.js +++ b/Specs/Core/CubicRealPolynomialSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/CubicRealPolynomial', 'Core/Math' ], function( CubicRealPolynomial, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/CubicRealPolynomial', function() { it('discriminant throws without a', function() { expect(function() { @@ -133,3 +135,4 @@ defineSuite([ expect(roots[0]).toEqual(0.0); }); }); +}); diff --git a/Specs/Core/CullingVolumeSpec.js b/Specs/Core/CullingVolumeSpec.js index b934eac9fe35..22a87e7f7a72 100644 --- a/Specs/Core/CullingVolumeSpec.js +++ b/Specs/Core/CullingVolumeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CullingVolume', 'Core/AxisAlignedBoundingBox', 'Core/BoundingSphere', @@ -12,7 +12,9 @@ defineSuite([ Cartesian3, Intersect, PerspectiveFrustum) { - 'use strict'; + 'use strict'; + +describe('Core/CullingVolume', function() { var cullingVolume; @@ -403,3 +405,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/CylinderGeometrySpec.js b/Specs/Core/CylinderGeometrySpec.js index 3db2ed5350ba..9295ca2f8230 100644 --- a/Specs/Core/CylinderGeometrySpec.js +++ b/Specs/Core/CylinderGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CylinderGeometry', 'Core/arrayFill', 'Core/GeometryOffsetAttribute', @@ -10,7 +10,9 @@ defineSuite([ GeometryOffsetAttribute, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CylinderGeometry', function() { it('constructor throws with no length', function() { expect(function() { @@ -181,3 +183,4 @@ defineSuite([ var packedInstance = [1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 3.0, -1.0]; createPackableSpecs(CylinderGeometry, cylinder, packedInstance); }); +}); diff --git a/Specs/Core/CylinderOutlineGeometrySpec.js b/Specs/Core/CylinderOutlineGeometrySpec.js index 36d9803593aa..8726ffd4ff8d 100644 --- a/Specs/Core/CylinderOutlineGeometrySpec.js +++ b/Specs/Core/CylinderOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/CylinderOutlineGeometry', 'Core/arrayFill', 'Core/GeometryOffsetAttribute', @@ -8,7 +8,9 @@ defineSuite([ arrayFill, GeometryOffsetAttribute, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/CylinderOutlineGeometry', function() { it('constructor throws with no length', function() { expect(function() { @@ -141,3 +143,4 @@ defineSuite([ var packedInstance = [1.0, 1.0, 0.0, 3.0, 0.0, -1.0]; createPackableSpecs(CylinderOutlineGeometry, cylinder, packedInstance); }); +}); diff --git a/Specs/Core/DeveloperErrorSpec.js b/Specs/Core/DeveloperErrorSpec.js index 828f68551968..d9c4222fec50 100644 --- a/Specs/Core/DeveloperErrorSpec.js +++ b/Specs/Core/DeveloperErrorSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/DeveloperError' ], function( DeveloperError) { - 'use strict'; + 'use strict'; + +describe('Core/DeveloperError', function() { var name = 'DeveloperError'; var testMessage = 'Testing'; @@ -31,3 +33,4 @@ defineSuite([ expect(str).toContain('Core/DeveloperErrorSpec.js'); }); }); +}); diff --git a/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js b/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js index 7cdd3e1b2542..3a8c93b09a7d 100644 --- a/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js +++ b/Specs/Core/DistanceDisplayConditionGeometryInstanceAttributeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/DistanceDisplayConditionGeometryInstanceAttribute', 'Core/ComponentDatatype', 'Core/DistanceDisplayCondition' @@ -6,7 +6,9 @@ defineSuite([ DistanceDisplayConditionGeometryInstanceAttribute, ComponentDatatype, DistanceDisplayCondition) { - 'use strict'; + 'use strict'; + +describe('Core/DistanceDisplayConditionGeometryInstanceAttribute', function() { it('constructor', function() { var attribute = new DistanceDisplayConditionGeometryInstanceAttribute(10.0, 100.0); @@ -68,3 +70,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/DistanceDisplayConditionSpec.js b/Specs/Core/DistanceDisplayConditionSpec.js index 88789b40ad7d..864b71351974 100644 --- a/Specs/Core/DistanceDisplayConditionSpec.js +++ b/Specs/Core/DistanceDisplayConditionSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/DistanceDisplayCondition', 'Specs/createPackableSpecs' ], function( DistanceDisplayCondition, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/DistanceDisplayCondition', function() { it('default constructs', function() { var dc = new DistanceDisplayCondition(); @@ -92,3 +94,4 @@ defineSuite([ createPackableSpecs(DistanceDisplayCondition, new DistanceDisplayCondition(1, 2), [1, 2]); }); +}); diff --git a/Specs/Core/DoublyLinkedListSpec.js b/Specs/Core/DoublyLinkedListSpec.js index 1874ccc7fff4..c3603071dc60 100644 --- a/Specs/Core/DoublyLinkedListSpec.js +++ b/Specs/Core/DoublyLinkedListSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/DoublyLinkedList' ], function( DoublyLinkedList) { - 'use strict'; + 'use strict'; + +describe('Core/DoublyLinkedList', function() { it('constructs', function() { var list = new DoublyLinkedList(); @@ -365,3 +367,4 @@ defineSuite([ expectOrder(list, [node, node3, node2, node4]); }); }); +}); diff --git a/Specs/Core/EarthOrientationParametersSpec.js b/Specs/Core/EarthOrientationParametersSpec.js index a490687bf323..6ef610efa988 100644 --- a/Specs/Core/EarthOrientationParametersSpec.js +++ b/Specs/Core/EarthOrientationParametersSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EarthOrientationParameters', 'Core/defined', 'Core/JulianDate', @@ -8,7 +8,9 @@ defineSuite([ defined, JulianDate, TimeStandard) { - 'use strict'; + 'use strict'; + +describe('Core/EarthOrientationParameters', function() { var officialLeapSeconds; @@ -192,3 +194,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/EllipseGeometrySpec.js b/Specs/Core/EllipseGeometrySpec.js index c4041f75c491..97d628556142 100644 --- a/Specs/Core/EllipseGeometrySpec.js +++ b/Specs/Core/EllipseGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipseGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -18,7 +18,9 @@ defineSuite([ Rectangle, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/EllipseGeometry', function() { it('throws without a center', function() { expect(function() { @@ -421,3 +423,4 @@ defineSuite([ createPackableSpecs(EllipseGeometry, packableInstance, packedInstance); }); +}); diff --git a/Specs/Core/EllipseOutlineGeometrySpec.js b/Specs/Core/EllipseOutlineGeometrySpec.js index 763b9b8dd124..628252ddddea 100644 --- a/Specs/Core/EllipseOutlineGeometrySpec.js +++ b/Specs/Core/EllipseOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipseOutlineGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Ellipsoid, GeometryOffsetAttribute, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/EllipseOutlineGeometry', function() { it('throws without a center', function() { expect(function() { @@ -231,3 +233,4 @@ defineSuite([ packedInstance = [center.x, center.y, center.z, ellipsoid.radii.x, ellipsoid.radii.y, ellipsoid.radii.z, 3, 2, 6, 5, 1, 5, 4, -1]; createPackableSpecs(EllipseOutlineGeometry, packableInstance, packedInstance, 'at height'); }); +}); diff --git a/Specs/Core/EllipsoidGeodesicSpec.js b/Specs/Core/EllipsoidGeodesicSpec.js index b8fb030314bb..9582348d081b 100644 --- a/Specs/Core/EllipsoidGeodesicSpec.js +++ b/Specs/Core/EllipsoidGeodesicSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidGeodesic', 'Core/Cartographic', 'Core/Ellipsoid', @@ -8,7 +8,9 @@ defineSuite([ Cartographic, Ellipsoid, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidGeodesic', function() { it('throws without start', function() { expect(function() { @@ -244,3 +246,4 @@ defineSuite([ expect(expectedMid.latitude).toEqualEpsilon(result.latitude, CesiumMath.EPSILON13); }); }); +}); diff --git a/Specs/Core/EllipsoidGeometrySpec.js b/Specs/Core/EllipsoidGeometrySpec.js index 0fcbdb8cf3dd..f8fe87f568bd 100644 --- a/Specs/Core/EllipsoidGeometrySpec.js +++ b/Specs/Core/EllipsoidGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidGeometry', function() { it('constructor rounds floating-point slicePartitions', function() { var m = new EllipsoidGeometry({ @@ -172,3 +174,4 @@ defineSuite([ var packedInstance = [1.0, 2.0, 3.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 3.0, 3.0, -1.0]; createPackableSpecs(EllipsoidGeometry, ellipsoidgeometry, packedInstance); }); +}); diff --git a/Specs/Core/EllipsoidOutlineGeometrySpec.js b/Specs/Core/EllipsoidOutlineGeometrySpec.js index b1954b656966..c0cd4c58530b 100644 --- a/Specs/Core/EllipsoidOutlineGeometrySpec.js +++ b/Specs/Core/EllipsoidOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidOutlineGeometry', 'Core/arrayFill', 'Core/Cartesian3', @@ -10,7 +10,9 @@ defineSuite([ Cartesian3, GeometryOffsetAttribute, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidOutlineGeometry', function() { it('constructor throws if stackPartitions less than 1', function() { expect(function() { @@ -137,3 +139,4 @@ defineSuite([ var packedInstance = [1.0, 2.0, 3.0, 3.0, 3.0, 3.0, -1.0]; createPackableSpecs(EllipsoidOutlineGeometry, ellipsoidgeometry, packedInstance); }); +}); diff --git a/Specs/Core/EllipsoidRhumbLineSpec.js b/Specs/Core/EllipsoidRhumbLineSpec.js index a644f58c17ad..ecdbfa9bb616 100644 --- a/Specs/Core/EllipsoidRhumbLineSpec.js +++ b/Specs/Core/EllipsoidRhumbLineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidRhumbLine', 'Core/Cartographic', 'Core/Ellipsoid', @@ -10,7 +10,9 @@ defineSuite([ Ellipsoid, EllipsoidGeodesic, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidRhumbLine', function() { var oneDegree = CesiumMath.RADIANS_PER_DEGREE; var fifteenDegrees = Math.PI / 12; @@ -650,3 +652,4 @@ defineSuite([ expect(Cartographic.equalsEpsilon(midpointUsingInterpolation, midpointUsingIntersection, CesiumMath.EPSILON12)).toBe(true); }); }); +}); diff --git a/Specs/Core/EllipsoidSpec.js b/Specs/Core/EllipsoidSpec.js index 068f4159da83..adf6eb3666ef 100644 --- a/Specs/Core/EllipsoidSpec.js +++ b/Specs/Core/EllipsoidSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Ellipsoid', 'Core/Cartesian3', 'Core/Cartographic', @@ -10,7 +10,9 @@ defineSuite([ Cartographic, CesiumMath, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Ellipsoid', function() { var radii = new Cartesian3(1.0, 2.0, 3.0); var radiiSquared = Cartesian3.multiplyComponents(radii, radii, new Cartesian3()); @@ -544,3 +546,4 @@ defineSuite([ createPackableSpecs(Ellipsoid, Ellipsoid.WGS84, [Ellipsoid.WGS84.radii.x, Ellipsoid.WGS84.radii.y, Ellipsoid.WGS84.radii.z]); }); +}); diff --git a/Specs/Core/EllipsoidTangentPlaneSpec.js b/Specs/Core/EllipsoidTangentPlaneSpec.js index cc980b83546a..09e5414aec0f 100644 --- a/Specs/Core/EllipsoidTangentPlaneSpec.js +++ b/Specs/Core/EllipsoidTangentPlaneSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidTangentPlane', 'Core/Cartesian2', 'Core/Cartesian3', @@ -8,7 +8,9 @@ defineSuite([ Cartesian2, Cartesian3, Ellipsoid) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidTangentPlane', function() { it('constructor defaults to WGS84', function() { var origin = new Cartesian3(Ellipsoid.WGS84.radii.x, 0.0, 0.0); @@ -284,3 +286,4 @@ defineSuite([ expect(positionsBack[0].z).toBeCloseTo(points[0].z); }); }); +}); diff --git a/Specs/Core/EllipsoidTerrainProviderSpec.js b/Specs/Core/EllipsoidTerrainProviderSpec.js index 539df7690da4..eeec1e159e21 100644 --- a/Specs/Core/EllipsoidTerrainProviderSpec.js +++ b/Specs/Core/EllipsoidTerrainProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidTerrainProvider', 'Core/TerrainProvider', 'Specs/createContext' @@ -6,7 +6,9 @@ defineSuite([ EllipsoidTerrainProvider, TerrainProvider, createContext) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidTerrainProvider', function() { var context; @@ -48,3 +50,4 @@ defineSuite([ expect(provider.getTileDataAvailable()).toBeUndefined(); }); }, 'WebGL'); +}); diff --git a/Specs/Core/EllipsoidalOccluderSpec.js b/Specs/Core/EllipsoidalOccluderSpec.js index 8bab406cea96..b7e7be9c3bf9 100644 --- a/Specs/Core/EllipsoidalOccluderSpec.js +++ b/Specs/Core/EllipsoidalOccluderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/EllipsoidalOccluder', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -16,7 +16,9 @@ defineSuite([ CesiumMath, Ray, Rectangle) { - 'use strict'; + 'use strict'; + +describe('Core/EllipsoidalOccluder', function() { it('uses ellipsoid', function() { var ellipsoid = new Ellipsoid(2.0, 3.0, 4.0); @@ -295,3 +297,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/EncodedCartesian3Spec.js b/Specs/Core/EncodedCartesian3Spec.js index a3571f12e3c5..9d4ccaa5014f 100644 --- a/Specs/Core/EncodedCartesian3Spec.js +++ b/Specs/Core/EncodedCartesian3Spec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/EncodedCartesian3', 'Core/Cartesian3' ], function( EncodedCartesian3, Cartesian3) { - 'use strict'; + 'use strict'; + +describe('Core/EncodedCartesian3', function() { it('construct with default values', function() { var encoded = new EncodedCartesian3(); @@ -104,3 +106,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/EventSpec.js b/Specs/Core/EventSpec.js index 1134fe10d034..cb938d05e0da 100644 --- a/Specs/Core/EventSpec.js +++ b/Specs/Core/EventSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Event' ], function( Event) { - 'use strict'; + 'use strict'; + +describe('Core/Event', function() { var event; var spyListener; @@ -221,3 +223,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/FeatureDetectionSpec.js b/Specs/Core/FeatureDetectionSpec.js index eb8d4d909d8d..9708b3b29951 100644 --- a/Specs/Core/FeatureDetectionSpec.js +++ b/Specs/Core/FeatureDetectionSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/FeatureDetection' ], function( FeatureDetection) { - 'use strict'; + 'use strict'; + +describe('Core/FeatureDetection', function() { //generally, these tests just make sure the function runs, the test can't expect a value of true or false it('detects fullscreen support', function() { @@ -135,3 +137,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/FrustumGeometrySpec.js b/Specs/Core/FrustumGeometrySpec.js index 0b9f5669fc6d..bb63b9904bba 100644 --- a/Specs/Core/FrustumGeometrySpec.js +++ b/Specs/Core/FrustumGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/FrustumGeometry', 'Core/Cartesian3', 'Core/Math', @@ -14,7 +14,9 @@ defineSuite([ Quaternion, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/FrustumGeometry', function() { it('constructor throws without options', function() { expect(function() { @@ -91,3 +93,4 @@ defineSuite([ vertexFormat : VertexFormat.POSITION_ONLY }), [0.0, 1.0, 2.0, 3.0, 4.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0]); }); +}); diff --git a/Specs/Core/FrustumOutlineGeometrySpec.js b/Specs/Core/FrustumOutlineGeometrySpec.js index e47e2207d8f0..cdc5a10f0a4b 100644 --- a/Specs/Core/FrustumOutlineGeometrySpec.js +++ b/Specs/Core/FrustumOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/FrustumOutlineGeometry', 'Core/Cartesian3', 'Core/Math', @@ -14,7 +14,9 @@ defineSuite([ Quaternion, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/FrustumOutlineGeometry', function() { it('constructor throws without options', function() { expect(function() { @@ -85,3 +87,4 @@ defineSuite([ vertexFormat : VertexFormat.POSITION_ONLY }), [0.0, 1.0, 2.0, 3.0, 4.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0]); }); +}); diff --git a/Specs/Core/FullscreenSpec.js b/Specs/Core/FullscreenSpec.js index 03ba58d0374d..e57fa35b2f3e 100644 --- a/Specs/Core/FullscreenSpec.js +++ b/Specs/Core/FullscreenSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/Fullscreen', 'Core/FeatureDetection' ], function( Fullscreen, FeatureDetection) { - 'use strict'; + 'use strict'; + +describe('Core/Fullscreen', function() { it('can tell if fullscreen is supported', function() { // just make sure the function runs, the test can't expect a particular result. @@ -73,3 +75,4 @@ defineSuite([ }); } }); +}); diff --git a/Specs/Core/GeographicProjectionSpec.js b/Specs/Core/GeographicProjectionSpec.js index f6e9ea1b6e91..f63d21342acf 100644 --- a/Specs/Core/GeographicProjectionSpec.js +++ b/Specs/Core/GeographicProjectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GeographicProjection', 'Core/Cartesian3', 'Core/Cartographic', @@ -10,7 +10,9 @@ defineSuite([ Cartographic, Ellipsoid, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/GeographicProjection', function() { it('construct0', function() { var projection = new GeographicProjection(); @@ -81,3 +83,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/GeographicTilingSchemeSpec.js b/Specs/Core/GeographicTilingSchemeSpec.js index 0d406aea57c7..bec684860e56 100644 --- a/Specs/Core/GeographicTilingSchemeSpec.js +++ b/Specs/Core/GeographicTilingSchemeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GeographicTilingScheme', 'Core/Cartesian2', 'Core/Cartographic', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Rectangle, TilingScheme) { - 'use strict'; + 'use strict'; + +describe('Core/GeographicTilingScheme', function() { it('conforms to TilingScheme interface.', function() { expect(GeographicTilingScheme).toConformToInterface(TilingScheme); @@ -178,3 +180,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/GeometryAttributeSpec.js b/Specs/Core/GeometryAttributeSpec.js index af1b2fc3fb91..0ad53060f017 100644 --- a/Specs/Core/GeometryAttributeSpec.js +++ b/Specs/Core/GeometryAttributeSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/GeometryAttribute', 'Core/ComponentDatatype' ], function( GeometryAttribute, ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Core/GeometryAttribute', function() { it('constructor', function() { var color = new GeometryAttribute({ @@ -78,3 +80,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/GeometryInstanceAttributeSpec.js b/Specs/Core/GeometryInstanceAttributeSpec.js index 88f103d601cd..94d4d149a03c 100644 --- a/Specs/Core/GeometryInstanceAttributeSpec.js +++ b/Specs/Core/GeometryInstanceAttributeSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/GeometryInstanceAttribute', 'Core/ComponentDatatype' ], function( GeometryInstanceAttribute, ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Core/GeometryInstanceAttribute', function() { it('constructor', function() { var color = new GeometryInstanceAttribute({ @@ -58,3 +60,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/GeometryInstanceSpec.js b/Specs/Core/GeometryInstanceSpec.js index e599ad46aeeb..739484ee9c39 100644 --- a/Specs/Core/GeometryInstanceSpec.js +++ b/Specs/Core/GeometryInstanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GeometryInstance', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -18,7 +18,9 @@ defineSuite([ GeometryInstanceAttribute, Matrix4, PrimitiveType) { - 'use strict'; + 'use strict'; + +describe('Core/GeometryInstance', function() { it('constructor', function() { var geometry = new Geometry({ @@ -66,3 +68,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/GeometryPipelineSpec.js b/Specs/Core/GeometryPipelineSpec.js index 53db1c40525b..79fac3225162 100644 --- a/Specs/Core/GeometryPipelineSpec.js +++ b/Specs/Core/GeometryPipelineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GeometryPipeline', 'Core/arraySlice', 'Core/AttributeCompression', @@ -44,7 +44,9 @@ defineSuite([ PrimitiveType, Tipsify, VertexFormat) { - 'use strict'; + 'use strict'; + +describe('Core/GeometryPipeline', function() { it('converts triangles to wireframe in place', function() { var geometry = GeometryPipeline.toWireframe(new Geometry({ @@ -3037,3 +3039,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/GeometrySpec.js b/Specs/Core/GeometrySpec.js index 08447225441e..a11594835e02 100644 --- a/Specs/Core/GeometrySpec.js +++ b/Specs/Core/GeometrySpec.js @@ -1,26 +1,28 @@ -defineSuite([ +define([ 'Core/Geometry', 'Core/BoundingSphere', 'Core/Cartesian3', - 'Core/Math', 'Core/ComponentDatatype', 'Core/Ellipsoid', 'Core/GeometryAttribute', 'Core/GeometryType', + 'Core/Math', 'Core/PrimitiveType', 'Core/Rectangle' ], function( Geometry, BoundingSphere, Cartesian3, - CesiumMath, ComponentDatatype, Ellipsoid, GeometryAttribute, GeometryType, + CesiumMath, PrimitiveType, Rectangle) { - 'use strict'; + 'use strict'; + +describe('Core/Geometry', function() { it('constructor', function() { var attributes = { @@ -153,3 +155,4 @@ defineSuite([ expect(textureCoordinateRotationPoints[5]).toEqualEpsilon(0, CesiumMath.EPSILON7); }); }); +}); diff --git a/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js b/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js index 371f4e2ebcd5..7a4d80055893 100644 --- a/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseMetadataSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GoogleEarthEnterpriseMetadata', 'Core/decodeGoogleEarthEnterpriseData', 'Core/DefaultProxy', @@ -18,7 +18,9 @@ defineSuite([ Request, Resource, when) { - 'use strict'; + 'use strict'; + +describe('Core/GoogleEarthEnterpriseMetadata', function() { it('tileXYToQuadKey', function() { expect(GoogleEarthEnterpriseMetadata.tileXYToQuadKey(1, 0, 0)).toEqual('2'); @@ -245,3 +247,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js b/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js index ac57116b0b88..317ae81dfa8c 100644 --- a/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseTerrainDataSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GoogleEarthEnterpriseTerrainData', 'Core/Cartesian3', 'Core/Cartographic', @@ -20,7 +20,9 @@ defineSuite([ TerrainData, TerrainMesh, when) { - 'use strict'; + 'use strict'; + +describe('Core/GoogleEarthEnterpriseTerrainData', function() { var sizeOfUint8 = Uint8Array.BYTES_PER_ELEMENT; var sizeOfUint16 = Uint16Array.BYTES_PER_ELEMENT; @@ -497,3 +499,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js b/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js index 698e5bd5ad91..95bf24c5325d 100644 --- a/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js +++ b/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GoogleEarthEnterpriseTerrainProvider', 'Core/DefaultProxy', 'Core/defaultValue', @@ -30,7 +30,9 @@ defineSuite([ TerrainProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Core/GoogleEarthEnterpriseTerrainProvider', function() { function installMockGetQuadTreePacket() { spyOn(GoogleEarthEnterpriseMetadata.prototype, 'getQuadTreePacket').and.callFake(function(quadKey, version) { @@ -365,3 +367,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/GroundPolylineGeometrySpec.js b/Specs/Core/GroundPolylineGeometrySpec.js index ba322b1bd872..44e0db509503 100644 --- a/Specs/Core/GroundPolylineGeometrySpec.js +++ b/Specs/Core/GroundPolylineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/GroundPolylineGeometry', 'Core/ApproximateTerrainHeights', 'Core/ArcType', @@ -22,7 +22,9 @@ defineSuite([ CesiumMath, WebMercatorProjection, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/GroundPolylineGeometry', function() { beforeAll(function() { return ApproximateTerrainHeights.initialize(); @@ -653,3 +655,4 @@ defineSuite([ createPackableSpecs(GroundPolylineGeometry, polyline, packedInstance); }); +}); diff --git a/Specs/Core/HeadingPitchRangeSpec.js b/Specs/Core/HeadingPitchRangeSpec.js index 005d3aab534c..5d6ad42c7bd3 100644 --- a/Specs/Core/HeadingPitchRangeSpec.js +++ b/Specs/Core/HeadingPitchRangeSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/HeadingPitchRange' ], function( HeadingPitchRange) { - 'use strict'; + 'use strict'; + +describe('Core/HeadingPitchRange', function() { it('construct with default values', function() { var hpr = new HeadingPitchRange(); @@ -34,3 +36,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/HeadingPitchRollSpec.js b/Specs/Core/HeadingPitchRollSpec.js index 4569f75ac38c..7598daca7f33 100644 --- a/Specs/Core/HeadingPitchRollSpec.js +++ b/Specs/Core/HeadingPitchRollSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/HeadingPitchRoll', 'Core/Math', 'Core/Quaternion' @@ -6,7 +6,10 @@ defineSuite([ HeadingPitchRoll, CesiumMath, Quaternion) { - 'use strict'; + 'use strict'; + +describe('Core/HeadingPitchRoll', function() { + /*global it,expect*/ var deg2rad = CesiumMath.RADIANS_PER_DEGREE; @@ -181,3 +184,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/HeapSpec.js b/Specs/Core/HeapSpec.js index 388ccd511f70..e55eb34c695d 100644 --- a/Specs/Core/HeapSpec.js +++ b/Specs/Core/HeapSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Heap' ], function( Heap) { - 'use strict'; + 'use strict'; + +describe('Core/Heap', function() { var length = 100; @@ -172,3 +174,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Core/HeightmapTerrainDataSpec.js b/Specs/Core/HeightmapTerrainDataSpec.js index 3b6ebdef5fb7..e63990524134 100644 --- a/Specs/Core/HeightmapTerrainDataSpec.js +++ b/Specs/Core/HeightmapTerrainDataSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/HeightmapTerrainData', 'Core/GeographicTilingScheme', 'Core/HeightmapEncoding', @@ -8,7 +8,9 @@ defineSuite([ GeographicTilingScheme, HeightmapEncoding, TerrainData) { - 'use strict'; + 'use strict'; + +describe('Core/HeightmapTerrainData', function() { it('conforms to TerrainData interface', function() { expect(HeightmapTerrainData).toConformToInterface(TerrainData); @@ -327,3 +329,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/HermitePolynomialApproximationSpec.js b/Specs/Core/HermitePolynomialApproximationSpec.js index f0be614abea7..a152b47606bf 100644 --- a/Specs/Core/HermitePolynomialApproximationSpec.js +++ b/Specs/Core/HermitePolynomialApproximationSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/HermitePolynomialApproximation' ], function( HermitePolynomialApproximation) { - 'use strict'; + 'use strict'; + +describe('Core/HermitePolynomialApproximation', function() { //The results of these specs were validated against STK Components //an aerospace SDK available from Analytical Graphics. www.agi.com/components/ @@ -75,3 +77,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/HermiteSplineSpec.js b/Specs/Core/HermiteSplineSpec.js index 5e41eb4a86bf..b3257f3bf81a 100644 --- a/Specs/Core/HermiteSplineSpec.js +++ b/Specs/Core/HermiteSplineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/HermiteSpline', 'Core/Cartesian3', 'Core/Math' @@ -6,7 +6,9 @@ defineSuite([ HermiteSpline, Cartesian3, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/HermiteSpline', function() { var points; var times; @@ -378,3 +380,4 @@ defineSuite([ expect(hs.evaluate(t)).toEqual(Cartesian3.lerp(points[0], points[1], t, new Cartesian3())); }); }); +}); diff --git a/Specs/Core/Iau2000OrientationSpec.js b/Specs/Core/Iau2000OrientationSpec.js index 56b176c6da3b..fec0ca40c734 100644 --- a/Specs/Core/Iau2000OrientationSpec.js +++ b/Specs/Core/Iau2000OrientationSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Iau2000Orientation', 'Core/JulianDate', 'Core/TimeStandard' @@ -6,7 +6,9 @@ defineSuite([ Iau2000Orientation, JulianDate, TimeStandard) { - 'use strict'; + 'use strict'; + +describe('Core/Iau2000Orientation', function() { it('compute moon', function() { var date = new JulianDate(2451545.0, -32.184, TimeStandard.TAI); @@ -25,3 +27,4 @@ defineSuite([ expect(param.rotationRate).toEqual(expectedRotationRate); }); }); +}); diff --git a/Specs/Core/Iau2006XysDataSpec.js b/Specs/Core/Iau2006XysDataSpec.js index 2f7d87750cc7..edd42b7dd093 100644 --- a/Specs/Core/Iau2006XysDataSpec.js +++ b/Specs/Core/Iau2006XysDataSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Iau2006XysData', 'Core/buildModuleUrl', 'Core/defined', @@ -10,7 +10,9 @@ defineSuite([ defined, Iau2006XysSample, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Core/Iau2006XysData', function() { var xys; @@ -66,3 +68,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/IauOrientationAxesSpec.js b/Specs/Core/IauOrientationAxesSpec.js index f76f60d5ec32..159c4b42cb51 100644 --- a/Specs/Core/IauOrientationAxesSpec.js +++ b/Specs/Core/IauOrientationAxesSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/IauOrientationAxes', 'Core/Iau2000Orientation', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, Matrix3, TimeStandard) { - 'use strict'; + 'use strict'; + +describe('Core/IauOrientationAxes', function() { it('compute ICRF to Moon Fixed', function() { var date = new JulianDate(2451545.0, -32.184, TimeStandard.TAI); @@ -33,3 +35,4 @@ defineSuite([ expect(mtx).toEqualEpsilon(expectedMatrix, CesiumMath.EPSILON13); }); }); +}); diff --git a/Specs/Core/IndexDatatypeSpec.js b/Specs/Core/IndexDatatypeSpec.js index 449e4611f400..fdf5be5a3992 100644 --- a/Specs/Core/IndexDatatypeSpec.js +++ b/Specs/Core/IndexDatatypeSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/IndexDatatype', 'Core/Math' ], function( IndexDatatype, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/IndexDatatype', function() { it('IndexDatatype.validate validates input', function() { expect(IndexDatatype.validate(IndexDatatype.UNSIGNED_SHORT)).toEqual(true); @@ -90,3 +92,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/IntersectionTestsSpec.js b/Specs/Core/IntersectionTestsSpec.js index 166c0a886d1d..c2bfe2626988 100644 --- a/Specs/Core/IntersectionTestsSpec.js +++ b/Specs/Core/IntersectionTestsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/IntersectionTests', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Plane, Ray) { - 'use strict'; + 'use strict'; + +describe('Core/IntersectionTests', function() { it('rayPlane intersects', function() { var ray = new Ray(new Cartesian3(2.0, 0.0, 0.0), new Cartesian3(-1.0, 0.0, 0.0)); @@ -872,3 +874,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/Intersections2DSpec.js b/Specs/Core/Intersections2DSpec.js index 0dd49009d51d..0f7bbe734579 100644 --- a/Specs/Core/Intersections2DSpec.js +++ b/Specs/Core/Intersections2DSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Intersections2D' ], function( Intersections2D) { - 'use strict'; + 'use strict'; + +describe('Core/Intersections2D', function() { describe('clipTriangleAtAxisAlignedThreshold', function() { it('eliminates a triangle that is entirely on the wrong side of the threshold', function() { @@ -343,3 +345,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/IntervalSpec.js b/Specs/Core/IntervalSpec.js index a0af3f96bbc5..8c9af1953433 100644 --- a/Specs/Core/IntervalSpec.js +++ b/Specs/Core/IntervalSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Interval' ], function( Interval) { - 'use strict'; + 'use strict'; + +describe('Core/Interval', function() { it('constructs without arguments', function() { var interval = new Interval(); @@ -18,3 +20,4 @@ defineSuite([ expect(interval.stop).toEqual(stop); }); }); +}); diff --git a/Specs/Core/IonGeocoderServiceSpec.js b/Specs/Core/IonGeocoderServiceSpec.js index 03eaa043a193..bbabdb6a6f2e 100644 --- a/Specs/Core/IonGeocoderServiceSpec.js +++ b/Specs/Core/IonGeocoderServiceSpec.js @@ -1,20 +1,22 @@ -defineSuite([ +define([ 'Core/IonGeocoderService', - 'Core/Ion', 'Core/GeocodeType', + 'Core/Ion', 'Core/Rectangle', 'Core/Resource', - 'ThirdParty/when', - 'Specs/createScene' + 'Specs/createScene', + 'ThirdParty/when' ], function( IonGeocoderService, - Ion, GeocodeType, + Ion, Rectangle, Resource, - when, - createScene) { - 'use strict'; + createScene, + when) { + 'use strict'; + +describe('Core/IonGeocoderService', function() { var scene; beforeEach(function() { @@ -58,3 +60,4 @@ defineSuite([ expect(service._pelias.geocode).toHaveBeenCalledWith(query, GeocodeType.SEARCH); }); }); +}); diff --git a/Specs/Core/IonResourceSpec.js b/Specs/Core/IonResourceSpec.js index 4b21e38837d3..4cbcc394739f 100644 --- a/Specs/Core/IonResourceSpec.js +++ b/Specs/Core/IonResourceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/IonResource', 'Core/Ion', 'Core/RequestErrorEvent', @@ -12,7 +12,9 @@ defineSuite([ Resource, RuntimeError, when) { -'use strict'; + 'use strict'; + +describe('Core/IonResource', function() { var assetId = 123890213; var endpoint = { @@ -341,3 +343,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/JulianDateSpec.js b/Specs/Core/JulianDateSpec.js index 4983e5a9e8ec..b2723fdbd631 100644 --- a/Specs/Core/JulianDateSpec.js +++ b/Specs/Core/JulianDateSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/JulianDate', 'Core/Iso8601', 'Core/Math', @@ -10,7 +10,9 @@ defineSuite([ CesiumMath, TimeConstants, TimeStandard) { - 'use strict'; + 'use strict'; + +describe('Core/JulianDate', function() { // All exact Julian Dates found using NASA's Time Conversion Tool: http://ssd.jpl.nasa.gov/tc.cgi it('Construct a default date', function() { @@ -1062,3 +1064,4 @@ defineSuite([ expect(JulianDate.compare(julian1, julian2)).toEqual(0); }); }); +}); diff --git a/Specs/Core/LagrangePolynomialApproximationSpec.js b/Specs/Core/LagrangePolynomialApproximationSpec.js index 5551e5ef140e..464d3e7dc15f 100644 --- a/Specs/Core/LagrangePolynomialApproximationSpec.js +++ b/Specs/Core/LagrangePolynomialApproximationSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/LagrangePolynomialApproximation' ], function( LagrangePolynomialApproximation) { - 'use strict'; + 'use strict'; + +describe('Core/LagrangePolynomialApproximation', function() { //The results of these specs were validated against STK Components //an aerospace SDK available from Analytical Graphics. www.agi.com/components/ @@ -42,3 +44,4 @@ defineSuite([ expect(LagrangePolynomialApproximation.getRequiredDataPoints(3)).toEqual(4); }); }); +}); diff --git a/Specs/Core/LeapSecondSpec.js b/Specs/Core/LeapSecondSpec.js index 44e76b08b135..ee3be6496cff 100644 --- a/Specs/Core/LeapSecondSpec.js +++ b/Specs/Core/LeapSecondSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/LeapSecond', 'Core/JulianDate' ], function( LeapSecond, JulianDate) { - 'use strict'; + 'use strict'; + +describe('Core/LeapSecond', function() { it('default constructor sets expected values', function() { var leapSecond = new LeapSecond(); @@ -20,3 +22,4 @@ defineSuite([ expect(leapSecond.offset).toEqual(offset); }); }); +}); diff --git a/Specs/Core/LinearApproximationSpec.js b/Specs/Core/LinearApproximationSpec.js index b137ad34e529..cc3151656727 100644 --- a/Specs/Core/LinearApproximationSpec.js +++ b/Specs/Core/LinearApproximationSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/LinearApproximation' ], function( LinearApproximation) { - 'use strict'; + 'use strict'; + +describe('Core/LinearApproximation', function() { it('should produce correct results', function() { var xTable = [2.0, 4.0]; @@ -72,3 +74,4 @@ defineSuite([ expect(LinearApproximation.getRequiredDataPoints(1)).toEqual(2); }); }); +}); diff --git a/Specs/Core/LinearSplineSpec.js b/Specs/Core/LinearSplineSpec.js index 821f4a6b8a6c..fa9b84f0ea9d 100644 --- a/Specs/Core/LinearSplineSpec.js +++ b/Specs/Core/LinearSplineSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/LinearSpline', 'Core/Cartesian3' ], function( LinearSpline, Cartesian3) { - 'use strict'; + 'use strict'; + +describe('Core/LinearSpline', function() { var points; var times; @@ -89,3 +91,4 @@ defineSuite([ expect(result).toEqual(points[0]); }); }); +}); diff --git a/Specs/Core/ManagedArraySpec.js b/Specs/Core/ManagedArraySpec.js index c050bb8f6013..988fec4e597d 100644 --- a/Specs/Core/ManagedArraySpec.js +++ b/Specs/Core/ManagedArraySpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/ManagedArray' ], function( ManagedArray) { - 'use strict'; + 'use strict'; + +describe('Core/ManagedArray', function() { it('constructor has expected default values', function() { var array = new ManagedArray(); @@ -148,3 +150,4 @@ defineSuite([ expect(array.values.length).toEqual(3); }); }); +}); diff --git a/Specs/Core/MapboxApiSpec.js b/Specs/Core/MapboxApiSpec.js index d69c648902b7..734ffa90351d 100644 --- a/Specs/Core/MapboxApiSpec.js +++ b/Specs/Core/MapboxApiSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/MapboxApi' ], function( MapboxApi) { - 'use strict'; + 'use strict'; + +describe('Core/MapboxApi', function() { it('getAccessToken returns provided access token if one is provided', function() { expect(MapboxApi.getAccessToken('foo')).toEqual('foo'); @@ -22,3 +24,4 @@ defineSuite([ MapboxApi.defaultAccessToken = oldAccessToken; }); }); +}); diff --git a/Specs/Core/MathSpec.js b/Specs/Core/MathSpec.js index 2b6b47f4049d..9e86354b036f 100644 --- a/Specs/Core/MathSpec.js +++ b/Specs/Core/MathSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Math' ], function( CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/Math', function() { it('sign of -2', function() { expect(CesiumMath.sign(-2)).toEqual(-1); @@ -612,3 +614,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/Matrix2Spec.js b/Specs/Core/Matrix2Spec.js index 92d00faa0900..57ee9fafe3fc 100644 --- a/Specs/Core/Matrix2Spec.js +++ b/Specs/Core/Matrix2Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Matrix2', 'Core/Cartesian2', 'Core/Math' @@ -6,7 +6,9 @@ defineSuite([ Matrix2, Cartesian2, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/Matrix2', function() { it('default constructor creates values array with all zeros.', function() { var matrix = new Matrix2(); @@ -815,3 +817,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Core/Matrix3Spec.js b/Specs/Core/Matrix3Spec.js index 5ff147cbc677..c2f46908c9de 100644 --- a/Specs/Core/Matrix3Spec.js +++ b/Specs/Core/Matrix3Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Matrix3', 'Core/Cartesian3', 'Core/HeadingPitchRoll', @@ -10,7 +10,9 @@ defineSuite([ HeadingPitchRoll, CesiumMath, Quaternion) { - 'use strict'; + 'use strict'; + +describe('Core/Matrix3', function() { it('default constructor creates values array with all zeros.', function() { var matrix = new Matrix3(); @@ -1195,3 +1197,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Core/Matrix4Spec.js b/Specs/Core/Matrix4Spec.js index 52f3a9d47273..0164cea19b11 100644 --- a/Specs/Core/Matrix4Spec.js +++ b/Specs/Core/Matrix4Spec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Matrix4', 'Core/Cartesian3', 'Core/Cartesian4', @@ -14,7 +14,9 @@ defineSuite([ Matrix3, Quaternion, TranslationRotationScale) { - 'use strict'; + 'use strict'; + +describe('Core/Matrix4', function() { it('default constructor creates values array with all zeros.', function() { var matrix = new Matrix4(); @@ -1788,3 +1790,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Core/NearFarScalarSpec.js b/Specs/Core/NearFarScalarSpec.js index 51888d536957..ec9354ac27b3 100644 --- a/Specs/Core/NearFarScalarSpec.js +++ b/Specs/Core/NearFarScalarSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/NearFarScalar', 'Specs/createPackableSpecs' ], function( NearFarScalar, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/NearFarScalar', function() { it('constructs without arguments', function() { var scalar = new NearFarScalar(); @@ -46,3 +48,4 @@ defineSuite([ createPackableSpecs(NearFarScalar, new NearFarScalar(1, 2, 3, 4), [1, 2, 3, 4]); }); +}); diff --git a/Specs/Core/OccluderSpec.js b/Specs/Core/OccluderSpec.js index 3c2b53dfafa8..c7cb88ed4435 100644 --- a/Specs/Core/OccluderSpec.js +++ b/Specs/Core/OccluderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Occluder', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Rectangle, Visibility) { - 'use strict'; + 'use strict'; + +describe('Core/Occluder', function() { it('throws an exception during construction (1 of 3)', function() { expect(function() { @@ -310,3 +312,4 @@ defineSuite([ expect(occluder1.radius).toEqual(occluder0.radius); }); }); +}); diff --git a/Specs/Core/OpenCageGeocoderServiceSpec.js b/Specs/Core/OpenCageGeocoderServiceSpec.js index fa5ff7a1922a..bfd16295e393 100644 --- a/Specs/Core/OpenCageGeocoderServiceSpec.js +++ b/Specs/Core/OpenCageGeocoderServiceSpec.js @@ -1,16 +1,18 @@ -defineSuite([ +define([ 'Core/OpenCageGeocoderService', - 'Core/GeocodeType', 'Core/Cartesian3', + 'Core/GeocodeType', 'Core/Resource', 'ThirdParty/when' ], function( OpenCageGeocoderService, - GeocodeType, Cartesian3, + GeocodeType, Resource, when) { - 'use strict'; + 'use strict'; + +describe('Core/OpenCageGeocoderService', function() { var endpoint = 'https://api.opencagedata.com/geocode/v1/'; var apiKey = 'c2a490d593b14612aefa6ec2e6b77c47'; @@ -73,3 +75,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/OrientedBoundingBoxSpec.js b/Specs/Core/OrientedBoundingBoxSpec.js index 196078d1ba57..5690a059eb8b 100644 --- a/Specs/Core/OrientedBoundingBoxSpec.js +++ b/Specs/Core/OrientedBoundingBoxSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/OrientedBoundingBox', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -26,7 +26,9 @@ defineSuite([ Quaternion, Rectangle, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/OrientedBoundingBox', function() { var positions = [ new Cartesian3(2.0, 0.0, 0.0), @@ -771,3 +773,4 @@ defineSuite([ createPackableSpecs(OrientedBoundingBox, new OrientedBoundingBox(new Cartesian3(1.0, 2.0, 3.0), Matrix3.IDENTITY), [1.0, 2.0, 3.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0]); }); +}); diff --git a/Specs/Core/OrthographicFrustumSpec.js b/Specs/Core/OrthographicFrustumSpec.js index d3b6c786650f..bdf8d72b9a08 100644 --- a/Specs/Core/OrthographicFrustumSpec.js +++ b/Specs/Core/OrthographicFrustumSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/OrthographicFrustum', 'Core/Cartesian2', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Matrix4, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/OrthographicFrustum', function() { var frustum, planes; @@ -237,3 +239,4 @@ defineSuite([ far : 4.0 }), [1.0, 2.0, 3.0, 4.0]); }); +}); diff --git a/Specs/Core/OrthographicOffCenterFrustumSpec.js b/Specs/Core/OrthographicOffCenterFrustumSpec.js index 856ac0dcc121..6b1ae4c8e9dd 100644 --- a/Specs/Core/OrthographicOffCenterFrustumSpec.js +++ b/Specs/Core/OrthographicOffCenterFrustumSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/OrthographicOffCenterFrustum', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Cartesian4, CesiumMath, Matrix4) { - 'use strict'; + 'use strict'; + +describe('Core/OrthographicOffCenterFrustum', function() { var frustum, planes; @@ -240,3 +242,4 @@ defineSuite([ expect(frustum).toEqual(frustum2); }); }); +}); diff --git a/Specs/Core/PeliasGeocoderServiceSpec.js b/Specs/Core/PeliasGeocoderServiceSpec.js index 67b7594f7156..18e2cc898a73 100644 --- a/Specs/Core/PeliasGeocoderServiceSpec.js +++ b/Specs/Core/PeliasGeocoderServiceSpec.js @@ -1,16 +1,18 @@ -defineSuite([ +define([ 'Core/PeliasGeocoderService', - 'Core/GeocodeType', 'Core/Cartesian3', + 'Core/GeocodeType', 'Core/Resource', 'ThirdParty/when' ], function( PeliasGeocoderService, - GeocodeType, Cartesian3, + GeocodeType, Resource, when) { - 'use strict'; + 'use strict'; + +describe('Core/PeliasGeocoderService', function() { it('constructor throws without url', function() { expect(function() { @@ -91,3 +93,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/PerspectiveFrustumSpec.js b/Specs/Core/PerspectiveFrustumSpec.js index 4ec7d5a17f64..dff45953d6e1 100644 --- a/Specs/Core/PerspectiveFrustumSpec.js +++ b/Specs/Core/PerspectiveFrustumSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PerspectiveFrustum', 'Core/Cartesian2', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Matrix4, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PerspectiveFrustum', function() { var frustum, planes; @@ -235,3 +237,4 @@ defineSuite([ yOffset : 6.0 }), [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]); }); +}); diff --git a/Specs/Core/PerspectiveOffCenterFrustumSpec.js b/Specs/Core/PerspectiveOffCenterFrustumSpec.js index 39d49da802c7..e4fa3d0983a6 100644 --- a/Specs/Core/PerspectiveOffCenterFrustumSpec.js +++ b/Specs/Core/PerspectiveOffCenterFrustumSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PerspectiveOffCenterFrustum', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Cartesian4, CesiumMath, Matrix4) { - 'use strict'; + 'use strict'; + +describe('Core/PerspectiveOffCenterFrustum', function() { var frustum, planes; @@ -247,3 +249,4 @@ defineSuite([ expect(frustum).toEqual(frustum2); }); }); +}); diff --git a/Specs/Core/PinBuilderSpec.js b/Specs/Core/PinBuilderSpec.js index e5bf5ea72e11..d589d42ecfca 100644 --- a/Specs/Core/PinBuilderSpec.js +++ b/Specs/Core/PinBuilderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PinBuilder', 'Core/buildModuleUrl', 'Core/Color', @@ -8,7 +8,9 @@ defineSuite([ buildModuleUrl, Color, when) { - 'use strict'; + 'use strict'; + +describe('Core/PinBuilder', function() { function getPinColor(canvas) { var context2D = canvas.getContext('2d'); @@ -140,3 +142,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/PlaneGeometrySpec.js b/Specs/Core/PlaneGeometrySpec.js index b45692ef3e00..bba875a70664 100644 --- a/Specs/Core/PlaneGeometrySpec.js +++ b/Specs/Core/PlaneGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PlaneGeometry', 'Core/Cartesian3', 'Core/VertexFormat', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PlaneGeometry', function() { it('constructor creates optimized number of positions for VertexFormat.POSITIONS_ONLY', function() { var m = PlaneGeometry.createGeometry(new PlaneGeometry({ @@ -42,3 +44,4 @@ defineSuite([ vertexFormat : VertexFormat.POSITION_AND_NORMAL }), [1.0, 1.0, 0.0, 0.0, 0.0, 0.0]); }); +}); diff --git a/Specs/Core/PlaneOutlineGeometrySpec.js b/Specs/Core/PlaneOutlineGeometrySpec.js index f1f1d49f6dc0..d12d47ffbc33 100644 --- a/Specs/Core/PlaneOutlineGeometrySpec.js +++ b/Specs/Core/PlaneOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PlaneOutlineGeometry', 'Core/Cartesian3', 'Specs/createPackableSpecs' @@ -6,7 +6,9 @@ defineSuite([ PlaneOutlineGeometry, Cartesian3, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PlaneOutlineGeometry', function() { it('constructor creates positions', function() { var m = PlaneOutlineGeometry.createGeometry(new PlaneOutlineGeometry()); @@ -17,3 +19,4 @@ defineSuite([ createPackableSpecs(PlaneOutlineGeometry, new PlaneOutlineGeometry(), []); }); +}); diff --git a/Specs/Core/PlaneSpec.js b/Specs/Core/PlaneSpec.js index 01f9aed36084..88a034071035 100644 --- a/Specs/Core/PlaneSpec.js +++ b/Specs/Core/PlaneSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Plane', 'Core/Cartesian3', 'Core/Cartesian4', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, Matrix3, Matrix4) { - 'use strict'; + 'use strict'; + +describe('Core/Plane', function() { it('constructs', function() { var normal = Cartesian3.UNIT_X; @@ -251,3 +253,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/PolygonGeometrySpec.js b/Specs/Core/PolygonGeometrySpec.js index 644d3d317577..0e7b7c775f72 100644 --- a/Specs/Core/PolygonGeometrySpec.js +++ b/Specs/Core/PolygonGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolygonGeometry', 'Core/ArcType', 'Core/arrayFill', @@ -26,7 +26,9 @@ defineSuite([ Rectangle, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PolygonGeometry', function() { it('throws without hierarchy', function() { expect(function() { @@ -1282,3 +1284,4 @@ defineSuite([ packedInstance.push(0.0, 0.0, CesiumMath.PI_OVER_THREE, 0.0, 0.0, 1.0, 0, 1, 0, -1, ArcType.GEODESIC, 54); createPackableSpecs(PolygonGeometry, polygon, packedInstance); }); +}); diff --git a/Specs/Core/PolygonOutlineGeometrySpec.js b/Specs/Core/PolygonOutlineGeometrySpec.js index 1c9965c5ae52..68e9702438bf 100644 --- a/Specs/Core/PolygonOutlineGeometrySpec.js +++ b/Specs/Core/PolygonOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolygonOutlineGeometry', 'Core/ArcType', 'Core/arrayFill', @@ -18,7 +18,9 @@ defineSuite([ GeometryOffsetAttribute, CesiumMath, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PolygonOutlineGeometry', function() { it('throws without hierarchy', function() { expect(function() { @@ -612,3 +614,4 @@ defineSuite([ packedInstance.push(0.0, 0.0, CesiumMath.PI_OVER_THREE, 0.0, 1.0, ArcType.GEODESIC, -1, 44); createPackableSpecs(PolygonOutlineGeometry, polygon, packedInstance); }); +}); diff --git a/Specs/Core/PolygonPipelineSpec.js b/Specs/Core/PolygonPipelineSpec.js index bd3bda0b53b0..26c965737b91 100644 --- a/Specs/Core/PolygonPipelineSpec.js +++ b/Specs/Core/PolygonPipelineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolygonPipeline', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Ellipsoid, CesiumMath, WindingOrder) { - 'use strict'; + 'use strict'; + +describe('Core/PolygonPipeline', function() { beforeEach(function() { CesiumMath.setRandomNumberSeed(0.0); @@ -282,3 +284,4 @@ defineSuite([ expect(subdivision.indices.length).toEqual(252); // 84 triangles }); }); +}); diff --git a/Specs/Core/PolylineGeometrySpec.js b/Specs/Core/PolylineGeometrySpec.js index ba6731f88eeb..bf935d4f876b 100644 --- a/Specs/Core/PolylineGeometrySpec.js +++ b/Specs/Core/PolylineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolylineGeometry', 'Core/ArcType', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ Ellipsoid, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PolylineGeometry', function() { it('constructor throws with no positions', function() { expect(function() { @@ -207,3 +209,4 @@ defineSuite([ packedInstance = [3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 12, 13, 14, 1, 0, 0, 0, 0, 0, 10, 0, 2, 11]; createPackableSpecs(PolylineGeometry, line, packedInstance, 'rhumb line'); }); +}); diff --git a/Specs/Core/PolylinePipelineSpec.js b/Specs/Core/PolylinePipelineSpec.js index 6f62ec382a52..fc2750563723 100644 --- a/Specs/Core/PolylinePipelineSpec.js +++ b/Specs/Core/PolylinePipelineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolylinePipeline', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -10,7 +10,9 @@ defineSuite([ Ellipsoid, CesiumMath, Transforms) { - 'use strict'; + 'use strict'; + +describe('Core/PolylinePipeline', function() { it('wrapLongitude', function() { var positions = Cartesian3.fromDegreesArray([ @@ -166,3 +168,4 @@ defineSuite([ expect(newPositions).toEqual([0,0,1]); }); }); +}); diff --git a/Specs/Core/PolylineVolumeGeometrySpec.js b/Specs/Core/PolylineVolumeGeometrySpec.js index 8fec731f121a..0d26715b6eeb 100644 --- a/Specs/Core/PolylineVolumeGeometrySpec.js +++ b/Specs/Core/PolylineVolumeGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolylineVolumeGeometry', 'Core/Cartesian2', 'Core/Cartesian3', @@ -14,7 +14,10 @@ defineSuite([ Ellipsoid, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PolylineVolumeGeometry', function() { + var shape; beforeAll(function() { @@ -248,3 +251,4 @@ defineSuite([ var packedInstance = [3.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 3.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.1]; createPackableSpecs(PolylineVolumeGeometry, volume, packedInstance); }); +}); diff --git a/Specs/Core/PolylineVolumeOutlineGeometrySpec.js b/Specs/Core/PolylineVolumeOutlineGeometrySpec.js index 4c0a5c3618c4..d9c8789c7ff8 100644 --- a/Specs/Core/PolylineVolumeOutlineGeometrySpec.js +++ b/Specs/Core/PolylineVolumeOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/PolylineVolumeOutlineGeometry', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ CornerType, Ellipsoid, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/PolylineVolumeOutlineGeometry', function() { var shape; @@ -155,3 +157,4 @@ defineSuite([ var packedInstance = [3.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 3.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, 2.0, 0.1]; createPackableSpecs(PolylineVolumeOutlineGeometry, volume, packedInstance); }); +}); diff --git a/Specs/Core/QuadraticRealPolynomialSpec.js b/Specs/Core/QuadraticRealPolynomialSpec.js index 088ddd0c59d3..54f129fe6e0d 100644 --- a/Specs/Core/QuadraticRealPolynomialSpec.js +++ b/Specs/Core/QuadraticRealPolynomialSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/QuadraticRealPolynomial', 'Core/Math' ], function( QuadraticRealPolynomial, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/QuadraticRealPolynomial', function() { it('discriminant throws without a', function() { expect(function() { @@ -117,3 +119,4 @@ defineSuite([ expect(roots[1]).toEqual(3.0); }); }); +}); diff --git a/Specs/Core/QuantizedMeshTerrainDataSpec.js b/Specs/Core/QuantizedMeshTerrainDataSpec.js index dbde0d4db5f4..60271eb20840 100644 --- a/Specs/Core/QuantizedMeshTerrainDataSpec.js +++ b/Specs/Core/QuantizedMeshTerrainDataSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/QuantizedMeshTerrainData', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -16,7 +16,9 @@ defineSuite([ TerrainData, TerrainMesh, when) { - 'use strict'; + 'use strict'; + +describe('Core/QuantizedMeshTerrainData', function() { it('conforms to TerrainData interface', function() { expect(QuantizedMeshTerrainData).toConformToInterface(TerrainData); @@ -807,3 +809,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/QuarticRealPolynomialSpec.js b/Specs/Core/QuarticRealPolynomialSpec.js index 94c04de9a623..6bfbfe062139 100644 --- a/Specs/Core/QuarticRealPolynomialSpec.js +++ b/Specs/Core/QuarticRealPolynomialSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/QuarticRealPolynomial', 'Core/Math' ], function( QuarticRealPolynomial, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/QuarticRealPolynomial', function() { it('discriminant throws without a', function() { expect(function() { @@ -187,3 +189,4 @@ defineSuite([ expect(actual[1]).toEqualEpsilon(expected[1], CesiumMath.EPSILON11); }); }); +}); diff --git a/Specs/Core/QuaternionSpec.js b/Specs/Core/QuaternionSpec.js index c969f95f690c..2fec72fe9c53 100644 --- a/Specs/Core/QuaternionSpec.js +++ b/Specs/Core/QuaternionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Quaternion', 'Core/Cartesian3', 'Core/HeadingPitchRoll', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, Matrix3, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Quaternion', function() { it('construct with default values', function() { var quaternion = new Quaternion(); @@ -1016,3 +1018,4 @@ defineSuite([ Quaternion.normalize(q, q); createPackableSpecs(Quaternion, q, [q.x, q.y, q.z, q.w]); }); +}); diff --git a/Specs/Core/QuaternionSplineSpec.js b/Specs/Core/QuaternionSplineSpec.js index 4f1437754bf0..c7ebaa4c5821 100644 --- a/Specs/Core/QuaternionSplineSpec.js +++ b/Specs/Core/QuaternionSplineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/QuaternionSpline', 'Core/Cartesian3', 'Core/Math', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, CesiumMath, Quaternion) { - 'use strict'; + 'use strict'; + +describe('Core/QuaternionSpline', function() { var points; var times; @@ -128,3 +130,4 @@ defineSuite([ expect(actual).toEqualEpsilon(expected, CesiumMath.EPSILON6); }); }); +}); diff --git a/Specs/Core/QueueSpec.js b/Specs/Core/QueueSpec.js index 1a7f414910f7..89a600832e89 100644 --- a/Specs/Core/QueueSpec.js +++ b/Specs/Core/QueueSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Queue' ], function( Queue) { - 'use strict'; + 'use strict'; + +describe('Core/Queue', function() { var queue; beforeEach(function() { @@ -94,3 +96,4 @@ defineSuite([ expect(queue.dequeue()).toEqual(53); }); }); +}); diff --git a/Specs/Core/RaySpec.js b/Specs/Core/RaySpec.js index 9e861c6d8a11..afac1b862700 100644 --- a/Specs/Core/RaySpec.js +++ b/Specs/Core/RaySpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/Ray', 'Core/Cartesian3' ], function( Ray, Cartesian3) { - 'use strict'; + 'use strict'; + +describe('Core/Ray', function() { it('default constructor create zero valued Ray', function() { var ray = new Ray(); @@ -91,3 +93,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/RectangleCollisionCheckerSpec.js b/Specs/Core/RectangleCollisionCheckerSpec.js index 393f7b72aeba..6159bb4243a4 100644 --- a/Specs/Core/RectangleCollisionCheckerSpec.js +++ b/Specs/Core/RectangleCollisionCheckerSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/RectangleCollisionChecker', 'Core/Rectangle' ], function( RectangleCollisionChecker, Rectangle) { - 'use strict'; + 'use strict'; + +describe('Core/RectangleCollisionChecker', function() { var testRectangle1 = new Rectangle(0.0, 0.0, 1.0, 1.0); var testRectangle2 = new Rectangle(1.1, 1.1, 2.1, 2.1); @@ -33,3 +35,4 @@ defineSuite([ expect(collisionChecker.collides(testRectangle2)).toBe(false); }); }); +}); diff --git a/Specs/Core/RectangleGeometrySpec.js b/Specs/Core/RectangleGeometrySpec.js index 9f86a1c6ae9f..92302609999f 100644 --- a/Specs/Core/RectangleGeometrySpec.js +++ b/Specs/Core/RectangleGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/RectangleGeometry', 'Core/arrayFill', 'Core/Cartesian2', @@ -24,7 +24,9 @@ defineSuite([ Rectangle, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/RectangleGeometry', function() { it('computes positions', function() { var rectangle = new Rectangle(-2.0, -1.0, 0.0, 1.0); @@ -539,3 +541,4 @@ defineSuite([ var packedInstance = [-2.0, -1.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1]; createPackableSpecs(RectangleGeometry, rectangle, packedInstance); }); +}); diff --git a/Specs/Core/RectangleOutlineGeometrySpec.js b/Specs/Core/RectangleOutlineGeometrySpec.js index 13238533dc4b..8136c177f09a 100644 --- a/Specs/Core/RectangleOutlineGeometrySpec.js +++ b/Specs/Core/RectangleOutlineGeometrySpec.js @@ -1,11 +1,11 @@ -defineSuite([ +define([ 'Core/RectangleOutlineGeometry', 'Core/arrayFill', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Ellipsoid', - 'Core/GeometryOffsetAttribute', 'Core/GeographicProjection', + 'Core/GeometryOffsetAttribute', 'Core/Math', 'Core/Matrix2', 'Core/Rectangle', @@ -16,13 +16,15 @@ defineSuite([ Cartesian2, Cartesian3, Ellipsoid, - GeometryOffsetAttribute, GeographicProjection, + GeometryOffsetAttribute, CesiumMath, Matrix2, Rectangle, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/RectangleOutlineGeometry', function() { it('computes positions', function() { var rectangle = new Rectangle(-2.0, -1.0, 0.0, 1.0); @@ -298,3 +300,4 @@ defineSuite([ createPackableSpecs(RectangleOutlineGeometry, rectangle, packedInstance, 'at height'); }); +}); diff --git a/Specs/Core/RectangleSpec.js b/Specs/Core/RectangleSpec.js index b85022978f03..e1e657f51b41 100644 --- a/Specs/Core/RectangleSpec.js +++ b/Specs/Core/RectangleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Rectangle', 'Core/Cartesian3', 'Core/Cartographic', @@ -12,7 +12,9 @@ defineSuite([ Ellipsoid, CesiumMath, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/Rectangle', function() { var west = -0.9; var south = 0.5; @@ -877,3 +879,4 @@ defineSuite([ var packedInstance = [west, south, east, north]; createPackableSpecs(Rectangle, rectangle, packedInstance); }); +}); diff --git a/Specs/Core/RequestErrorEventSpec.js b/Specs/Core/RequestErrorEventSpec.js index b4bbd59e9992..58041731f51c 100644 --- a/Specs/Core/RequestErrorEventSpec.js +++ b/Specs/Core/RequestErrorEventSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/RequestErrorEvent' ], function( RequestErrorEvent) { - 'use strict'; + 'use strict'; + +describe('Core/RequestErrorEvent', function() { it('parses response headers provided as a string', function() { var event = new RequestErrorEvent(404, 'foo', 'This-is-a-test: first\r\nAnother: second value!'); @@ -23,3 +25,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/RequestSchedulerSpec.js b/Specs/Core/RequestSchedulerSpec.js index bcc1f309644b..c1fa9e2adce9 100644 --- a/Specs/Core/RequestSchedulerSpec.js +++ b/Specs/Core/RequestSchedulerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/RequestScheduler', 'Core/Request', 'Core/RequestState', @@ -8,7 +8,9 @@ defineSuite([ Request, RequestState, when) { - 'use strict'; + 'use strict'; + +describe('Core/RequestScheduler', function() { var originalMaximumRequests; var originalMaximumRequestsPerServer; @@ -887,3 +889,4 @@ defineSuite([ expect(promise).toBeUndefined(); }); }); +}); diff --git a/Specs/Core/ResourceSpec.js b/Specs/Core/ResourceSpec.js index d76b3b595d52..42831dc6d290 100644 --- a/Specs/Core/ResourceSpec.js +++ b/Specs/Core/ResourceSpec.js @@ -1,7 +1,7 @@ -defineSuite([ +define([ 'Core/Resource', - 'Core/defaultValue', 'Core/DefaultProxy', + 'Core/defaultValue', 'Core/queryToObject', 'Core/Request', 'Core/RequestErrorEvent', @@ -12,8 +12,8 @@ defineSuite([ 'ThirdParty/when' ], function( Resource, - defaultValue, DefaultProxy, + defaultValue, queryToObject, Request, RequestErrorEvent, @@ -22,7 +22,9 @@ defineSuite([ createCanvas, Uri, when) { - 'use strict'; + 'use strict'; + +describe('Core/Resource', function() { var dataUri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIW2Nk+M/wHwAEBgIA5agATwAAAABJRU5ErkJggg=='; var supportsImageBitmapOptions; @@ -2341,3 +2343,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/RuntimeErrorSpec.js b/Specs/Core/RuntimeErrorSpec.js index 012fdba8c391..00d9e56daa74 100644 --- a/Specs/Core/RuntimeErrorSpec.js +++ b/Specs/Core/RuntimeErrorSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/RuntimeError' ], function( RuntimeError) { - 'use strict'; + 'use strict'; + +describe('Core/RuntimeError', function() { var name = 'RuntimeError'; var testMessage = 'Testing'; @@ -31,3 +33,4 @@ defineSuite([ expect(str).toContain('Core/RuntimeErrorSpec.js'); }); }); +}); diff --git a/Specs/Core/ScreenSpaceEventHandlerSpec.js b/Specs/Core/ScreenSpaceEventHandlerSpec.js index ebaeb29c6799..6555c6479337 100644 --- a/Specs/Core/ScreenSpaceEventHandlerSpec.js +++ b/Specs/Core/ScreenSpaceEventHandlerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/ScreenSpaceEventHandler', 'Core/Cartesian2', 'Core/clone', @@ -18,7 +18,9 @@ defineSuite([ KeyboardEventModifier, ScreenSpaceEventType, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Core/ScreenSpaceEventHandler', function() { var usePointerEvents; var element; @@ -1371,3 +1373,4 @@ defineSuite([ expect(element.removeEventListener.calls.count()).toEqual(element.addEventListener.calls.count()); }); }); +}); diff --git a/Specs/Core/ShowGeometryInstanceAttributeSpec.js b/Specs/Core/ShowGeometryInstanceAttributeSpec.js index c738fec9da1e..2ca53feea075 100644 --- a/Specs/Core/ShowGeometryInstanceAttributeSpec.js +++ b/Specs/Core/ShowGeometryInstanceAttributeSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/ShowGeometryInstanceAttribute', 'Core/ComponentDatatype' ], function( ShowGeometryInstanceAttribute, ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Core/ShowGeometryInstanceAttribute', function() { it('constructor', function() { var attribute = new ShowGeometryInstanceAttribute(false); @@ -35,3 +37,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/Simon1994PlanetaryPositionsSpec.js b/Specs/Core/Simon1994PlanetaryPositionsSpec.js index 7f7ab3a3b198..d7ceabb64954 100644 --- a/Specs/Core/Simon1994PlanetaryPositionsSpec.js +++ b/Specs/Core/Simon1994PlanetaryPositionsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Simon1994PlanetaryPositions', 'Core/defined', 'Core/JulianDate', @@ -14,7 +14,9 @@ defineSuite([ Matrix3, TimeStandard, Transforms) { - 'use strict'; + 'use strict'; + +describe('Core/Simon1994PlanetaryPositions', function() { // Values for the X Y and Z were found using the STK Components GeometryTransformer on the position of the // sun center of mass point and the earth J2000 reference frame. @@ -109,3 +111,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/SimplePolylineGeometrySpec.js b/Specs/Core/SimplePolylineGeometrySpec.js index 4e951f2c371c..bcbaadfa1a70 100644 --- a/Specs/Core/SimplePolylineGeometrySpec.js +++ b/Specs/Core/SimplePolylineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/SimplePolylineGeometry', 'Core/ArcType', 'Core/BoundingSphere', @@ -18,7 +18,9 @@ defineSuite([ CesiumMath, PrimitiveType, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/SimplePolylineGeometry', function() { it('constructor throws with no positions', function() { expect(function() { @@ -211,3 +213,4 @@ defineSuite([ packedInstance = [3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 12, 13, 14, 0, 0, 11]; createPackableSpecs(SimplePolylineGeometry, line, packedInstance, 'straight line'); }); +}); diff --git a/Specs/Core/SphereGeometrySpec.js b/Specs/Core/SphereGeometrySpec.js index 4c8590922a4d..3f8206c335c8 100644 --- a/Specs/Core/SphereGeometrySpec.js +++ b/Specs/Core/SphereGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/SphereGeometry', 'Core/Cartesian3', 'Core/Math', @@ -10,7 +10,9 @@ defineSuite([ CesiumMath, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/SphereGeometry', function() { it('constructor throws with invalid stackPartitions', function() { expect(function() { @@ -105,3 +107,4 @@ defineSuite([ var packedInstance = [1.0, 1.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 3.0, 3.0, -1.0]; createPackableSpecs(SphereGeometry, sphere, packedInstance); }); +}); diff --git a/Specs/Core/SphereOutlineGeometrySpec.js b/Specs/Core/SphereOutlineGeometrySpec.js index 43d5f7851d84..53a0d6e8df48 100644 --- a/Specs/Core/SphereOutlineGeometrySpec.js +++ b/Specs/Core/SphereOutlineGeometrySpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/SphereOutlineGeometry', 'Specs/createPackableSpecs' ], function( SphereOutlineGeometry, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/SphereOutlineGeometry', function() { it('constructor throws if stackPartitions less than 1', function() { expect(function() { @@ -61,3 +63,4 @@ defineSuite([ var packedInstance = [1.0, 1.0, 1.0, 3.0, 3.0, 2.0, -1.0]; createPackableSpecs(SphereOutlineGeometry, sphere, packedInstance); }); +}); diff --git a/Specs/Core/SphericalSpec.js b/Specs/Core/SphericalSpec.js index 2cbc09ed4515..fa7cb1cb9e9e 100644 --- a/Specs/Core/SphericalSpec.js +++ b/Specs/Core/SphericalSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Spherical', 'Core/Cartesian3', 'Core/Math' @@ -6,7 +6,9 @@ defineSuite([ Spherical, Cartesian3, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/Spherical', function() { //Mock object to make sure methods take non-sphericals. function NotSpherical(clock, cone, magnitude) { @@ -109,3 +111,4 @@ defineSuite([ expect(v.toString()).toEqual('(1, 2, 3)'); }); }); +}); diff --git a/Specs/Core/SplineSpec.js b/Specs/Core/SplineSpec.js index 415531f062fd..da1f75651aea 100644 --- a/Specs/Core/SplineSpec.js +++ b/Specs/Core/SplineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Spline', 'Core/Cartesian3', 'Core/HermiteSpline' @@ -6,7 +6,9 @@ defineSuite([ Spline, Cartesian3, HermiteSpline) { - 'use strict'; + 'use strict'; + +describe('Core/Spline', function() { it('contructor throws', function() { expect(function() { @@ -100,3 +102,4 @@ defineSuite([ expect(spline.findTimeInterval(times[0], times.length - 1)).toEqual(0); }); }); +}); diff --git a/Specs/Core/TaskProcessorSpec.js b/Specs/Core/TaskProcessorSpec.js index e9632052d013..08b41cba0cfa 100644 --- a/Specs/Core/TaskProcessorSpec.js +++ b/Specs/Core/TaskProcessorSpec.js @@ -1,16 +1,18 @@ -defineSuite([ +define([ 'Core/TaskProcessor', - 'require', 'Core/FeatureDetection', - 'ThirdParty/when', - 'Specs/absolutize' + 'require', + 'Specs/absolutize', + 'ThirdParty/when' ], function( TaskProcessor, - require, FeatureDetection, - when, - absolutize) { - 'use strict'; + require, + absolutize, + when) { + 'use strict'; + +describe('Core/TaskProcessor', function() { var taskProcessor; @@ -218,3 +220,4 @@ defineSuite([ }).toThrowRuntimeError(); }); }); +}); diff --git a/Specs/Core/TerrainEncodingSpec.js b/Specs/Core/TerrainEncodingSpec.js index 33af2e708fb1..f4d425e28cf1 100644 --- a/Specs/Core/TerrainEncodingSpec.js +++ b/Specs/Core/TerrainEncodingSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/TerrainEncoding', 'Core/AttributeCompression', 'Core/AxisAlignedBoundingBox', @@ -16,7 +16,9 @@ defineSuite([ Matrix4, TerrainQuantization, Transforms) { - 'use strict'; + 'use strict'; + +describe('Core/TerrainEncoding', function() { var center; var maximum; @@ -342,3 +344,4 @@ defineSuite([ expect(cloned.hasVertexNormals).toEqual(encoding.hasVertexNormals); }); }); +}); diff --git a/Specs/Core/TileAvailabilitySpec.js b/Specs/Core/TileAvailabilitySpec.js index 0e46a90ebce1..5c9a6751d00d 100644 --- a/Specs/Core/TileAvailabilitySpec.js +++ b/Specs/Core/TileAvailabilitySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/TileAvailability', 'Core/Cartographic', 'Core/GeographicTilingScheme', @@ -10,7 +10,9 @@ defineSuite([ GeographicTilingScheme, Rectangle, WebMercatorTilingScheme) { - 'use strict'; + 'use strict'; + +describe('Core/TileAvailability', function() { var webMercator = new WebMercatorTilingScheme(); var geographic = new GeographicTilingScheme(); @@ -125,3 +127,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/TimeIntervalCollectionSpec.js b/Specs/Core/TimeIntervalCollectionSpec.js index 671b82bf6502..b124bb6c6ba5 100644 --- a/Specs/Core/TimeIntervalCollectionSpec.js +++ b/Specs/Core/TimeIntervalCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/TimeIntervalCollection', 'Core/defaultValue', 'Core/Iso8601', @@ -12,7 +12,9 @@ defineSuite([ JulianDate, TimeInterval, TimeStandard) { - 'use strict'; + 'use strict'; + +describe('Core/TimeIntervalCollection', function() { function defaultDataCallback(interval, index) { return index; @@ -1904,3 +1906,4 @@ defineSuite([ checkIntervals(intervals, julianDates, false, false, dataCallback); }); }); +}); diff --git a/Specs/Core/TimeIntervalSpec.js b/Specs/Core/TimeIntervalSpec.js index 7972069d8a16..5b616baaeec8 100644 --- a/Specs/Core/TimeIntervalSpec.js +++ b/Specs/Core/TimeIntervalSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/TimeInterval', 'Core/JulianDate' ], function( TimeInterval, JulianDate) { - 'use strict'; + 'use strict'; + +describe('Core/TimeInterval', function() { function returnTrue() { return true; @@ -469,3 +471,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/TipsifySpec.js b/Specs/Core/TipsifySpec.js index 95d59821e1be..30ddadc6c8cf 100644 --- a/Specs/Core/TipsifySpec.js +++ b/Specs/Core/TipsifySpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/Tipsify' ], function( Tipsify) { - 'use strict'; + 'use strict'; + +describe('Core/Tipsify', function() { it('can calculate the ACMR', function() { //Hexagon formed from 6 triangles, 7 vertices @@ -112,3 +114,4 @@ defineSuite([ cacheSize: 6})); }); }); +}); diff --git a/Specs/Core/TransformsSpec.js b/Specs/Core/TransformsSpec.js index dee8ae7cfef6..ec761154b5a8 100644 --- a/Specs/Core/TransformsSpec.js +++ b/Specs/Core/TransformsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Transforms', 'Core/Cartesian2', 'Core/Cartesian3', @@ -32,7 +32,9 @@ defineSuite([ Quaternion, Resource, TimeInterval) { - 'use strict'; + 'use strict'; + +describe('Core/Transforms', function() { var negativeX = new Cartesian4(-1, 0, 0, 0); var negativeY = new Cartesian4(0, -1, 0, 0); @@ -1228,3 +1230,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/TranslationRotationScaleSpec.js b/Specs/Core/TranslationRotationScaleSpec.js index 9a8911a427ca..0761a205216a 100644 --- a/Specs/Core/TranslationRotationScaleSpec.js +++ b/Specs/Core/TranslationRotationScaleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/TranslationRotationScale', 'Core/Cartesian3', 'Core/Quaternion' @@ -6,7 +6,9 @@ defineSuite([ TranslationRotationScale, Cartesian3, Quaternion) { - 'use strict'; + 'use strict'; + +describe('Core/TranslationRotationScale', function() { it('sets correct values when constructed with no arguments', function() { var transformation = new TranslationRotationScale(); @@ -52,3 +54,4 @@ defineSuite([ expect(left.equals(right)).toEqual(false); }); }); +}); diff --git a/Specs/Core/TridiagonalSystemSolverSpec.js b/Specs/Core/TridiagonalSystemSolverSpec.js index 5fe135b50529..33e5d998d426 100644 --- a/Specs/Core/TridiagonalSystemSolverSpec.js +++ b/Specs/Core/TridiagonalSystemSolverSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/TridiagonalSystemSolver', 'Core/Cartesian3', 'Core/Math' @@ -6,7 +6,9 @@ defineSuite([ TridiagonalSystemSolver, Cartesian3, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/TridiagonalSystemSolver', function() { it('solve throws exception without lower diagonal', function() { expect(function() { @@ -108,3 +110,4 @@ defineSuite([ expect(actual[8]).toEqualEpsilon(expected[8], CesiumMath.EPSILON4); }); }); +}); diff --git a/Specs/Core/TrustedServersSpec.js b/Specs/Core/TrustedServersSpec.js index 3d64be04ed83..8d10b8aeebb6 100644 --- a/Specs/Core/TrustedServersSpec.js +++ b/Specs/Core/TrustedServersSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/TrustedServers' ], function( TrustedServers) { - 'use strict'; + 'use strict'; + +describe('Core/TrustedServers', function() { afterEach(function() { TrustedServers.clear(); @@ -77,3 +79,4 @@ defineSuite([ expect(TrustedServers.contains('http://cesiumjs.org/index.html')).toBe(true); }); }); +}); diff --git a/Specs/Core/VRTheWorldTerrainProviderSpec.js b/Specs/Core/VRTheWorldTerrainProviderSpec.js index 024c408eef12..a9944fa99ef8 100644 --- a/Specs/Core/VRTheWorldTerrainProviderSpec.js +++ b/Specs/Core/VRTheWorldTerrainProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/VRTheWorldTerrainProvider', 'Core/DefaultProxy', 'Core/GeographicTilingScheme', @@ -22,7 +22,9 @@ defineSuite([ TerrainProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Core/VRTheWorldTerrainProvider', function() { var imageUrl = 'Data/Images/Red16x16.png'; @@ -298,3 +300,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/VertexFormatSpec.js b/Specs/Core/VertexFormatSpec.js index ae0d7c668100..fd25be000cc2 100644 --- a/Specs/Core/VertexFormatSpec.js +++ b/Specs/Core/VertexFormatSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/VertexFormat', 'Specs/createPackableSpecs' ], function( VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/VertexFormat', function() { it('clone', function() { var vertexFormat = new VertexFormat({ @@ -29,3 +31,4 @@ defineSuite([ createPackableSpecs(VertexFormat, VertexFormat.POSITION_AND_NORMAL, [1.0, 1.0, 0.0, 0.0, 0.0, 0.0]); }); +}); diff --git a/Specs/Core/VideoSynchronizerSpec.js b/Specs/Core/VideoSynchronizerSpec.js index c024df45de5e..72baa4a5d4a4 100644 --- a/Specs/Core/VideoSynchronizerSpec.js +++ b/Specs/Core/VideoSynchronizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/VideoSynchronizer', 'Core/Clock', 'Core/FeatureDetection', @@ -14,7 +14,9 @@ defineSuite([ JulianDate, CesiumMath, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Core/VideoSynchronizer', function() { //Video textures do not work on Internet Explorer if (FeatureDetection.isInternetExplorer()) { @@ -192,3 +194,4 @@ defineSuite([ videoSynchronizer.destroy(); }); }); +}); diff --git a/Specs/Core/WallGeometrySpec.js b/Specs/Core/WallGeometrySpec.js index bb8ca7ac1e44..1639eae43a7a 100644 --- a/Specs/Core/WallGeometrySpec.js +++ b/Specs/Core/WallGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/WallGeometry', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, VertexFormat, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/WallGeometry', function() { var ellipsoid = Ellipsoid.WGS84; @@ -305,3 +307,4 @@ defineSuite([ createPackableSpecs(WallGeometry, wall, packedInstance); }); +}); diff --git a/Specs/Core/WallOutlineGeometrySpec.js b/Specs/Core/WallOutlineGeometrySpec.js index 902885728425..ac0f461f5066 100644 --- a/Specs/Core/WallOutlineGeometrySpec.js +++ b/Specs/Core/WallOutlineGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/WallOutlineGeometry', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -10,7 +10,9 @@ defineSuite([ Ellipsoid, CesiumMath, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('Core/WallOutlineGeometry', function() { var ellipsoid = Ellipsoid.WGS84; @@ -187,3 +189,4 @@ defineSuite([ var packedInstance = [3.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 1.0, 0.01]; createPackableSpecs(WallOutlineGeometry, wall, packedInstance); }); +}); diff --git a/Specs/Core/WebMercatorProjectionSpec.js b/Specs/Core/WebMercatorProjectionSpec.js index ac82f8a1227b..6c7d93cef550 100644 --- a/Specs/Core/WebMercatorProjectionSpec.js +++ b/Specs/Core/WebMercatorProjectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/WebMercatorProjection', 'Core/Cartesian2', 'Core/Cartesian3', @@ -12,7 +12,9 @@ defineSuite([ Cartographic, Ellipsoid, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/WebMercatorProjection', function() { it('construct0', function() { var projection = new WebMercatorProjection(); @@ -156,3 +158,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/WebMercatorTilingSchemeSpec.js b/Specs/Core/WebMercatorTilingSchemeSpec.js index 1728b21c71d6..189d1dbc094a 100644 --- a/Specs/Core/WebMercatorTilingSchemeSpec.js +++ b/Specs/Core/WebMercatorTilingSchemeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/WebMercatorTilingScheme', 'Core/Cartesian2', 'Core/Cartographic', @@ -16,7 +16,9 @@ defineSuite([ Rectangle, TilingScheme, WebMercatorProjection) { - 'use strict'; + 'use strict'; + +describe('Core/WebMercatorTilingScheme', function() { var tilingScheme; beforeEach(function() { @@ -275,3 +277,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/appendForwardSlashSpec.js b/Specs/Core/appendForwardSlashSpec.js index c2dd9476f6aa..8cb3cb55421b 100644 --- a/Specs/Core/appendForwardSlashSpec.js +++ b/Specs/Core/appendForwardSlashSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/appendForwardSlash' ], function( appendForwardSlash) { - 'use strict'; + 'use strict'; + +describe('Core/appendForwardSlash', function() { it('Appends to a url', function() { expect(appendForwardSlash('http://cesiumjs.org')).toEqual('http://cesiumjs.org/'); @@ -16,3 +18,4 @@ defineSuite([ expect(appendForwardSlash('')).toEqual('/'); }); }); +}); diff --git a/Specs/Core/arrayFillSpec.js b/Specs/Core/arrayFillSpec.js index bd35b4e99c80..5e67fca112ac 100644 --- a/Specs/Core/arrayFillSpec.js +++ b/Specs/Core/arrayFillSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/arrayFill' ], function( arrayFill) { - 'use strict'; + 'use strict'; + +describe('Core/arrayFill', function() { var array; @@ -54,3 +56,4 @@ defineSuite([ }).toThrowDeveloperError('end must be a valid index.'); }); }); +}); diff --git a/Specs/Core/arrayRemoveDuplicatesSpec.js b/Specs/Core/arrayRemoveDuplicatesSpec.js index 8a238b753048..38345725600e 100644 --- a/Specs/Core/arrayRemoveDuplicatesSpec.js +++ b/Specs/Core/arrayRemoveDuplicatesSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/arrayRemoveDuplicates', 'Core/Cartesian3', 'Core/Math', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, CesiumMath, Spherical) { - 'use strict'; + 'use strict'; + +describe('Core/arrayRemoveDuplicates', function() { it('removeDuplicates returns positions if none removed', function() { var positions = [Cartesian3.ZERO]; @@ -165,3 +167,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/arraySliceSpec.js b/Specs/Core/arraySliceSpec.js index ff967323fb84..eafafac2b271 100644 --- a/Specs/Core/arraySliceSpec.js +++ b/Specs/Core/arraySliceSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/arraySlice', 'Core/FeatureDetection' ], function( arraySlice, FeatureDetection) { - 'use strict'; + 'use strict'; + +describe('Core/arraySlice', function() { var array = [1, 2, 3, 4, 5]; @@ -50,3 +52,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/barycentricCoordinatesSpec.js b/Specs/Core/barycentricCoordinatesSpec.js index 2738d2876340..89d602c884a8 100644 --- a/Specs/Core/barycentricCoordinatesSpec.js +++ b/Specs/Core/barycentricCoordinatesSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/barycentricCoordinates', 'Core/Cartesian3', 'Core/Math' @@ -6,7 +6,9 @@ defineSuite([ barycentricCoordinates, Cartesian3, CesiumMath) { - 'use strict'; + 'use strict'; + +describe('Core/barycentricCoordinates', function() { var p0 = new Cartesian3(-1.0, 0.0, 0.0); var p1 = new Cartesian3( 1.0, 0.0, 0.0); @@ -81,3 +83,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/binarySearchSpec.js b/Specs/Core/binarySearchSpec.js index ab816049d32f..6b9843cafae1 100644 --- a/Specs/Core/binarySearchSpec.js +++ b/Specs/Core/binarySearchSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/binarySearch' ], function( binarySearch) { - 'use strict'; + 'use strict'; + +describe('Core/binarySearch', function() { it('can perform a binary search for 0', function() { var array = [0, 1, 2, 3, 4, 5, 6, 7]; @@ -71,3 +73,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/buildModuleUrlSpec.js b/Specs/Core/buildModuleUrlSpec.js index df54e1606488..064c0e18f71a 100644 --- a/Specs/Core/buildModuleUrlSpec.js +++ b/Specs/Core/buildModuleUrlSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/buildModuleUrl', 'Core/Resource', 'ThirdParty/Uri' @@ -6,7 +6,9 @@ defineSuite([ buildModuleUrl, Resource, Uri) { - 'use strict'; + 'use strict'; + +describe('Core/buildModuleUrl', function() { it('produces an absolute URL for a module', function() { var url = buildModuleUrl('Workers/transferTypedArrayTest.js'); @@ -59,3 +61,4 @@ defineSuite([ buildModuleUrl._clearBaseResource(); }); }); +}); diff --git a/Specs/Core/cloneSpec.js b/Specs/Core/cloneSpec.js index 21737ee98658..e755af7e9a3a 100644 --- a/Specs/Core/cloneSpec.js +++ b/Specs/Core/cloneSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/clone' ], function( clone) { - 'use strict'; + 'use strict'; + +describe('Core/clone', function() { it('can make shallow clones', function() { var obj = { @@ -46,3 +48,4 @@ defineSuite([ expect(clonedObj.c.e.f.g).toEqual(obj.c.e.f.g); }); }); +}); diff --git a/Specs/Core/combineSpec.js b/Specs/Core/combineSpec.js index 0308a3ae934e..1f3e199c27a7 100644 --- a/Specs/Core/combineSpec.js +++ b/Specs/Core/combineSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/combine' ], function( combine) { - 'use strict'; + 'use strict'; + +describe('Core/combine', function() { it('can combine shallow references', function() { var obj1 = { @@ -79,3 +81,4 @@ defineSuite([ expect(combine(undefined, undefined, true)).toEqual({}); }); }); +}); diff --git a/Specs/Core/createGuidSpec.js b/Specs/Core/createGuidSpec.js index 691b08a03f58..359aa100f811 100644 --- a/Specs/Core/createGuidSpec.js +++ b/Specs/Core/createGuidSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/createGuid' ], function( createGuid) { - 'use strict'; + 'use strict'; + +describe('Core/createGuid', function() { it('creates GUIDs', function() { var isGuidRegex = /^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$/; @@ -28,3 +30,4 @@ defineSuite([ expect(guid3.length).toEqual(36); }); }); +}); diff --git a/Specs/Core/defaultValueSpec.js b/Specs/Core/defaultValueSpec.js index 51d2517a6cb9..dda161338e2b 100644 --- a/Specs/Core/defaultValueSpec.js +++ b/Specs/Core/defaultValueSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/defaultValue' ], function( defaultValue) { - 'use strict'; + 'use strict'; + +describe('Core/defaultValue', function() { it('Works with first parameter undefined', function() { expect(defaultValue(undefined, 5)).toEqual(5); @@ -17,3 +19,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/definedSpec.js b/Specs/Core/definedSpec.js index 41283704697b..b839d140d220 100644 --- a/Specs/Core/definedSpec.js +++ b/Specs/Core/definedSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/defined' ], function( defined) { - 'use strict'; + 'use strict'; + +describe('Core/defined', function() { it('works for defined value', function() { expect(defined(0)).toEqual(true); @@ -16,3 +18,4 @@ defineSuite([ expect(defined(undefined)).toEqual(false); }); }); +}); diff --git a/Specs/Core/deprecationWarningSpec.js b/Specs/Core/deprecationWarningSpec.js index 3dc2fa6a821e..a36770016919 100644 --- a/Specs/Core/deprecationWarningSpec.js +++ b/Specs/Core/deprecationWarningSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/deprecationWarning' ], function( deprecationWarning) { - 'use strict'; + 'use strict'; + +describe('Core/deprecationWarning', function() { it('logs a warning', function() { spyOn(console, 'warn'); @@ -28,3 +30,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/getAbsoluteUriSpec.js b/Specs/Core/getAbsoluteUriSpec.js index 57092d889013..9c938eaac6fc 100644 --- a/Specs/Core/getAbsoluteUriSpec.js +++ b/Specs/Core/getAbsoluteUriSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/getAbsoluteUri', 'Core/getBaseUri' ], function( getAbsoluteUri, getBaseUri) { - 'use strict'; + 'use strict'; + +describe('Core/getAbsoluteUri', function() { it('works as expected', function() { var result = getAbsoluteUri('http://www.mysite.com/awesome?makeitawesome=true'); @@ -33,3 +35,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/getBaseUriSpec.js b/Specs/Core/getBaseUriSpec.js index 07afcfe43609..97382a13dc39 100644 --- a/Specs/Core/getBaseUriSpec.js +++ b/Specs/Core/getBaseUriSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/getBaseUri' ], function( getBaseUri) { - 'use strict'; + 'use strict'; + +describe('Core/getBaseUri', function() { it('works as expected', function() { var result = getBaseUri('http://www.mysite.com/awesome?makeitawesome=true'); @@ -26,3 +28,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/getExtensionFromUriSpec.js b/Specs/Core/getExtensionFromUriSpec.js index eed43291f013..99586a016fe9 100644 --- a/Specs/Core/getExtensionFromUriSpec.js +++ b/Specs/Core/getExtensionFromUriSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/getExtensionFromUri' ], function( getExtensionFromUri) { - 'use strict'; + 'use strict'; + +describe('Core/getExtensionFromUri', function() { it('works as expected', function() { var result = getExtensionFromUri('http://www.mysite.com/awesome?makeitawesome=true'); @@ -21,3 +23,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/getFilenameFromUriSpec.js b/Specs/Core/getFilenameFromUriSpec.js index 34b0fc72f5fc..ca7491ff668c 100644 --- a/Specs/Core/getFilenameFromUriSpec.js +++ b/Specs/Core/getFilenameFromUriSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/getFilenameFromUri' ], function( getFilenameFromUri) { - 'use strict'; + 'use strict'; + +describe('Core/getFilenameFromUri', function() { it('works as expected', function() { var result = getFilenameFromUri('http://www.mysite.com/awesome?makeitawesome=true'); @@ -18,3 +20,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/getStringFromTypedArraySpec.js b/Specs/Core/getStringFromTypedArraySpec.js index 1b34db25f50e..4b30371df4fd 100644 --- a/Specs/Core/getStringFromTypedArraySpec.js +++ b/Specs/Core/getStringFromTypedArraySpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/getStringFromTypedArray' ], function( getStringFromTypedArray) { - 'use strict'; + 'use strict'; + +describe('Core/getStringFromTypedArray', function() { function verifyString() { var arr = new Uint8Array([67, 101, 115, 105, 117, 109]); @@ -93,3 +95,4 @@ defineSuite([ expect(getStringFromTypedArray(arr)).toEqual('𐊁'); }); }); +}); diff --git a/Specs/Core/isBlobUriSpec.js b/Specs/Core/isBlobUriSpec.js index f410c8521f7c..5a51d86a8a33 100644 --- a/Specs/Core/isBlobUriSpec.js +++ b/Specs/Core/isBlobUriSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/isBlobUri' ], function( isBlobUri) { - 'use strict'; + 'use strict'; + +describe('Core/isBlobUri', function() { it('Throws if url is undefined', function() { expect(function() { @@ -24,3 +26,4 @@ defineSuite([ expect(isBlobUri(blobUrl)).toEqual(true); }); }); +}); diff --git a/Specs/Core/isCrossOriginUrlSpec.js b/Specs/Core/isCrossOriginUrlSpec.js index 818baa490208..a1f598ce57ee 100644 --- a/Specs/Core/isCrossOriginUrlSpec.js +++ b/Specs/Core/isCrossOriginUrlSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/isCrossOriginUrl', 'Core/getAbsoluteUri', 'ThirdParty/Uri' @@ -6,7 +6,9 @@ defineSuite([ isCrossOriginUrl, getAbsoluteUri, Uri) { - 'use strict'; + 'use strict'; + +describe('Core/isCrossOriginUrl', function() { it('returns false for relative urls', function() { expect(isCrossOriginUrl('/some/url.jpg')).toEqual(false); @@ -40,3 +42,4 @@ defineSuite([ expect(isCrossOriginUrl(absoluteUrl)).toEqual(true); }); }); +}); diff --git a/Specs/Core/isDataUriSpec.js b/Specs/Core/isDataUriSpec.js index 08716b896a56..618d9b3f6681 100644 --- a/Specs/Core/isDataUriSpec.js +++ b/Specs/Core/isDataUriSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/isDataUri' ], function( isDataUri) { - 'use strict'; + 'use strict'; + +describe('Core/isDataUri', function() { it('Throws if url is undefined', function() { expect(function() { @@ -19,3 +21,4 @@ defineSuite([ expect(isDataUri(uri)).toEqual(true); }); }); +}); diff --git a/Specs/Core/isLeapYearSpec.js b/Specs/Core/isLeapYearSpec.js index 9107eae0b79a..36fe089ba9f8 100644 --- a/Specs/Core/isLeapYearSpec.js +++ b/Specs/Core/isLeapYearSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/isLeapYear' ], function( isLeapYear) { - 'use strict'; + 'use strict'; + +describe('Core/isLeapYear', function() { it('Check for valid leap years', function() { expect(isLeapYear(2000)).toEqual(true); @@ -32,3 +34,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/loadCRNSpec.js b/Specs/Core/loadCRNSpec.js index a40fb36226e7..73d9b3748d33 100644 --- a/Specs/Core/loadCRNSpec.js +++ b/Specs/Core/loadCRNSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/loadCRN', 'Core/PixelFormat', 'Core/Request', @@ -12,7 +12,9 @@ defineSuite([ RequestErrorEvent, RequestScheduler, Resource) { - 'use strict'; + 'use strict'; + +describe('Core/loadCRN', function() { var validCompressed = new Uint8Array([72, 120, 0, 74, 227, 123, 0, 0, 0, 138, 92, 167, 0, 4, 0, 4, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 22, 0, 1, 0, 0, 96, 0, 0, 12, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 108, 0, 0, 0, 137, 0, 10, 96, 0, 0, 0, 0, 0, 0, 16, 4, 9, 130, 0, 0, 0, 0, 0, 0, 109, 4, 0, 0, 198, 96, 128, 0, 0, 0, 0, 0, 26, 80, 0, 0, 6, 96, 0, 0, 0, 0, 0, 0, 16, 0, 51, 0, 0, 0, 0, 0, 0, 0, 128, 1, 152, 0, 0, 0, 0, 0, 0, 4, 0]); var validCompressedMipmap = new Uint8Array([72, 120, 0, 82, 183, 141, 0, 0, 0, 148, 151, 24, 0, 4, 0, 4, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 22, 0, 1, 0, 0, 104, 0, 0, 12, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 116, 0, 0, 0, 145, 0, 0, 0, 146, 0, 0, 0, 147, 0, 130, 97, 0, 0, 0, 0, 0, 4, 35, 37, 0, 3, 48, 0, 0, 0, 0, 0, 0, 8, 200, 0, 198, 96, 128, 0, 0, 0, 0, 0, 26, 80, 0, 0, 6, 96, 0, 0, 0, 0, 0, 0, 16, 0, 51, 0, 0, 0, 0, 0, 0, 0, 128, 1, 152, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0]); @@ -223,3 +225,4 @@ defineSuite([ RequestScheduler.maximumRequests = oldMaximumRequests; }); }); +}); diff --git a/Specs/Core/loadImageFromTypedArraySpec.js b/Specs/Core/loadImageFromTypedArraySpec.js index 35a73dfaef37..7a5769de7bd3 100644 --- a/Specs/Core/loadImageFromTypedArraySpec.js +++ b/Specs/Core/loadImageFromTypedArraySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/loadImageFromTypedArray', 'Core/Resource', 'ThirdParty/when' @@ -6,7 +6,9 @@ defineSuite([ loadImageFromTypedArray, Resource, when) { - 'use strict'; + 'use strict'; + +describe('Core/loadImageFromTypedArray', function() { var supportsImageBitmapOptions; @@ -118,3 +120,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/loadKTXSpec.js b/Specs/Core/loadKTXSpec.js index 7d2057d788d7..748ba02e98d6 100644 --- a/Specs/Core/loadKTXSpec.js +++ b/Specs/Core/loadKTXSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/loadKTX', 'Core/PixelFormat', 'Core/Request', @@ -14,7 +14,9 @@ defineSuite([ RequestScheduler, Resource, RuntimeError) { - 'use strict'; + 'use strict'; + +describe('Core/loadKTX', function() { var validCompressed = new Uint8Array([171, 75, 84, 88, 32, 49, 49, 187, 13, 10, 26, 10, 1, 2, 3, 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 241, 131, 0, 0, 8, 25, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 224, 7, 224, 7, 0, 0, 0, 0]); var validCompressedMipmap = new Uint8Array([171, 75, 84, 88, 32, 49, 49, 187, 13, 10, 26, 10, 1, 2, 3, 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 100, 141, 0, 0, 7, 25, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, 52, 0, 0, 0, 19, 0, 0, 0, 67, 82, 78, 76, 73, 66, 95, 70, 79, 85, 82, 67, 67, 0, 69, 84, 67, 49, 0, 0, 23, 0, 0, 0, 75, 84, 88, 111, 114, 105, 101, 110, 116, 97, 116, 105, 111, 110, 0, 83, 61, 114, 44, 84, 61, 100, 0, 0, 8, 0, 0, 0, 255, 0, 0, 0, 255, 255, 0, 0, 8, 0, 0, 0, 255, 0, 0, 0, 255, 255, 0, 0, 8, 0, 0, 0, 255, 0, 0, 0, 255, 255, 0, 0]); @@ -430,3 +432,4 @@ defineSuite([ RequestScheduler.maximumRequests = oldMaximumRequests; }); }); +}); diff --git a/Specs/Core/mergeSortSpec.js b/Specs/Core/mergeSortSpec.js index 2d425411a3c1..626cb530a2f9 100644 --- a/Specs/Core/mergeSortSpec.js +++ b/Specs/Core/mergeSortSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/mergeSort', 'Core/BoundingSphere', 'Core/Cartesian3' @@ -6,7 +6,9 @@ defineSuite([ mergeSort, BoundingSphere, Cartesian3) { - 'use strict'; + 'use strict'; + +describe('Core/mergeSort', function() { it('sorts', function() { var array = [0, 9, 1, 8, 2, 7, 3, 6, 4, 5]; @@ -57,3 +59,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/objectToQuerySpec.js b/Specs/Core/objectToQuerySpec.js index cd55ebabb65f..61fc493ba303 100644 --- a/Specs/Core/objectToQuerySpec.js +++ b/Specs/Core/objectToQuerySpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/objectToQuery', 'Core/queryToObject' ], function( objectToQuery, queryToObject) { - 'use strict'; + 'use strict'; + +describe('Core/objectToQuery', function() { it('can encode data', function() { var obj = { @@ -55,3 +57,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/oneTimeWarningSpec.js b/Specs/Core/oneTimeWarningSpec.js index 14261f4d53ed..e583a285fea4 100644 --- a/Specs/Core/oneTimeWarningSpec.js +++ b/Specs/Core/oneTimeWarningSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/oneTimeWarning' ], function( oneTimeWarning) { - 'use strict'; + 'use strict'; + +describe('Core/oneTimeWarning', function() { it('logs a warning', function() { spyOn(console, 'warn'); @@ -22,3 +24,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/parseResponseHeadersSpec.js b/Specs/Core/parseResponseHeadersSpec.js index 156db7a7448c..330ba1ee62bf 100644 --- a/Specs/Core/parseResponseHeadersSpec.js +++ b/Specs/Core/parseResponseHeadersSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/parseResponseHeaders' ], function( parseResponseHeaders) { - 'use strict'; + 'use strict'; + +describe('Core/parseResponseHeaders', function() { it('returns an empty object literal when given falsy input', function() { expect(parseResponseHeaders()).toEqual({}); @@ -28,3 +30,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/pointInsideTriangleSpec.js b/Specs/Core/pointInsideTriangleSpec.js index 15168b82cd71..f72432c80d0a 100644 --- a/Specs/Core/pointInsideTriangleSpec.js +++ b/Specs/Core/pointInsideTriangleSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/pointInsideTriangle', 'Core/Cartesian2' ], function( pointInsideTriangle, Cartesian2) { - 'use strict'; + 'use strict'; + +describe('Core/pointInsideTriangle', function() { it('pointInsideTriangle has point inside', function() { expect(pointInsideTriangle(new Cartesian2(0.25, 0.25), Cartesian2.ZERO, new Cartesian2(1.0, 0.0), new Cartesian2(0.0, 1.0))).toEqual(true); @@ -54,3 +56,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/queryToObjectSpec.js b/Specs/Core/queryToObjectSpec.js index c6da755d800a..6ecc3207ce93 100644 --- a/Specs/Core/queryToObjectSpec.js +++ b/Specs/Core/queryToObjectSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/queryToObject' ], function( queryToObject) { - 'use strict'; + 'use strict'; + +describe('Core/queryToObject', function() { it('can decode data', function() { var str = 'key1=some%20value&key2=a%2Fb'; @@ -58,3 +60,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/requestAnimationFrameSpec.js b/Specs/Core/requestAnimationFrameSpec.js index 2ae2ade5ea88..48d0fe937003 100644 --- a/Specs/Core/requestAnimationFrameSpec.js +++ b/Specs/Core/requestAnimationFrameSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/requestAnimationFrame', 'Core/cancelAnimationFrame', 'ThirdParty/when' @@ -6,7 +6,9 @@ defineSuite([ requestAnimationFrame, cancelAnimationFrame, when) { - 'use strict'; + 'use strict'; + +describe('Core/requestAnimationFrame', function() { it('calls the callback', function() { var deferred = when.defer(); @@ -57,3 +59,4 @@ defineSuite([ return deferred.promise; }); }); +}); diff --git a/Specs/Core/sampleTerrainMostDetailedSpec.js b/Specs/Core/sampleTerrainMostDetailedSpec.js index a6a1eaad0ac0..73e3df07340e 100644 --- a/Specs/Core/sampleTerrainMostDetailedSpec.js +++ b/Specs/Core/sampleTerrainMostDetailedSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/sampleTerrainMostDetailed', 'Core/Cartographic', 'Core/CesiumTerrainProvider', @@ -8,7 +8,9 @@ defineSuite([ Cartographic, CesiumTerrainProvider, createWorldTerrain) { - 'use strict'; + 'use strict'; + +describe('Core/sampleTerrainMostDetailed', function() { var worldTerrain = createWorldTerrain(); @@ -82,3 +84,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Core/sampleTerrainSpec.js b/Specs/Core/sampleTerrainSpec.js index a11d19359e9d..d7d358141a29 100644 --- a/Specs/Core/sampleTerrainSpec.js +++ b/Specs/Core/sampleTerrainSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/sampleTerrain', 'Core/Cartographic', 'Core/CesiumTerrainProvider', @@ -8,7 +8,9 @@ defineSuite([ Cartographic, CesiumTerrainProvider, createWorldTerrain) { - 'use strict'; + 'use strict'; + +describe('Core/sampleTerrain', function() { var worldTerrain = createWorldTerrain(); @@ -100,3 +102,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Core/subdivideArraySpec.js b/Specs/Core/subdivideArraySpec.js index 022a938dd005..e0b9963c288a 100644 --- a/Specs/Core/subdivideArraySpec.js +++ b/Specs/Core/subdivideArraySpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Core/subdivideArray' ], function( subdivideArray) { - 'use strict'; + 'use strict'; + +describe('Core/subdivideArray', function() { it('Splits evenly divided arrays', function() { var values = [1, 2, 3, 4]; @@ -41,3 +43,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Core/writeTextToCanvasSpec.js b/Specs/Core/writeTextToCanvasSpec.js index 5c49c69115f9..3eabb8437e2f 100644 --- a/Specs/Core/writeTextToCanvasSpec.js +++ b/Specs/Core/writeTextToCanvasSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Core/writeTextToCanvas', 'Core/Color' ], function( writeTextToCanvas, Color) { - 'use strict'; + 'use strict'; + +describe('Core/writeTextToCanvas', function() { it('returns undefined when text is blank', function() { var canvas = writeTextToCanvas(''); @@ -134,3 +136,4 @@ defineSuite([ expect(canvas2.height).toEqual(canvas1.height+4); }); }); +}); diff --git a/Specs/DataSources/BillboardGraphicsSpec.js b/Specs/DataSources/BillboardGraphicsSpec.js index 5a7baa4b281a..be34ff69dc12 100644 --- a/Specs/DataSources/BillboardGraphicsSpec.js +++ b/Specs/DataSources/BillboardGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/BillboardGraphics', 'Core/Cartesian2', 'Core/Cartesian3', @@ -20,7 +20,9 @@ defineSuite([ HeightReference, HorizontalOrigin, VerticalOrigin) { - 'use strict'; + 'use strict'; + +describe('DataSources/BillboardGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -276,3 +278,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/BillboardVisualizerSpec.js b/Specs/DataSources/BillboardVisualizerSpec.js index 92fda4fd6927..e8b392100ebe 100644 --- a/Specs/DataSources/BillboardVisualizerSpec.js +++ b/Specs/DataSources/BillboardVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/BillboardVisualizer', 'Core/BoundingRectangle', 'Core/BoundingSphere', @@ -42,7 +42,9 @@ defineSuite([ createGlobe, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/BillboardVisualizer', function() { var scene; var entityCluster; @@ -416,3 +418,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/BoxGeometryUpdaterSpec.js b/Specs/DataSources/BoxGeometryUpdaterSpec.js index c7e5dc8d09c3..a56ad6bd4efe 100644 --- a/Specs/DataSources/BoxGeometryUpdaterSpec.js +++ b/Specs/DataSources/BoxGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/BoxGeometryUpdater', 'Core/Cartesian3', 'Core/Color', @@ -32,7 +32,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/BoxGeometryUpdater', function() { var scene; var time; @@ -186,3 +188,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(BoxGeometryUpdater, 'box', createDynamicBox, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/BoxGraphicsSpec.js b/Specs/DataSources/BoxGraphicsSpec.js index 3c2887aa366e..9952cfdbb045 100644 --- a/Specs/DataSources/BoxGraphicsSpec.js +++ b/Specs/DataSources/BoxGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/BoxGraphics', 'Core/Cartesian3', 'Core/Color', @@ -18,7 +18,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/BoxGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -162,3 +164,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/CallbackPropertySpec.js b/Specs/DataSources/CallbackPropertySpec.js index 7a76269153de..ecb3e85b1f1a 100644 --- a/Specs/DataSources/CallbackPropertySpec.js +++ b/Specs/DataSources/CallbackPropertySpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'DataSources/CallbackProperty', 'Core/JulianDate' ], function( CallbackProperty, JulianDate) { - 'use strict'; + 'use strict'; + +describe('DataSources/CallbackProperty', function() { var time = JulianDate.now(); @@ -74,3 +76,4 @@ defineSuite([ expect(left.equals(right)).toEqual(false); }); }); +}); diff --git a/Specs/DataSources/CheckerboardMaterialPropertySpec.js b/Specs/DataSources/CheckerboardMaterialPropertySpec.js index 9f4e7ddabc12..fe7b3916403a 100644 --- a/Specs/DataSources/CheckerboardMaterialPropertySpec.js +++ b/Specs/DataSources/CheckerboardMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CheckerboardMaterialProperty', 'Core/Cartesian2', 'Core/Color', @@ -16,7 +16,9 @@ defineSuite([ ConstantProperty, TimeIntervalCollectionProperty, testDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/CheckerboardMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new CheckerboardMaterialProperty(); @@ -146,3 +148,4 @@ defineSuite([ testDefinitionChanged(property, 'repeat', new Cartesian2(5, 5), new Cartesian2(7, 7)); }); }); +}); diff --git a/Specs/DataSources/ColorMaterialPropertySpec.js b/Specs/DataSources/ColorMaterialPropertySpec.js index 9a2cd2111a1f..029c5bdb40c5 100644 --- a/Specs/DataSources/ColorMaterialPropertySpec.js +++ b/Specs/DataSources/ColorMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ColorMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, ConstantProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/ColorMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new ColorMaterialProperty(); @@ -101,3 +103,4 @@ defineSuite([ expect(listener.calls.count()).toEqual(0); }); }); +}); diff --git a/Specs/DataSources/CompositeEntityCollectionSpec.js b/Specs/DataSources/CompositeEntityCollectionSpec.js index 2f78a817e16e..5f969b992e57 100644 --- a/Specs/DataSources/CompositeEntityCollectionSpec.js +++ b/Specs/DataSources/CompositeEntityCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CompositeEntityCollection', 'Core/Iso8601', 'Core/JulianDate', @@ -22,7 +22,9 @@ defineSuite([ ConstantProperty, Entity, EntityCollection) { - 'use strict'; + 'use strict'; + +describe('DataSources/CompositeEntityCollection', function() { function CollectionListener() { this.timesCalled = 0; @@ -899,3 +901,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/CompositeMaterialPropertySpec.js b/Specs/DataSources/CompositeMaterialPropertySpec.js index 97a5f980ddb5..b34d81c1855a 100644 --- a/Specs/DataSources/CompositeMaterialPropertySpec.js +++ b/Specs/DataSources/CompositeMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CompositeMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -14,7 +14,9 @@ defineSuite([ TimeIntervalCollection, ColorMaterialProperty, GridMaterialProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/CompositeMaterialProperty', function() { it('default constructor has expected values', function() { var property = new CompositeMaterialProperty(); @@ -185,3 +187,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/CompositePositionPropertySpec.js b/Specs/DataSources/CompositePositionPropertySpec.js index 761277acce07..85154d088e05 100644 --- a/Specs/DataSources/CompositePositionPropertySpec.js +++ b/Specs/DataSources/CompositePositionPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CompositePositionProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -16,7 +16,9 @@ defineSuite([ TimeIntervalCollection, ConstantPositionProperty, PositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/CompositePositionProperty', function() { it('default constructor has expected values', function() { var property = new CompositePositionProperty(); @@ -302,3 +304,4 @@ defineSuite([ expect(listener.calls.count()).toBe(2); }); }); +}); diff --git a/Specs/DataSources/CompositePropertySpec.js b/Specs/DataSources/CompositePropertySpec.js index df00d0e2d1b0..2a28cee4b208 100644 --- a/Specs/DataSources/CompositePropertySpec.js +++ b/Specs/DataSources/CompositePropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CompositeProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, TimeIntervalCollection, ConstantProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/CompositeProperty', function() { it('default constructor has expected values', function() { var property = new CompositeProperty(); @@ -172,3 +174,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/ConstantPositionPropertySpec.js b/Specs/DataSources/ConstantPositionPropertySpec.js index 04163e655b47..9b9370fecbb8 100644 --- a/Specs/DataSources/ConstantPositionPropertySpec.js +++ b/Specs/DataSources/ConstantPositionPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ConstantPositionProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -10,7 +10,9 @@ defineSuite([ JulianDate, ReferenceFrame, PositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/ConstantPositionProperty', function() { var time = JulianDate.now(); @@ -130,3 +132,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/ConstantPropertySpec.js b/Specs/DataSources/ConstantPropertySpec.js index 887771995b27..b16a499b8165 100644 --- a/Specs/DataSources/ConstantPropertySpec.js +++ b/Specs/DataSources/ConstantPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ConstantProperty', 'Core/Cartesian3', 'Core/JulianDate' @@ -6,7 +6,9 @@ defineSuite([ ConstantProperty, Cartesian3, JulianDate) { - 'use strict'; + 'use strict'; + +describe('DataSources/ConstantProperty', function() { var time = JulianDate.now(); @@ -111,3 +113,4 @@ defineSuite([ expect(left.equals(right)).toEqual(false); }); }); +}); diff --git a/Specs/DataSources/CorridorGeometryUpdaterSpec.js b/Specs/DataSources/CorridorGeometryUpdaterSpec.js index 1f4c23f2b3cc..a0a116387ed9 100644 --- a/Specs/DataSources/CorridorGeometryUpdaterSpec.js +++ b/Specs/DataSources/CorridorGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CorridorGeometryUpdater', 'Core/ApproximateTerrainHeights', 'Core/Cartesian3', @@ -44,7 +44,9 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/CorridorGeometryUpdater', function() { var scene; var time; @@ -299,3 +301,4 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs(CorridorGeometryUpdater, 'corridor', createBasicCorridorWithoutHeight, createDynamicCorridorWithoutHeight, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/CorridorGraphicsSpec.js b/Specs/DataSources/CorridorGraphicsSpec.js index cf0baf1ded93..1b6f662bf65b 100644 --- a/Specs/DataSources/CorridorGraphicsSpec.js +++ b/Specs/DataSources/CorridorGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CorridorGraphics', 'Core/Color', 'Core/CornerType', @@ -20,7 +20,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/CorridorGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -241,3 +243,4 @@ defineSuite([ testDefinitionChanged(property, 'zIndex', 3, 0); }); }); +}); diff --git a/Specs/DataSources/CustomDataSourceSpec.js b/Specs/DataSources/CustomDataSourceSpec.js index e367814b7273..4379b9d072e6 100644 --- a/Specs/DataSources/CustomDataSourceSpec.js +++ b/Specs/DataSources/CustomDataSourceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CustomDataSource', 'Core/Event', 'DataSources/DataSourceClock', @@ -8,7 +8,9 @@ defineSuite([ Event, DataSourceClock, EntityCollection) { - 'use strict'; + 'use strict'; + +describe('DataSources/CustomDataSource', function() { it('constructor has expected defaults', function() { var dataSource = new CustomDataSource(); @@ -82,3 +84,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/DataSources/CylinderGeometryUpdaterSpec.js b/Specs/DataSources/CylinderGeometryUpdaterSpec.js index 07dcd008431e..e674a9d5000f 100644 --- a/Specs/DataSources/CylinderGeometryUpdaterSpec.js +++ b/Specs/DataSources/CylinderGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CylinderGeometryUpdater', 'Core/Cartesian3', 'Core/Color', @@ -38,7 +38,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/CylinderGeometryUpdater', function() { var scene; var time; @@ -293,3 +295,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(CylinderGeometryUpdater, 'cylinder', createDynamicCylinder, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/CylinderGraphicsSpec.js b/Specs/DataSources/CylinderGraphicsSpec.js index 62727dc0e240..83271714e244 100644 --- a/Specs/DataSources/CylinderGraphicsSpec.js +++ b/Specs/DataSources/CylinderGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CylinderGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -16,7 +16,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/CylinderGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -196,3 +198,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/CzmlDataSourceSpec.js b/Specs/DataSources/CzmlDataSourceSpec.js index f90a1a86a1fe..13c054d61997 100644 --- a/Specs/DataSources/CzmlDataSourceSpec.js +++ b/Specs/DataSources/CzmlDataSourceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/CzmlDataSource', 'Core/ArcType', 'Core/BoundingRectangle', @@ -94,7 +94,9 @@ defineSuite([ ShadowMode, VerticalOrigin, when) { - 'use strict'; + 'use strict'; + +describe('DataSources/CzmlDataSource', function() { function makeDocument(packet) { var documentPacket = { @@ -7929,3 +7931,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/DataSourceClockSpec.js b/Specs/DataSources/DataSourceClockSpec.js index 3bab54eea2a0..16c82ead9847 100644 --- a/Specs/DataSources/DataSourceClockSpec.js +++ b/Specs/DataSources/DataSourceClockSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/DataSourceClock', 'Core/ClockRange', 'Core/ClockStep', @@ -8,7 +8,9 @@ defineSuite([ ClockRange, ClockStep, JulianDate) { - 'use strict'; + 'use strict'; + +describe('DataSources/DataSourceClock', function() { it('merge assigns unassigned properties', function() { var source = new DataSourceClock(); @@ -119,3 +121,4 @@ defineSuite([ expect(clock.multiplier).toEqual(1.0); }); }); +}); diff --git a/Specs/DataSources/DataSourceCollectionSpec.js b/Specs/DataSources/DataSourceCollectionSpec.js index 67e46b2fdd70..5d303aad691d 100644 --- a/Specs/DataSources/DataSourceCollectionSpec.js +++ b/Specs/DataSources/DataSourceCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/DataSourceCollection', 'Specs/MockDataSource', 'ThirdParty/when' @@ -6,7 +6,9 @@ defineSuite([ DataSourceCollection, MockDataSource, when) { - 'use strict'; + 'use strict'; + +describe('DataSources/DataSourceCollection', function() { it('contains, get, getLength, and indexOf work', function() { var collection = new DataSourceCollection(); @@ -202,3 +204,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/DataSourceDisplaySpec.js b/Specs/DataSources/DataSourceDisplaySpec.js index a628b49e8886..f3e62ce6f3f7 100644 --- a/Specs/DataSources/DataSourceDisplaySpec.js +++ b/Specs/DataSources/DataSourceDisplaySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/DataSourceDisplay', 'Core/ApproximateTerrainHeights', 'Core/BoundingSphere', @@ -9,9 +9,9 @@ defineSuite([ 'DataSources/Entity', 'Scene/GroundPolylinePrimitive', 'Scene/GroundPrimitive', - 'ThirdParty/when', 'Specs/createScene', - 'Specs/MockDataSource' + 'Specs/MockDataSource', + 'ThirdParty/when' ], function( DataSourceDisplay, ApproximateTerrainHeights, @@ -23,10 +23,12 @@ defineSuite([ Entity, GroundPolylinePrimitive, GroundPrimitive, - when, createScene, - MockDataSource) { - 'use strict'; + MockDataSource, + when) { + 'use strict'; + +describe('DataSources/DataSourceDisplay', function() { var dataSourceCollection; var scene; @@ -551,3 +553,4 @@ defineSuite([ expect(scene.groundPrimitives.contains(display._groundPrimitives)).toBe(true); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/DynamicGeometryUpdaterSpec.js b/Specs/DataSources/DynamicGeometryUpdaterSpec.js index 570029923260..b38d9d4c3013 100644 --- a/Specs/DataSources/DynamicGeometryUpdaterSpec.js +++ b/Specs/DataSources/DynamicGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/DynamicGeometryUpdater', 'DataSources/Entity', 'DataSources/GeometryUpdater', @@ -10,7 +10,9 @@ defineSuite([ GeometryUpdater, PrimitiveCollection, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/DynamicGeometryUpdater', function() { var scene; @@ -68,3 +70,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/EllipseGeometryUpdaterSpec.js b/Specs/DataSources/EllipseGeometryUpdaterSpec.js index 559020da2906..b73afd72e529 100644 --- a/Specs/DataSources/EllipseGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipseGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EllipseGeometryUpdater', 'Core/ApproximateTerrainHeights', 'Core/Cartesian3', @@ -36,7 +36,9 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/EllipseGeometryUpdater', function() { var scene; var time; @@ -333,3 +335,4 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs(EllipseGeometryUpdater, 'ellipse', createBasicEllipseWithoutHeight, createDynamicEllipseWithoutHeight, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/EllipseGraphicsSpec.js b/Specs/DataSources/EllipseGraphicsSpec.js index fdec8f339ca4..cad023884bb6 100644 --- a/Specs/DataSources/EllipseGraphicsSpec.js +++ b/Specs/DataSources/EllipseGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EllipseGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -18,7 +18,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/EllipseGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -261,3 +263,4 @@ defineSuite([ testDefinitionChanged(property, 'zIndex', 4, 0); }); }); +}); diff --git a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js index 828536582552..c5605e68a7da 100644 --- a/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipsoidGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EllipsoidGeometryUpdater', 'Core/Cartesian3', 'Core/Color', @@ -44,7 +44,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/EllipsoidGeometryUpdater', function() { var time = JulianDate.now(); var scene; @@ -391,3 +393,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(EllipsoidGeometryUpdater, 'ellipsoid', createDynamicEllipsoid, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/EllipsoidGraphicsSpec.js b/Specs/DataSources/EllipsoidGraphicsSpec.js index 02de993902e7..d5ae1e054390 100644 --- a/Specs/DataSources/EllipsoidGraphicsSpec.js +++ b/Specs/DataSources/EllipsoidGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EllipsoidGraphics', 'Core/Cartesian3', 'Core/Color', @@ -18,7 +18,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/EllipsoidGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -193,3 +195,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/EntityClusterSpec.js b/Specs/DataSources/EntityClusterSpec.js index ef98d250f96a..0d1959867e81 100644 --- a/Specs/DataSources/EntityClusterSpec.js +++ b/Specs/DataSources/EntityClusterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EntityCluster', 'Core/Cartesian2', 'Core/Cartesian3', @@ -26,7 +26,9 @@ defineSuite([ SceneTransforms, createCanvas, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/EntityCluster', function() { var scene; var cluster; @@ -637,3 +639,4 @@ defineSuite([ expect(cluster._billboardCollection.length).toEqual(2); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/EntityCollectionSpec.js b/Specs/DataSources/EntityCollectionSpec.js index 5b13cb1a7cc0..7462c00d4c10 100644 --- a/Specs/DataSources/EntityCollectionSpec.js +++ b/Specs/DataSources/EntityCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EntityCollection', 'Core/Iso8601', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, TimeIntervalCollection, Entity) { - 'use strict'; + 'use strict'; + +describe('DataSources/EntityCollection', function() { function CollectionListener() { this.timesCalled = 0; @@ -470,3 +472,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/EntitySpec.js b/Specs/DataSources/EntitySpec.js index 79f2d6b550c2..f020f67e6102 100644 --- a/Specs/DataSources/EntitySpec.js +++ b/Specs/DataSources/EntitySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/Entity', 'Core/Cartesian3', 'Core/JulianDate', @@ -54,7 +54,9 @@ defineSuite([ PolylineVolumeGraphics, RectangleGraphics, WallGraphics) { - 'use strict'; + 'use strict'; + +describe('DataSources/Entity', function() { it('constructor sets expected properties.', function() { var entity = new Entity(); @@ -502,3 +504,4 @@ defineSuite([ expect(entity.isShowing).toBe(true); }); }); +}); diff --git a/Specs/DataSources/EntityViewSpec.js b/Specs/DataSources/EntityViewSpec.js index 34db4415016e..0a9e6e1d0c05 100644 --- a/Specs/DataSources/EntityViewSpec.js +++ b/Specs/DataSources/EntityViewSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/EntityView', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -16,7 +16,9 @@ defineSuite([ ConstantPositionProperty, Entity, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/EntityView', function() { var scene; var defaultOffset = EntityView.defaultOffset3D; @@ -111,3 +113,4 @@ defineSuite([ view.update(JulianDate.now()); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/GeoJsonDataSourceSpec.js b/Specs/DataSources/GeoJsonDataSourceSpec.js index 4ae059cbdc05..4ab264eac0ea 100644 --- a/Specs/DataSources/GeoJsonDataSourceSpec.js +++ b/Specs/DataSources/GeoJsonDataSourceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/GeoJsonDataSource', 'Core/Cartesian3', 'Core/Color', @@ -24,7 +24,9 @@ defineSuite([ EntityCollection, HeightReference, when) { - 'use strict'; + 'use strict'; + +describe('DataSources/GeoJsonDataSource', function() { var defaultMarkerSize; var defaultSymbol; @@ -1260,3 +1262,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/GeometryUpdaterSpec.js b/Specs/DataSources/GeometryUpdaterSpec.js index b9bb32f7252a..69767ce2690f 100644 --- a/Specs/DataSources/GeometryUpdaterSpec.js +++ b/Specs/DataSources/GeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/GeometryUpdater', 'DataSources/Entity', 'Scene/PrimitiveCollection', @@ -8,7 +8,9 @@ defineSuite([ Entity, PrimitiveCollection, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/GeometryUpdater', function() { var scene; @@ -121,3 +123,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/GeometryVisualizerSpec.js b/Specs/DataSources/GeometryVisualizerSpec.js index 9ed39063ab4a..4f32e7353d9b 100644 --- a/Specs/DataSources/GeometryVisualizerSpec.js +++ b/Specs/DataSources/GeometryVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/GeometryVisualizer', 'Core/ApproximateTerrainHeights', 'Core/BoundingSphere', @@ -60,7 +60,9 @@ defineSuite([ createDynamicProperty, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/GeometryVisualizer', function() { var time = JulianDate.now(); @@ -879,3 +881,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/GridMaterialPropertySpec.js b/Specs/DataSources/GridMaterialPropertySpec.js index 2a36229e0554..38b309542b13 100644 --- a/Specs/DataSources/GridMaterialPropertySpec.js +++ b/Specs/DataSources/GridMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/GridMaterialProperty', 'Core/Cartesian2', 'Core/Color', @@ -16,7 +16,9 @@ defineSuite([ ConstantProperty, SampledProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/GridMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new GridMaterialProperty(); @@ -283,3 +285,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/GroundGeometryUpdaterSpec.js b/Specs/DataSources/GroundGeometryUpdaterSpec.js index 5491874fd663..f6d96a2e3229 100644 --- a/Specs/DataSources/GroundGeometryUpdaterSpec.js +++ b/Specs/DataSources/GroundGeometryUpdaterSpec.js @@ -1,22 +1,24 @@ -defineSuite([ - 'DataSources/GroundGeometryUpdater', - 'Core/ApproximateTerrainHeights', - 'Core/Event', - 'Core/GeometryOffsetAttribute', - 'Core/JulianDate', - 'Core/Rectangle', - 'Scene/HeightReference', - 'DataSources/ConstantProperty' -], function( - GroundGeometryUpdater, - ApproximateTerrainHeights, - Event, - GeometryOffsetAttribute, - JulianDate, - Rectangle, - HeightReference, - ConstantProperty) { - 'use strict'; +define([ + 'DataSources/GroundGeometryUpdater', + 'Core/ApproximateTerrainHeights', + 'Core/Event', + 'Core/GeometryOffsetAttribute', + 'Core/JulianDate', + 'Core/Rectangle', + 'DataSources/ConstantProperty', + 'Scene/HeightReference' + ], function( + GroundGeometryUpdater, + ApproximateTerrainHeights, + Event, + GeometryOffsetAttribute, + JulianDate, + Rectangle, + ConstantProperty, + HeightReference) { + 'use strict'; + +describe('DataSources/GroundGeometryUpdater', function() { beforeAll(function() { return ApproximateTerrainHeights.initialize(); @@ -147,3 +149,4 @@ defineSuite([ expect(groundGeometryUpdater.isDestroyed()).toBe(true); }); }); +}); diff --git a/Specs/DataSources/ImageMaterialPropertySpec.js b/Specs/DataSources/ImageMaterialPropertySpec.js index 5fc991729697..a337cc4c100c 100644 --- a/Specs/DataSources/ImageMaterialPropertySpec.js +++ b/Specs/DataSources/ImageMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ImageMaterialProperty', 'Core/Cartesian2', 'Core/Color', @@ -14,7 +14,9 @@ defineSuite([ TimeInterval, ConstantProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/ImageMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new ImageMaterialProperty(); @@ -173,3 +175,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/KmlDataSourceSpec.js b/Specs/DataSources/KmlDataSourceSpec.js index c6d800c87c21..38c900d4e7b7 100644 --- a/Specs/DataSources/KmlDataSourceSpec.js +++ b/Specs/DataSources/KmlDataSourceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/KmlDataSource', 'Core/ArcType', 'Core/BoundingRectangle', @@ -76,7 +76,9 @@ defineSuite([ createCamera, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('DataSources/KmlDataSource', function() { var parser = new DOMParser(); @@ -4543,3 +4545,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/KmlTourFlyToSpec.js b/Specs/DataSources/KmlTourFlyToSpec.js index ed982b60e271..e3e60b105ec2 100644 --- a/Specs/DataSources/KmlTourFlyToSpec.js +++ b/Specs/DataSources/KmlTourFlyToSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/KmlTourFlyTo', 'Core/Cartesian3', 'Core/HeadingPitchRange', @@ -16,7 +16,9 @@ defineSuite([ KmlCamera, KmlLookAt, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/KmlTourFlyTo', function() { it('generates camera options for KmlLookAt', function() { var position = Cartesian3.fromDegrees(40.0, 30.0, 1000); @@ -135,3 +137,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/DataSources/KmlTourSpec.js b/Specs/DataSources/KmlTourSpec.js index 91994729b047..df752a67b51a 100644 --- a/Specs/DataSources/KmlTourSpec.js +++ b/Specs/DataSources/KmlTourSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/KmlTour', 'Core/Cartesian3', 'Core/HeadingPitchRange', @@ -16,7 +16,9 @@ defineSuite([ KmlTourFlyTo, KmlTourWait, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/KmlTour', function() { function getLookAt() { var position = Cartesian3.fromDegrees(40.0, 30.0, 1000); @@ -152,3 +154,4 @@ defineSuite([ }, 5); }); }); +}); diff --git a/Specs/DataSources/LabelGraphicsSpec.js b/Specs/DataSources/LabelGraphicsSpec.js index 282fc3d7a824..63f6a7ce59e1 100644 --- a/Specs/DataSources/LabelGraphicsSpec.js +++ b/Specs/DataSources/LabelGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/LabelGraphics', 'Core/Cartesian2', 'Core/Cartesian3', @@ -20,7 +20,9 @@ defineSuite([ HorizontalOrigin, LabelStyle, VerticalOrigin) { - 'use strict'; + 'use strict'; + +describe('DataSources/LabelGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -246,3 +248,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/LabelVisualizerSpec.js b/Specs/DataSources/LabelVisualizerSpec.js index c5a2112c6ac6..23997cb7ad84 100644 --- a/Specs/DataSources/LabelVisualizerSpec.js +++ b/Specs/DataSources/LabelVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/LabelVisualizer', 'Core/BoundingSphere', 'Core/Cartesian2', @@ -38,7 +38,9 @@ defineSuite([ VerticalOrigin, createGlobe, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/LabelVisualizer', function() { var scene; var entityCluster; @@ -358,3 +360,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/ModelGraphicsSpec.js b/Specs/DataSources/ModelGraphicsSpec.js index 9e194bb108a7..814928274eb9 100644 --- a/Specs/DataSources/ModelGraphicsSpec.js +++ b/Specs/DataSources/ModelGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ModelGraphics', 'Core/Cartesian2', 'Core/Cartesian3', @@ -28,7 +28,9 @@ defineSuite([ ColorBlendMode, HeightReference, ShadowMode) { - 'use strict'; + 'use strict'; + +describe('DataSources/ModelGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -351,3 +353,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/ModelVisualizerSpec.js b/Specs/DataSources/ModelVisualizerSpec.js index e3cf35d5a183..c179c078ceb1 100644 --- a/Specs/DataSources/ModelVisualizerSpec.js +++ b/Specs/DataSources/ModelVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ModelVisualizer', 'Core/BoundingSphere', 'Core/Cartesian2', @@ -48,7 +48,9 @@ defineSuite([ Globe, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/ModelVisualizer', function() { var boxUrl = './Data/Models/Box/CesiumBoxTest.gltf'; var boxArticulationsUrl = './Data/Models/Box-Articulations/Box-Articulations.gltf'; @@ -400,3 +402,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/NodeTransformationPropertySpec.js b/Specs/DataSources/NodeTransformationPropertySpec.js index cfba9ae39813..d423f97f6072 100644 --- a/Specs/DataSources/NodeTransformationPropertySpec.js +++ b/Specs/DataSources/NodeTransformationPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/NodeTransformationProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -16,7 +16,9 @@ defineSuite([ ConstantProperty, TimeIntervalCollectionProperty, testDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/NodeTransformationProperty', function() { it('default constructor sets expected values', function() { var property = new NodeTransformationProperty(); @@ -148,3 +150,4 @@ defineSuite([ testDefinitionChanged(property, 'scale', Cartesian3.UNIT_X, Cartesian3.ZERO); }); }); +}); diff --git a/Specs/DataSources/PathGraphicsSpec.js b/Specs/DataSources/PathGraphicsSpec.js index 07fba5fb8629..d2ae4a98dc42 100644 --- a/Specs/DataSources/PathGraphicsSpec.js +++ b/Specs/DataSources/PathGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PathGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -10,7 +10,9 @@ defineSuite([ DistanceDisplayCondition, ColorMaterialProperty, ConstantProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PathGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -126,3 +128,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/PathVisualizerSpec.js b/Specs/DataSources/PathVisualizerSpec.js index ffa5d9523f5e..e848a3f9e071 100644 --- a/Specs/DataSources/PathVisualizerSpec.js +++ b/Specs/DataSources/PathVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PathVisualizer', 'Core/Cartesian3', 'Core/Color', @@ -42,7 +42,9 @@ defineSuite([ TimeIntervalCollectionPositionProperty, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/PathVisualizer', function() { var scene; var visualizer; @@ -663,3 +665,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PlaneGeometryUpdaterSpec.js b/Specs/DataSources/PlaneGeometryUpdaterSpec.js index 2c761b09b80a..c517ea8b7157 100644 --- a/Specs/DataSources/PlaneGeometryUpdaterSpec.js +++ b/Specs/DataSources/PlaneGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PlaneGeometryUpdater', 'Core/Cartesian2', 'Core/Cartesian3', @@ -30,7 +30,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/PlaneGeometryUpdater', function() { var scene; @@ -124,3 +126,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(PlaneGeometryUpdater, 'plane', createDynamicPlane, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PlaneGraphicsSpec.js b/Specs/DataSources/PlaneGraphicsSpec.js index ba79c4cf1dad..f0897c8cdb6a 100644 --- a/Specs/DataSources/PlaneGraphicsSpec.js +++ b/Specs/DataSources/PlaneGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PlaneGraphics', 'Core/Cartesian2', 'Core/Cartesian3', @@ -22,7 +22,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/PlaneGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -177,3 +179,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/PointGraphicsSpec.js b/Specs/DataSources/PointGraphicsSpec.js index 93c0b4818a88..f9b44e5fe9d3 100644 --- a/Specs/DataSources/PointGraphicsSpec.js +++ b/Specs/DataSources/PointGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PointGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -12,7 +12,9 @@ defineSuite([ NearFarScalar, ConstantProperty, HeightReference) { - 'use strict'; + 'use strict'; + +describe('DataSources/PointGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -149,3 +151,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/PointVisualizerSpec.js b/Specs/DataSources/PointVisualizerSpec.js index d268f231439b..3e51b749d112 100644 --- a/Specs/DataSources/PointVisualizerSpec.js +++ b/Specs/DataSources/PointVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PointVisualizer', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -40,7 +40,9 @@ defineSuite([ HeightReference, PointPrimitiveCollection, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/PointVisualizer', function() { var scene; var entityCluster; @@ -395,3 +397,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PolygonGeometryUpdaterSpec.js b/Specs/DataSources/PolygonGeometryUpdaterSpec.js index 6b14ca626485..f0735dc77ec5 100644 --- a/Specs/DataSources/PolygonGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolygonGeometryUpdaterSpec.js @@ -1,18 +1,18 @@ -defineSuite([ +define([ 'DataSources/PolygonGeometryUpdater', 'Core/ApproximateTerrainHeights', 'Core/ArcType', 'Core/Cartesian3', 'Core/Color', + 'Core/CoplanarPolygonGeometry', + 'Core/CoplanarPolygonOutlineGeometry', 'Core/Ellipsoid', 'Core/GeometryOffsetAttribute', 'Core/JulianDate', 'Core/Math', - 'Core/CoplanarPolygonGeometry', - 'Core/CoplanarPolygonOutlineGeometry', 'Core/PolygonGeometry', - 'Core/PolygonOutlineGeometry', 'Core/PolygonHierarchy', + 'Core/PolygonOutlineGeometry', 'Core/TimeIntervalCollection', 'DataSources/ConstantProperty', 'DataSources/Entity', @@ -34,15 +34,15 @@ defineSuite([ ArcType, Cartesian3, Color, + CoplanarPolygonGeometry, + CoplanarPolygonOutlineGeometry, Ellipsoid, GeometryOffsetAttribute, JulianDate, CesiumMath, - CoplanarPolygonGeometry, - CoplanarPolygonOutlineGeometry, PolygonGeometry, - PolygonOutlineGeometry, PolygonHierarchy, + PolygonOutlineGeometry, TimeIntervalCollection, ConstantProperty, Entity, @@ -58,7 +58,9 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolygonGeometryUpdater', function() { var scene; var time; @@ -454,3 +456,4 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs(PolygonGeometryUpdater, 'polygon', createBasicPolygonWithoutHeight, createDynamicPolygonWithoutHeight, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PolygonGraphicsSpec.js b/Specs/DataSources/PolygonGraphicsSpec.js index 85772a99de9b..58417e7f67f7 100644 --- a/Specs/DataSources/PolygonGraphicsSpec.js +++ b/Specs/DataSources/PolygonGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolygonGraphics', 'Core/ArcType', 'Core/Cartesian3', @@ -24,7 +24,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolygonGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -303,3 +305,4 @@ defineSuite([ expect(hierarchy.positions).toEqual(positions); }); }); +}); diff --git a/Specs/DataSources/PolylineArrowMaterialPropertySpec.js b/Specs/DataSources/PolylineArrowMaterialPropertySpec.js index 5fbd806a1b7c..f9f59bd30c07 100644 --- a/Specs/DataSources/PolylineArrowMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineArrowMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineArrowMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, ConstantProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineArrowMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new PolylineArrowMaterialProperty(); @@ -101,3 +103,4 @@ defineSuite([ expect(listener.calls.count()).toEqual(0); }); }); +}); diff --git a/Specs/DataSources/PolylineDashMaterialPropertySpec.js b/Specs/DataSources/PolylineDashMaterialPropertySpec.js index 335a639e8281..7c12c26b4d54 100644 --- a/Specs/DataSources/PolylineDashMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineDashMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineDashMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, ConstantProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineDashMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new PolylineDashMaterialProperty(); @@ -248,3 +250,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/PolylineGeometryUpdaterSpec.js b/Specs/DataSources/PolylineGeometryUpdaterSpec.js index d95fcd9e5f1a..d21156c0b621 100644 --- a/Specs/DataSources/PolylineGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolylineGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineGeometryUpdater', 'Core/ApproximateTerrainHeights', 'Core/ArcType', @@ -66,7 +66,9 @@ defineSuite([ createDynamicProperty, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineGeometryUpdater', function() { var scene; beforeAll(function(){ @@ -871,3 +873,4 @@ defineSuite([ updater.destroy(); }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PolylineGlowMaterialPropertySpec.js b/Specs/DataSources/PolylineGlowMaterialPropertySpec.js index 4e465cf9d5cb..6cf0044cb572 100644 --- a/Specs/DataSources/PolylineGlowMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineGlowMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineGlowMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -14,7 +14,9 @@ defineSuite([ ConstantProperty, TimeIntervalCollectionProperty, testDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineGlowMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new PolylineGlowMaterialProperty(); @@ -159,3 +161,4 @@ defineSuite([ testDefinitionChanged(property, 'taperPower', 1.0, 0.44); }); }); +}); diff --git a/Specs/DataSources/PolylineGraphicsSpec.js b/Specs/DataSources/PolylineGraphicsSpec.js index 15e7792bca83..8e94f73c63e6 100644 --- a/Specs/DataSources/PolylineGraphicsSpec.js +++ b/Specs/DataSources/PolylineGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineGraphics', 'Core/ArcType', 'Core/Color', @@ -19,8 +19,10 @@ defineSuite([ ClassificationType, ShadowMode, testDefinitionChanged, - testMaterialDefinitionChanged) { - 'use strict'; + testMaterialDefinitionChanged) { + 'use strict'; + +describe('DataSources/PolylineGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -207,3 +209,4 @@ defineSuite([ testDefinitionChanged(property, 'zIndex', 20, 5); }); }); +}); diff --git a/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js b/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js index 336725889fec..7a8b6987a900 100644 --- a/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js +++ b/Specs/DataSources/PolylineOutlineMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineOutlineMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ TimeInterval, ConstantProperty, TimeIntervalCollectionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineOutlineMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new PolylineOutlineMaterialProperty(); @@ -196,3 +198,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/PolylineVisualizerSpec.js b/Specs/DataSources/PolylineVisualizerSpec.js index e288753d9002..f08ec8dbdb3e 100644 --- a/Specs/DataSources/PolylineVisualizerSpec.js +++ b/Specs/DataSources/PolylineVisualizerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineVisualizer', 'Core/ApproximateTerrainHeights', 'Core/BoundingSphere', @@ -48,7 +48,9 @@ defineSuite([ createDynamicProperty, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineVisualizer', function() { var time = JulianDate.now(); @@ -767,3 +769,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js b/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js index 4a62bfe8d348..747818269a28 100644 --- a/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolylineVolumeGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineVolumeGeometryUpdater', 'Core/Cartesian2', 'Core/Cartesian3', @@ -32,7 +32,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineVolumeGeometryUpdater', function() { var scene; var time; @@ -210,3 +212,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(PolylineVolumeGeometryUpdater, 'polylineVolume', createDynamicPolylineVolume, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/PolylineVolumeGraphicsSpec.js b/Specs/DataSources/PolylineVolumeGraphicsSpec.js index 798b7d83782c..d520eda0d779 100644 --- a/Specs/DataSources/PolylineVolumeGraphicsSpec.js +++ b/Specs/DataSources/PolylineVolumeGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PolylineVolumeGraphics', 'Core/Color', 'Core/CornerType', @@ -18,7 +18,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/PolylineVolumeGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -195,3 +197,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/PositionPropertyArraySpec.js b/Specs/DataSources/PositionPropertyArraySpec.js index 8589b301b6ef..da30e1847eb6 100644 --- a/Specs/DataSources/PositionPropertyArraySpec.js +++ b/Specs/DataSources/PositionPropertyArraySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PositionPropertyArray', 'Core/Cartesian3', 'Core/JulianDate', @@ -12,7 +12,9 @@ defineSuite([ ReferenceFrame, ConstantPositionProperty, SampledPositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PositionPropertyArray', function() { var time = JulianDate.now(); @@ -110,3 +112,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/PropertyArraySpec.js b/Specs/DataSources/PropertyArraySpec.js index d2f181a2b25a..64078d39a29b 100644 --- a/Specs/DataSources/PropertyArraySpec.js +++ b/Specs/DataSources/PropertyArraySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PropertyArray', 'Core/JulianDate', 'DataSources/ConstantProperty', @@ -8,7 +8,9 @@ defineSuite([ JulianDate, ConstantProperty, SampledProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PropertyArray', function() { var time = JulianDate.now(); @@ -98,3 +100,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/PropertyBagSpec.js b/Specs/DataSources/PropertyBagSpec.js index 662823972b4d..c11c98a2349a 100644 --- a/Specs/DataSources/PropertyBagSpec.js +++ b/Specs/DataSources/PropertyBagSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/PropertyBag', 'Core/JulianDate', 'DataSources/ConstantProperty', @@ -8,7 +8,9 @@ defineSuite([ JulianDate, ConstantProperty, SampledProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/PropertyBag', function() { var time = JulianDate.now(); @@ -281,3 +283,4 @@ defineSuite([ expect(property.isConstant).toBe(false); }); }); +}); diff --git a/Specs/DataSources/RectangleGeometryUpdaterSpec.js b/Specs/DataSources/RectangleGeometryUpdaterSpec.js index 4f8c74175435..dee95b86fa8b 100644 --- a/Specs/DataSources/RectangleGeometryUpdaterSpec.js +++ b/Specs/DataSources/RectangleGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/RectangleGeometryUpdater', 'Core/ApproximateTerrainHeights', 'Core/Cartesian3', @@ -36,7 +36,9 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/RectangleGeometryUpdater', function() { var time; var scene; @@ -254,3 +256,4 @@ defineSuite([ createGeometryUpdaterGroundGeometrySpecs(RectangleGeometryUpdater, 'rectangle', createBasicRectangleWithoutHeight, createDynamicRectangleWithoutHeight, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/RectangleGraphicsSpec.js b/Specs/DataSources/RectangleGraphicsSpec.js index 8b7116042935..e85d782e97c4 100644 --- a/Specs/DataSources/RectangleGraphicsSpec.js +++ b/Specs/DataSources/RectangleGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/RectangleGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -20,7 +20,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/RectangleGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -241,3 +243,4 @@ defineSuite([ testDefinitionChanged(property, 'zIndex', 20, 5); }); }); +}); diff --git a/Specs/DataSources/ReferencePropertySpec.js b/Specs/DataSources/ReferencePropertySpec.js index c6e57b163953..d386d4105358 100644 --- a/Specs/DataSources/ReferencePropertySpec.js +++ b/Specs/DataSources/ReferencePropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/ReferenceProperty', 'Core/Cartesian3', 'Core/Color', @@ -22,7 +22,9 @@ defineSuite([ ConstantProperty, Entity, EntityCollection) { - 'use strict'; + 'use strict'; + +describe('DataSources/ReferenceProperty', function() { var time = JulianDate.now(); @@ -300,3 +302,4 @@ defineSuite([ }).toThrowRuntimeError(); }); }); +}); diff --git a/Specs/DataSources/RotationSpec.js b/Specs/DataSources/RotationSpec.js index e2666f93fad4..5863f0e51b56 100644 --- a/Specs/DataSources/RotationSpec.js +++ b/Specs/DataSources/RotationSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/Rotation', 'Core/JulianDate', 'Core/Math', @@ -10,7 +10,9 @@ defineSuite([ CesiumMath, SampledProperty, createPackableSpecs) { - 'use strict'; + 'use strict'; + +describe('DataSources/Rotation', function() { it('Interpolates towards the closest angle.', function() { var time1 = JulianDate.fromIso8601('2010-05-07T00:00:00'); @@ -30,3 +32,4 @@ defineSuite([ createPackableSpecs(Rotation, 1, [1]); }); +}); diff --git a/Specs/DataSources/SampledPositionPropertySpec.js b/Specs/DataSources/SampledPositionPropertySpec.js index 8528eef8c0fa..6b31fb50689c 100644 --- a/Specs/DataSources/SampledPositionPropertySpec.js +++ b/Specs/DataSources/SampledPositionPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/SampledPositionProperty', 'Core/Cartesian3', 'Core/ExtrapolationType', @@ -18,7 +18,9 @@ defineSuite([ ReferenceFrame, TimeInterval, PositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/SampledPositionProperty', function() { it('constructor sets expected defaults', function() { var property = new SampledPositionProperty(); @@ -419,3 +421,4 @@ defineSuite([ expect(listener).not.toHaveBeenCalled(); }); }); +}); diff --git a/Specs/DataSources/SampledPropertySpec.js b/Specs/DataSources/SampledPropertySpec.js index 763d123cced9..c5f7bc60da39 100644 --- a/Specs/DataSources/SampledPropertySpec.js +++ b/Specs/DataSources/SampledPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/SampledProperty', 'Core/Cartesian3', 'Core/defined', @@ -22,7 +22,9 @@ defineSuite([ CesiumMath, Quaternion, TimeInterval) { - 'use strict'; + 'use strict'; + +describe('DataSources/SampledProperty', function() { it('constructor sets expected defaults', function() { var property = new SampledProperty(Cartesian3); @@ -934,3 +936,4 @@ defineSuite([ expect(listener).not.toHaveBeenCalled(); }); }); +}); diff --git a/Specs/DataSources/StaticGeometryColorBatchSpec.js b/Specs/DataSources/StaticGeometryColorBatchSpec.js index 185eeab1cc4e..8bf6f7e15b97 100644 --- a/Specs/DataSources/StaticGeometryColorBatchSpec.js +++ b/Specs/DataSources/StaticGeometryColorBatchSpec.js @@ -1,44 +1,46 @@ -defineSuite([ - 'DataSources/StaticGeometryColorBatch', - 'Core/Cartesian3', - 'Core/Color', - 'Core/DistanceDisplayCondition', - 'Core/JulianDate', - 'Core/Math', - 'Core/TimeInterval', - 'Core/TimeIntervalCollection', - 'DataSources/CallbackProperty', - 'DataSources/ColorMaterialProperty', - 'DataSources/EllipseGeometryUpdater', - 'DataSources/Entity', - 'DataSources/PolylineGeometryUpdater', - 'DataSources/TimeIntervalCollectionProperty', - 'Scene/PerInstanceColorAppearance', - 'Scene/PolylineColorAppearance', - 'Scene/ShadowMode', - 'Specs/createScene', - 'Specs/pollToPromise' -], function( - StaticGeometryColorBatch, - Cartesian3, - Color, - DistanceDisplayCondition, - JulianDate, - CesiumMath, - TimeInterval, - TimeIntervalCollection, - CallbackProperty, - ColorMaterialProperty, - EllipseGeometryUpdater, - Entity, - PolylineGeometryUpdater, - TimeIntervalCollectionProperty, - PerInstanceColorAppearance, - PolylineColorAppearance, - ShadowMode, - createScene, - pollToPromise) { - 'use strict'; +define([ + 'DataSources/StaticGeometryColorBatch', + 'Core/Cartesian3', + 'Core/Color', + 'Core/DistanceDisplayCondition', + 'Core/JulianDate', + 'Core/Math', + 'Core/TimeInterval', + 'Core/TimeIntervalCollection', + 'DataSources/CallbackProperty', + 'DataSources/ColorMaterialProperty', + 'DataSources/EllipseGeometryUpdater', + 'DataSources/Entity', + 'DataSources/PolylineGeometryUpdater', + 'DataSources/TimeIntervalCollectionProperty', + 'Scene/PerInstanceColorAppearance', + 'Scene/PolylineColorAppearance', + 'Scene/ShadowMode', + 'Specs/createScene', + 'Specs/pollToPromise' + ], function( + StaticGeometryColorBatch, + Cartesian3, + Color, + DistanceDisplayCondition, + JulianDate, + CesiumMath, + TimeInterval, + TimeIntervalCollection, + CallbackProperty, + ColorMaterialProperty, + EllipseGeometryUpdater, + Entity, + PolylineGeometryUpdater, + TimeIntervalCollectionProperty, + PerInstanceColorAppearance, + PolylineColorAppearance, + ShadowMode, + createScene, + pollToPromise) { + 'use strict'; + +describe('DataSources/StaticGeometryColorBatch', function() { var time = JulianDate.now(); var scene; @@ -447,3 +449,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js b/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js index b4609f070b0e..6c9df0581811 100644 --- a/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js +++ b/Specs/DataSources/StaticGeometryPerMaterialBatchSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/StaticGeometryPerMaterialBatch', 'Core/Cartesian2', 'Core/Cartesian3', @@ -58,7 +58,9 @@ defineSuite([ ShadowMode, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/StaticGeometryPerMaterialBatch', function() { var time = JulianDate.now(); var scene; @@ -496,3 +498,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js b/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js index c8fccc300362..53d34259a2ff 100644 --- a/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js +++ b/Specs/DataSources/StaticGroundGeometryColorBatchSpec.js @@ -1,9 +1,9 @@ -defineSuite([ +define([ 'DataSources/StaticGroundGeometryColorBatch', - 'Core/defaultValue', 'Core/ApproximateTerrainHeights', 'Core/Cartesian3', 'Core/Color', + 'Core/defaultValue', 'Core/DistanceDisplayCondition', 'Core/JulianDate', 'Core/Math', @@ -20,10 +20,10 @@ defineSuite([ 'Specs/pollToPromise' ], function( StaticGroundGeometryColorBatch, - defaultValue, ApproximateTerrainHeights, Cartesian3, Color, + defaultValue, DistanceDisplayCondition, JulianDate, CesiumMath, @@ -38,7 +38,9 @@ defineSuite([ GroundPrimitive, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/StaticGroundGeometryColorBatch', function() { var time = JulianDate.now(); var scene; @@ -356,3 +358,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js b/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js index e20dd620dcf5..23248bd42de2 100644 --- a/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js +++ b/Specs/DataSources/StaticGroundGeometryPerMaterialBatchSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/StaticGroundGeometryPerMaterialBatch', 'Core/ApproximateTerrainHeights', 'Core/Cartesian2', @@ -56,7 +56,9 @@ defineSuite([ PolylineMaterialAppearance, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/StaticGroundGeometryPerMaterialBatch', function() { var time = JulianDate.now(); var scene; @@ -470,3 +472,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js b/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js index bd1b3e244f2d..d793e073eed3 100644 --- a/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js +++ b/Specs/DataSources/StaticGroundPolylinePerMaterialBatchSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/StaticGroundPolylinePerMaterialBatch', 'Core/ApproximateTerrainHeights', 'Core/BoundingSphere', @@ -14,9 +14,9 @@ defineSuite([ 'DataSources/ColorMaterialProperty', 'DataSources/ConstantProperty', 'DataSources/Entity', - 'DataSources/PolylineOutlineMaterialProperty', 'DataSources/PolylineGeometryUpdater', 'DataSources/PolylineGraphics', + 'DataSources/PolylineOutlineMaterialProperty', 'DataSources/TimeIntervalCollectionProperty', 'Scene/ClassificationType', 'Scene/GroundPolylinePrimitive', @@ -38,15 +38,17 @@ defineSuite([ ColorMaterialProperty, ConstantProperty, Entity, - PolylineOutlineMaterialProperty, PolylineGeometryUpdater, PolylineGraphics, + PolylineOutlineMaterialProperty, TimeIntervalCollectionProperty, ClassificationType, GroundPolylinePrimitive, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/StaticGroundPolylinePerMaterialBatch', function() { var time = JulianDate.now(); var batch; @@ -569,3 +571,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StaticOutlineGeometryBatchSpec.js b/Specs/DataSources/StaticOutlineGeometryBatchSpec.js index cca4ddc3f878..b1aeb40116a7 100644 --- a/Specs/DataSources/StaticOutlineGeometryBatchSpec.js +++ b/Specs/DataSources/StaticOutlineGeometryBatchSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/StaticOutlineGeometryBatch', 'Core/Cartesian3', 'Core/Color', @@ -30,7 +30,9 @@ defineSuite([ ShadowMode, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('DataSources/StaticOutlineGeometryBatch', function() { var time = JulianDate.now(); var scene; @@ -361,3 +363,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/DataSources/StripeMaterialPropertySpec.js b/Specs/DataSources/StripeMaterialPropertySpec.js index 695927c64250..435e47cde0f8 100644 --- a/Specs/DataSources/StripeMaterialPropertySpec.js +++ b/Specs/DataSources/StripeMaterialPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/StripeMaterialProperty', 'Core/Color', 'Core/JulianDate', @@ -16,7 +16,9 @@ defineSuite([ StripeOrientation, TimeIntervalCollectionProperty, testDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/StripeMaterialProperty', function() { it('constructor provides the expected defaults', function() { var property = new StripeMaterialProperty(); @@ -194,3 +196,4 @@ defineSuite([ testDefinitionChanged(property, 'repeat', 3, 4); }); }); +}); diff --git a/Specs/DataSources/TerrainOffsetPropertySpec.js b/Specs/DataSources/TerrainOffsetPropertySpec.js index 671434a11126..86b7cc9774d6 100644 --- a/Specs/DataSources/TerrainOffsetPropertySpec.js +++ b/Specs/DataSources/TerrainOffsetPropertySpec.js @@ -1,26 +1,28 @@ -defineSuite([ - 'DataSources/TerrainOffsetProperty', - 'Core/Cartesian3', - 'Core/Event', - 'Core/JulianDate', - 'Core/Rectangle', - 'Scene/HeightReference', - 'DataSources/CallbackProperty', - 'DataSources/ConstantProperty', - 'Specs/createGlobe', - 'Specs/createScene' -], function( - TerrainOffsetProperty, - Cartesian3, - Event, - JulianDate, - Rectangle, - HeightReference, - CallbackProperty, - ConstantProperty, - createGlobe, - createScene) { - 'use strict'; +define([ + 'DataSources/TerrainOffsetProperty', + 'Core/Cartesian3', + 'Core/Event', + 'Core/JulianDate', + 'Core/Rectangle', + 'DataSources/CallbackProperty', + 'DataSources/ConstantProperty', + 'Scene/HeightReference', + 'Specs/createGlobe', + 'Specs/createScene' + ], function( + TerrainOffsetProperty, + Cartesian3, + Event, + JulianDate, + Rectangle, + CallbackProperty, + ConstantProperty, + HeightReference, + createGlobe, + createScene) { + 'use strict'; + +describe('DataSources/TerrainOffsetProperty', function() { var scene; var time = JulianDate.now(); @@ -61,3 +63,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js b/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js index 8137db72034a..b1588173c3fd 100644 --- a/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js +++ b/Specs/DataSources/TimeIntervalCollectionPositionPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/TimeIntervalCollectionPositionProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -14,7 +14,9 @@ defineSuite([ TimeInterval, TimeIntervalCollection, PositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/TimeIntervalCollectionPositionProperty', function() { it('default constructor has expected values', function() { var property = new TimeIntervalCollectionPositionProperty(); @@ -234,3 +236,4 @@ defineSuite([ expect(listener).toHaveBeenCalledWith(property); }); }); +}); diff --git a/Specs/DataSources/TimeIntervalCollectionPropertySpec.js b/Specs/DataSources/TimeIntervalCollectionPropertySpec.js index 4c162ecf5db0..6451b10ecd53 100644 --- a/Specs/DataSources/TimeIntervalCollectionPropertySpec.js +++ b/Specs/DataSources/TimeIntervalCollectionPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/TimeIntervalCollectionProperty', 'Core/Cartesian3', 'Core/JulianDate', @@ -10,7 +10,9 @@ defineSuite([ JulianDate, TimeInterval, TimeIntervalCollection) { - 'use strict'; + 'use strict'; + +describe('DataSources/TimeIntervalCollectionProperty', function() { it('default constructor has expected values', function() { var property = new TimeIntervalCollectionProperty(); @@ -175,3 +177,4 @@ defineSuite([ expect(listener).toHaveBeenCalledWith(property); }); }); +}); diff --git a/Specs/DataSources/VelocityOrientationPropertySpec.js b/Specs/DataSources/VelocityOrientationPropertySpec.js index 02a682a0faf6..dd1d9724438d 100644 --- a/Specs/DataSources/VelocityOrientationPropertySpec.js +++ b/Specs/DataSources/VelocityOrientationPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/VelocityOrientationProperty', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -20,7 +20,9 @@ defineSuite([ Transforms, CallbackProperty, SampledPositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/VelocityOrientationProperty', function() { var time = JulianDate.now(); @@ -202,3 +204,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/VelocityVectorPropertySpec.js b/Specs/DataSources/VelocityVectorPropertySpec.js index e54ab99f5d61..8a25876b9f53 100644 --- a/Specs/DataSources/VelocityVectorPropertySpec.js +++ b/Specs/DataSources/VelocityVectorPropertySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/VelocityVectorProperty', 'Core/Cartesian3', 'Core/Event', @@ -18,7 +18,9 @@ defineSuite([ CallbackProperty, ConstantPositionProperty, SampledPositionProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/VelocityVectorProperty', function() { var time = JulianDate.now(); @@ -235,3 +237,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/WallGeometryUpdaterSpec.js b/Specs/DataSources/WallGeometryUpdaterSpec.js index 17a38ed3fb12..42c932418159 100644 --- a/Specs/DataSources/WallGeometryUpdaterSpec.js +++ b/Specs/DataSources/WallGeometryUpdaterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/WallGeometryUpdater', 'Core/Cartesian3', 'Core/Color', @@ -36,7 +36,9 @@ defineSuite([ createDynamicProperty, createGeometryUpdaterSpecs, createScene) { - 'use strict'; + 'use strict'; + +describe('DataSources/WallGeometryUpdater', function() { var time; var time2; @@ -224,3 +226,4 @@ defineSuite([ createDynamicGeometryUpdaterSpecs(WallGeometryUpdater, 'wall', createDynamicWall, getScene); }, 'WebGL'); +}); diff --git a/Specs/DataSources/WallGraphicsSpec.js b/Specs/DataSources/WallGraphicsSpec.js index 906b90bad8da..81fd6c527f43 100644 --- a/Specs/DataSources/WallGraphicsSpec.js +++ b/Specs/DataSources/WallGraphicsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/WallGraphics', 'Core/Color', 'Core/DistanceDisplayCondition', @@ -16,7 +16,9 @@ defineSuite([ ShadowMode, testDefinitionChanged, testMaterialDefinitionChanged) { - 'use strict'; + 'use strict'; + +describe('DataSources/WallGraphics', function() { it('creates expected instance from raw assignment and construction', function() { var options = { @@ -195,3 +197,4 @@ defineSuite([ testDefinitionChanged(property, 'distanceDisplayCondition', new DistanceDisplayCondition(), new DistanceDisplayCondition(10.0, 100.0)); }); }); +}); diff --git a/Specs/DataSources/createMaterialPropertyDescriptorSpec.js b/Specs/DataSources/createMaterialPropertyDescriptorSpec.js index 4fd8d60f6175..65faab97b654 100644 --- a/Specs/DataSources/createMaterialPropertyDescriptorSpec.js +++ b/Specs/DataSources/createMaterialPropertyDescriptorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'DataSources/createMaterialPropertyDescriptor', 'Core/Color', 'Core/Event', @@ -10,7 +10,9 @@ defineSuite([ Event, ColorMaterialProperty, ImageMaterialProperty) { - 'use strict'; + 'use strict'; + +describe('DataSources/createMaterialPropertyDescriptor', function() { function MockGraphics() { this._definitionChanged = new Event(); @@ -51,3 +53,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/DataSources/exportKmlSpec.js b/Specs/DataSources/exportKmlSpec.js index f3450d85010b..2801afb3afc6 100644 --- a/Specs/DataSources/exportKmlSpec.js +++ b/Specs/DataSources/exportKmlSpec.js @@ -1,57 +1,59 @@ -defineSuite([ - 'DataSources/exportKml', - 'Core/BoundingRectangle', - 'Core/Cartesian2', - 'Core/Cartesian3', - 'Core/Cartographic', - 'Core/Color', - 'Core/defaultValue', - 'Core/defined', - 'Core/Iso8601', - 'Core/JulianDate', - 'Core/Math', - 'Core/PolygonHierarchy', - 'Core/Rectangle', - 'Core/TimeInterval', - 'DataSources/CallbackProperty', - 'DataSources/ColorMaterialProperty', - 'DataSources/Entity', - 'DataSources/EntityCollection', - 'DataSources/ImageMaterialProperty', - 'DataSources/PolylineOutlineMaterialProperty', - 'DataSources/SampledPositionProperty', - 'Scene/HeightReference', - 'Scene/HorizontalOrigin', - 'Scene/VerticalOrigin', - 'ThirdParty/when' -], function( - exportKml, - BoundingRectangle, - Cartesian2, - Cartesian3, - Cartographic, - Color, - defaultValue, - defined, - Iso8601, - JulianDate, - CesiumMath, - PolygonHierarchy, - Rectangle, - TimeInterval, - CallbackProperty, - ColorMaterialProperty, - Entity, - EntityCollection, - ImageMaterialProperty, - PolylineOutlineMaterialProperty, - SampledPositionProperty, - HeightReference, - HorizontalOrigin, - VerticalOrigin, - when) { +define([ + 'DataSources/exportKml', + 'Core/BoundingRectangle', + 'Core/Cartesian2', + 'Core/Cartesian3', + 'Core/Cartographic', + 'Core/Color', + 'Core/defaultValue', + 'Core/defined', + 'Core/Iso8601', + 'Core/JulianDate', + 'Core/Math', + 'Core/PolygonHierarchy', + 'Core/Rectangle', + 'Core/TimeInterval', + 'DataSources/CallbackProperty', + 'DataSources/ColorMaterialProperty', + 'DataSources/Entity', + 'DataSources/EntityCollection', + 'DataSources/ImageMaterialProperty', + 'DataSources/PolylineOutlineMaterialProperty', + 'DataSources/SampledPositionProperty', + 'Scene/HeightReference', + 'Scene/HorizontalOrigin', + 'Scene/VerticalOrigin', + 'ThirdParty/when' + ], function( + exportKml, + BoundingRectangle, + Cartesian2, + Cartesian3, + Cartographic, + Color, + defaultValue, + defined, + Iso8601, + JulianDate, + CesiumMath, + PolygonHierarchy, + Rectangle, + TimeInterval, + CallbackProperty, + ColorMaterialProperty, + Entity, + EntityCollection, + ImageMaterialProperty, + PolylineOutlineMaterialProperty, + SampledPositionProperty, + HeightReference, + HorizontalOrigin, + VerticalOrigin, + when) { 'use strict'; +describe('DataSources/exportKml', function() { + var kmlDoc; function checkKmlDoc(entities, properties, options) { options = defaultValue(options, {}); @@ -1225,3 +1227,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Renderer/AutomaticUniformSpec.js b/Specs/Renderer/AutomaticUniformSpec.js index af277d2447db..b9a74e89b28e 100644 --- a/Specs/Renderer/AutomaticUniformSpec.js +++ b/Specs/Renderer/AutomaticUniformSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Color', @@ -26,7 +26,9 @@ defineSuite([ createCamera, createContext, createFrameState) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian2', function() { var context; @@ -1371,3 +1373,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/BufferSpec.js b/Specs/Renderer/BufferSpec.js index 19a6262408d0..af3c47a8ec01 100644 --- a/Specs/Renderer/BufferSpec.js +++ b/Specs/Renderer/BufferSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Buffer', 'Core/IndexDatatype', 'Renderer/BufferUsage', @@ -8,7 +8,9 @@ defineSuite([ IndexDatatype, BufferUsage, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/Buffer', function() { createBufferSpecs({}); var c = createContext({ requestWebgl2 : true }); @@ -703,3 +705,4 @@ defineSuite([ }); } }, 'WebGL'); +}); diff --git a/Specs/Renderer/BuiltinFunctionsSpec.js b/Specs/Renderer/BuiltinFunctionsSpec.js index 3ff6aae764ab..40ec9606efb9 100644 --- a/Specs/Renderer/BuiltinFunctionsSpec.js +++ b/Specs/Renderer/BuiltinFunctionsSpec.js @@ -1,9 +1,9 @@ -defineSuite([ +define([ 'Core/BoundingRectangle', 'Core/Cartesian3', 'Core/Cartesian4', - 'Core/Math', 'Core/EncodedCartesian3', + 'Core/Math', 'Specs/createCamera', 'Specs/createContext', 'Specs/createFrameState' @@ -11,12 +11,14 @@ defineSuite([ BoundingRectangle, Cartesian3, Cartesian4, - CesiumMath, EncodedCartesian3, + CesiumMath, createCamera, createContext, createFrameState) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingRectangle', function() { var context; @@ -529,3 +531,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ClearCommandSpec.js b/Specs/Renderer/ClearCommandSpec.js index 26240b64f37c..23643738ec34 100644 --- a/Specs/Renderer/ClearCommandSpec.js +++ b/Specs/Renderer/ClearCommandSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Renderer/ClearCommand', 'Core/Color' ], function( ClearCommand, Color) { - 'use strict'; + 'use strict'; + +describe('Renderer/ClearCommand', function() { it('constructs with defaults', function() { var c = new ClearCommand(); @@ -40,3 +42,4 @@ defineSuite([ expect(ClearCommand.ALL.framebuffer).toBeUndefined(); }); }); +}); diff --git a/Specs/Renderer/ClearSpec.js b/Specs/Renderer/ClearSpec.js index 7109c0705b25..b1b56f6f6ceb 100644 --- a/Specs/Renderer/ClearSpec.js +++ b/Specs/Renderer/ClearSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingRectangle', 'Core/Color', 'Renderer/ClearCommand', @@ -14,7 +14,9 @@ defineSuite([ RenderState, Texture, createContext) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingRectangle', function() { var context; @@ -132,3 +134,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ComputeCommandSpec.js b/Specs/Renderer/ComputeCommandSpec.js index e75756c2cc6a..96c63dc82533 100644 --- a/Specs/Renderer/ComputeCommandSpec.js +++ b/Specs/Renderer/ComputeCommandSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/ComputeCommand', 'Core/BoundingRectangle', 'Core/PixelFormat', @@ -22,7 +22,9 @@ defineSuite([ Material, ViewportQuad, createScene) { - 'use strict'; + 'use strict'; + +describe('Renderer/ComputeCommand', function() { var scene; var context; @@ -161,3 +163,4 @@ defineSuite([ expect(scene).notToRender([0, 0, 0, 255]); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ContextSpec.js b/Specs/Renderer/ContextSpec.js index 007cc8ba611f..f124c9098a32 100644 --- a/Specs/Renderer/ContextSpec.js +++ b/Specs/Renderer/ContextSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Context', 'Core/Color', 'Core/IndexDatatype', @@ -14,7 +14,9 @@ defineSuite([ BufferUsage, ContextLimits, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/Context', function() { var context; @@ -314,3 +316,4 @@ defineSuite([ c.destroyForSpecs(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/CubeMapSpec.js b/Specs/Renderer/CubeMapSpec.js index e4e63ae2f007..83d86c208078 100644 --- a/Specs/Renderer/CubeMapSpec.js +++ b/Specs/Renderer/CubeMapSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/CubeMap', 'Core/Cartesian3', 'Core/Color', @@ -32,7 +32,9 @@ defineSuite([ TextureWrap, createContext, when) { - 'use strict'; + 'use strict'; + +describe('Renderer/CubeMap', function() { var context; var cubeMap; @@ -1363,3 +1365,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/DrawCommandSpec.js b/Specs/Renderer/DrawCommandSpec.js index 37dac98926b3..17f0233554b7 100644 --- a/Specs/Renderer/DrawCommandSpec.js +++ b/Specs/Renderer/DrawCommandSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/DrawCommand', 'Core/PrimitiveType', 'Renderer/Pass' @@ -6,7 +6,9 @@ defineSuite([ DrawCommand, PrimitiveType, Pass) { - 'use strict'; + 'use strict'; + +describe('Renderer/DrawCommand', function() { it('constructs', function() { var c = new DrawCommand(); @@ -211,3 +213,4 @@ defineSuite([ expect(DrawCommand.shallowClone()).toBeUndefined(); }); }); +}); diff --git a/Specs/Renderer/DrawSpec.js b/Specs/Renderer/DrawSpec.js index e5e9d55515c1..32df8f25ec49 100644 --- a/Specs/Renderer/DrawSpec.js +++ b/Specs/Renderer/DrawSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingRectangle', 'Core/Color', 'Core/ComponentDatatype', @@ -34,7 +34,9 @@ defineSuite([ VertexArray, BlendingState, createContext) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingRectangle', function() { var context; var sp; @@ -1376,3 +1378,4 @@ defineSuite([ } }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/FramebufferSpec.js b/Specs/Renderer/FramebufferSpec.js index 2b36066475ff..48b2dabe1414 100644 --- a/Specs/Renderer/FramebufferSpec.js +++ b/Specs/Renderer/FramebufferSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Framebuffer', 'Core/Color', 'Core/PixelFormat', @@ -38,7 +38,9 @@ defineSuite([ Texture, VertexArray, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/Framebuffer', function() { var context; var sp; @@ -973,3 +975,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/PassStateSpec.js b/Specs/Renderer/PassStateSpec.js index 3457a6e277c8..909625278a29 100644 --- a/Specs/Renderer/PassStateSpec.js +++ b/Specs/Renderer/PassStateSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Renderer/PassState' ], function( PassState) { - 'use strict'; + 'use strict'; + +describe('Renderer/PassState', function() { it('creates a pass state', function() { var context = {}; @@ -13,3 +15,4 @@ defineSuite([ expect(passState.scissorTest).not.toBeDefined(); }); }); +}); diff --git a/Specs/Renderer/RenderStateSpec.js b/Specs/Renderer/RenderStateSpec.js index 9884784c6c94..8211e1453470 100644 --- a/Specs/Renderer/RenderStateSpec.js +++ b/Specs/Renderer/RenderStateSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/RenderState', 'Core/WebGLConstants', 'Core/WindingOrder', @@ -10,7 +10,9 @@ defineSuite([ WindingOrder, ContextLimits, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/RenderState', function() { var context; @@ -834,3 +836,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/RenderbufferSpec.js b/Specs/Renderer/RenderbufferSpec.js index 4211f7ed5885..c5b878633657 100644 --- a/Specs/Renderer/RenderbufferSpec.js +++ b/Specs/Renderer/RenderbufferSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Renderbuffer', 'Renderer/ContextLimits', 'Renderer/RenderbufferFormat', @@ -8,7 +8,9 @@ defineSuite([ ContextLimits, RenderbufferFormat, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/Renderbuffer', function() { var context; var renderbuffer; @@ -119,3 +121,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/SamplerSpec.js b/Specs/Renderer/SamplerSpec.js index 27ca18f57729..481f7c58a11d 100644 --- a/Specs/Renderer/SamplerSpec.js +++ b/Specs/Renderer/SamplerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Sampler', 'Renderer/TextureMinificationFilter', 'Renderer/TextureWrap', @@ -8,7 +8,9 @@ defineSuite([ TextureMinificationFilter, TextureWrap, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/Sampler', function() { var context; @@ -70,3 +72,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ShaderCacheSpec.js b/Specs/Renderer/ShaderCacheSpec.js index 0384eb53f257..ade031e2915c 100644 --- a/Specs/Renderer/ShaderCacheSpec.js +++ b/Specs/Renderer/ShaderCacheSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Renderer/ShaderCache', 'Specs/createContext' ], function( ShaderCache, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/ShaderCache', function() { var context; @@ -293,3 +295,4 @@ defineSuite([ expect(cache.isDestroyed()).toEqual(false); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ShaderProgramSpec.js b/Specs/Renderer/ShaderProgramSpec.js index 0fe33e0acc0b..6d3c3c527260 100644 --- a/Specs/Renderer/ShaderProgramSpec.js +++ b/Specs/Renderer/ShaderProgramSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/ShaderProgram', 'Renderer/ContextLimits', 'Renderer/ShaderSource', @@ -8,7 +8,9 @@ defineSuite([ ContextLimits, ShaderSource, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/ShaderProgram', function() { var webglStub = !!window.webglStub; var context; @@ -547,3 +549,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/ShaderSourceSpec.js b/Specs/Renderer/ShaderSourceSpec.js index 6b320b9cfd7d..718797dd292e 100644 --- a/Specs/Renderer/ShaderSourceSpec.js +++ b/Specs/Renderer/ShaderSourceSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Renderer/ShaderSource' ], function( ShaderSource) { - 'use strict'; + 'use strict'; + +describe('Renderer/ShaderSource', function() { var mockContext = { webgl2 : false @@ -95,3 +97,4 @@ defineSuite([ expect(clone.includeBuiltIns).toEqual(source.includeBuiltIns); }); }); +}); diff --git a/Specs/Renderer/TextureCacheSpec.js b/Specs/Renderer/TextureCacheSpec.js index 178b0298c284..902719af6b35 100644 --- a/Specs/Renderer/TextureCacheSpec.js +++ b/Specs/Renderer/TextureCacheSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/TextureCache', 'Renderer/Texture', 'Specs/createContext' @@ -8,6 +8,8 @@ defineSuite([ createContext) { 'use strict'; +describe('Renderer/TextureCache', function() { + var context; beforeAll(function() { @@ -124,3 +126,4 @@ defineSuite([ expect(cache.isDestroyed()).toEqual(false); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/TextureSpec.js b/Specs/Renderer/TextureSpec.js index 1ac8b48f8b28..f180360d93d7 100644 --- a/Specs/Renderer/TextureSpec.js +++ b/Specs/Renderer/TextureSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/Texture', 'Core/Cartesian2', 'Core/Color', @@ -32,7 +32,9 @@ defineSuite([ TextureWrap, createContext, when) { - 'use strict'; + 'use strict'; + +describe('Renderer/Texture', function() { var context; var greenImage; @@ -1466,3 +1468,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/UniformSpec.js b/Specs/Renderer/UniformSpec.js index e66ec7dedf65..68a2a0a6cac5 100644 --- a/Specs/Renderer/UniformSpec.js +++ b/Specs/Renderer/UniformSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', @@ -16,7 +16,9 @@ defineSuite([ Matrix3, Matrix4, createContext) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian2', function() { var context; @@ -843,3 +845,4 @@ defineSuite([ }).contextToRender(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/VertexArrayFacadeSpec.js b/Specs/Renderer/VertexArrayFacadeSpec.js index 9d17703e0d7f..cb476fa0ab23 100644 --- a/Specs/Renderer/VertexArrayFacadeSpec.js +++ b/Specs/Renderer/VertexArrayFacadeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/VertexArrayFacade', 'Core/ComponentDatatype', 'Renderer/BufferUsage', @@ -8,7 +8,9 @@ defineSuite([ ComponentDatatype, BufferUsage, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/VertexArrayFacade', function() { var context; @@ -329,3 +331,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/VertexArrayFactorySpec.js b/Specs/Renderer/VertexArrayFactorySpec.js index 1c64a716d814..db86d6f26280 100644 --- a/Specs/Renderer/VertexArrayFactorySpec.js +++ b/Specs/Renderer/VertexArrayFactorySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/ComponentDatatype', 'Core/Geometry', 'Core/GeometryAttribute', @@ -24,7 +24,9 @@ defineSuite([ ShaderProgram, VertexArray, createContext) { - 'use strict'; + 'use strict'; + +describe('Core/ComponentDatatype', function() { var context; var va; @@ -675,3 +677,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/VertexArraySpec.js b/Specs/Renderer/VertexArraySpec.js index 1974532d9ddf..124595168bfe 100644 --- a/Specs/Renderer/VertexArraySpec.js +++ b/Specs/Renderer/VertexArraySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/VertexArray', 'Core/ComponentDatatype', 'Core/PrimitiveType', @@ -16,7 +16,9 @@ defineSuite([ DrawCommand, ShaderProgram, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/VertexArray', function() { var context; @@ -837,3 +839,4 @@ defineSuite([ } }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/freezeRenderStateSpec.js b/Specs/Renderer/freezeRenderStateSpec.js index 7be321a90428..3ab8701e0a14 100644 --- a/Specs/Renderer/freezeRenderStateSpec.js +++ b/Specs/Renderer/freezeRenderStateSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Renderer/freezeRenderState' ], function( freezeRenderState) { - 'use strict'; + 'use strict'; + +describe('Renderer/freezeRenderState', function() { it('works as expected', function() { var fresh = { @@ -21,3 +23,4 @@ defineSuite([ expect(Object.isFrozen(frozen._applyFunctions)).toBe(false); }); }); +}); diff --git a/Specs/Renderer/loadCubeMapSpec.js b/Specs/Renderer/loadCubeMapSpec.js index 29b72117395c..2fc744bfd2f5 100644 --- a/Specs/Renderer/loadCubeMapSpec.js +++ b/Specs/Renderer/loadCubeMapSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Renderer/loadCubeMap', 'Core/Cartesian3', 'Core/PrimitiveType', @@ -18,7 +18,9 @@ defineSuite([ ShaderProgram, VertexArray, createContext) { - 'use strict'; + 'use strict'; + +describe('Renderer/loadCubeMap', function() { var context; @@ -289,3 +291,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Renderer/modernizeShaderSpec.js b/Specs/Renderer/modernizeShaderSpec.js index b915fd6461e7..895df83bc05c 100644 --- a/Specs/Renderer/modernizeShaderSpec.js +++ b/Specs/Renderer/modernizeShaderSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Renderer/modernizeShader' ], function( modernizeShader) { - 'use strict'; + 'use strict'; + +describe('Renderer/modernizeShader', function() { it('adds version string', function() { var simple = @@ -315,3 +317,4 @@ defineSuite([ expect(output).toContain(expected1); }); }); +}); diff --git a/Specs/Scene/AppearanceSpec.js b/Specs/Scene/AppearanceSpec.js index 89ed92a9ed60..81919feaf5cb 100644 --- a/Specs/Scene/AppearanceSpec.js +++ b/Specs/Scene/AppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Appearance', 'Core/WebGLConstants', 'Scene/BlendingState', @@ -8,7 +8,9 @@ defineSuite([ WebGLConstants, BlendingState, Material) { - 'use strict'; + 'use strict'; + +describe('Scene/Appearance', function() { it('constructor', function() { var material = Material.fromType('Color'); @@ -123,3 +125,4 @@ defineSuite([ expect(rs.blending).toBe(BlendingState.ALPHA_BLEND); }); }); +}); diff --git a/Specs/Scene/ArcGisMapServerImageryProviderSpec.js b/Specs/Scene/ArcGisMapServerImageryProviderSpec.js index 5c564eaff57a..185fed453441 100644 --- a/Specs/Scene/ArcGisMapServerImageryProviderSpec.js +++ b/Specs/Scene/ArcGisMapServerImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ArcGisMapServerImageryProvider', 'Core/appendForwardSlash', 'Core/Cartesian2', @@ -48,7 +48,9 @@ defineSuite([ ImageryState, pollToPromise, Uri) { - 'use strict'; + 'use strict'; + +describe('Scene/ArcGisMapServerImageryProvider', function() { var supportsImageBitmapOptions; beforeAll(function() { @@ -988,3 +990,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/AxisSpec.js b/Specs/Scene/AxisSpec.js index e61476ffc712..2e63f0919688 100644 --- a/Specs/Scene/AxisSpec.js +++ b/Specs/Scene/AxisSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Axis', 'Core/Cartesian4', 'Core/Math', @@ -8,7 +8,9 @@ defineSuite([ Cartesian4, CesiumMath, Matrix4) { - 'use strict'; + 'use strict'; + +describe('Scene/Axis', function() { function convertUpAxis(upAxis, transformation, expected) { var transformed = Matrix4.multiplyByVector(transformation, upAxis, new Cartesian4()); @@ -40,3 +42,4 @@ defineSuite([ convertUpAxis(Cartesian4.UNIT_X, Axis.X_UP_TO_Z_UP, Cartesian4.UNIT_Z); }); }); +}); diff --git a/Specs/Scene/BatchTableSpec.js b/Specs/Scene/BatchTableSpec.js index 2b90647bedae..8eeb2b7a3bca 100644 --- a/Specs/Scene/BatchTableSpec.js +++ b/Specs/Scene/BatchTableSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/BatchTable', 'Core/Cartesian4', 'Core/ComponentDatatype', @@ -14,7 +14,9 @@ defineSuite([ PixelDatatype, Texture, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/BatchTable', function() { var unsignedByteAttributes = [{ functionName : 'batchTable_getShow', @@ -282,3 +284,4 @@ defineSuite([ expect(batchTable.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Batched3DModel3DTileContentClassificationSpec.js b/Specs/Scene/Batched3DModel3DTileContentClassificationSpec.js index eceb751f6df5..5006c2f105a7 100644 --- a/Specs/Scene/Batched3DModel3DTileContentClassificationSpec.js +++ b/Specs/Scene/Batched3DModel3DTileContentClassificationSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color', @@ -44,7 +44,9 @@ defineSuite([ StencilConstants, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var modelMatrix; @@ -229,3 +231,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Batched3DModel3DTileContentSpec.js b/Specs/Scene/Batched3DModel3DTileContentSpec.js index 73c1647a69a7..f32ecc73eb36 100644 --- a/Specs/Scene/Batched3DModel3DTileContentSpec.js +++ b/Specs/Scene/Batched3DModel3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Batched3DModel3DTileContent', 'Core/Cartesian3', 'Core/Color', @@ -24,7 +24,9 @@ defineSuite([ Model, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Batched3DModel3DTileContent', function() { var scene; var centerLongitude = -1.31968; @@ -379,3 +381,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/BillboardCollectionSpec.js b/Specs/Scene/BillboardCollectionSpec.js index 5669be5e5666..2e74092082aa 100644 --- a/Specs/Scene/BillboardCollectionSpec.js +++ b/Specs/Scene/BillboardCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/BillboardCollection', 'Core/BoundingRectangle', 'Core/BoundingSphere', @@ -50,7 +50,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/BillboardCollection', function() { var scene; var context; @@ -1965,3 +1967,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/BingMapsImageryProviderSpec.js b/Specs/Scene/BingMapsImageryProviderSpec.js index 4c6afc5ceb8d..0e1ab9e3fdc3 100644 --- a/Specs/Scene/BingMapsImageryProviderSpec.js +++ b/Specs/Scene/BingMapsImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/BingMapsImageryProvider', 'Core/appendForwardSlash', 'Core/defined', @@ -32,7 +32,9 @@ defineSuite([ pollToPromise, Uri, when) { - 'use strict'; + 'use strict'; + +describe('Scene/BingMapsImageryProvider', function() { var supportsImageBitmapOptions; beforeAll(function() { @@ -587,3 +589,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/BoxEmitterSpec.js b/Specs/Scene/BoxEmitterSpec.js index a905f1186e97..072c6fddfc98 100644 --- a/Specs/Scene/BoxEmitterSpec.js +++ b/Specs/Scene/BoxEmitterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/BoxEmitter', 'Core/Cartesian3', 'Scene/Particle' @@ -6,7 +6,9 @@ defineSuite([ BoxEmitter, Cartesian3, Particle) { - 'use strict'; + 'use strict'; + +describe('Scene/BoxEmitter', function() { var emitter; @@ -69,3 +71,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Scene/CameraEventAggregatorSpec.js b/Specs/Scene/CameraEventAggregatorSpec.js index 3e91007449fb..114a52aa79e1 100644 --- a/Specs/Scene/CameraEventAggregatorSpec.js +++ b/Specs/Scene/CameraEventAggregatorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/CameraEventAggregator', 'Core/Cartesian2', 'Core/combine', @@ -16,7 +16,9 @@ defineSuite([ CameraEventType, createCanvas, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Scene/CameraEventAggregator', function() { var usePointerEvents; var canvas; @@ -310,3 +312,4 @@ defineSuite([ expect(handler.isDestroyed()).toEqual(true); }); }); +}); diff --git a/Specs/Scene/CameraFlightPathSpec.js b/Specs/Scene/CameraFlightPathSpec.js index 42d0c8e4e716..2b9b66bb3ddd 100644 --- a/Specs/Scene/CameraFlightPathSpec.js +++ b/Specs/Scene/CameraFlightPathSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/CameraFlightPath', 'Core/Cartesian3', 'Core/Cartographic', @@ -14,7 +14,9 @@ defineSuite([ OrthographicOffCenterFrustum, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/CameraFlightPath', function() { var scene; @@ -597,3 +599,4 @@ defineSuite([ } }); }, 'WebGL'); +}); diff --git a/Specs/Scene/CameraSpec.js b/Specs/Scene/CameraSpec.js index 53e4d3a2f200..f25c0b9c6ec9 100644 --- a/Specs/Scene/CameraSpec.js +++ b/Specs/Scene/CameraSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Camera', 'Core/BoundingSphere', 'Core/Cartesian2', @@ -46,7 +46,9 @@ defineSuite([ MapMode2D, SceneMode, TweenCollection) { - 'use strict'; + 'use strict'; + +describe('Scene/Camera', function() { var scene; var camera; @@ -3079,3 +3081,4 @@ defineSuite([ expect(camera.positionWCDeltaMagnitudeLastFrame).toEqualEpsilon(moveAmount, CesiumMath.EPSILON10); }); }); +}); diff --git a/Specs/Scene/Cesium3DTileBatchTableSpec.js b/Specs/Scene/Cesium3DTileBatchTableSpec.js index 43b9dd330d93..053370e94b87 100644 --- a/Specs/Scene/Cesium3DTileBatchTableSpec.js +++ b/Specs/Scene/Cesium3DTileBatchTableSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Cesium3DTileBatchTable', 'Core/Cartesian2', 'Core/Cartesian3', @@ -28,7 +28,9 @@ defineSuite([ Cesium3DTileStyle, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTileBatchTable', function() { var scene; var centerLongitude = -1.31968; @@ -1120,3 +1122,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Cesium3DTileContentSpec.js b/Specs/Scene/Cesium3DTileContentSpec.js index ca1c84b32bf6..920690695d42 100644 --- a/Specs/Scene/Cesium3DTileContentSpec.js +++ b/Specs/Scene/Cesium3DTileContentSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Scene/Cesium3DTileContent' ], function( Cesium3DTileContent) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTileContent', function() { it('throws', function() { var content = new Cesium3DTileContent(); @@ -65,3 +67,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/Cesium3DTileFeatureTableSpec.js b/Specs/Scene/Cesium3DTileFeatureTableSpec.js index 4d1b6ac051e8..11c2b6fe4399 100644 --- a/Specs/Scene/Cesium3DTileFeatureTableSpec.js +++ b/Specs/Scene/Cesium3DTileFeatureTableSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Scene/Cesium3DTileFeatureTable', 'Core/ComponentDatatype' ], function( Cesium3DTileFeatureTable, ComponentDatatype) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTileFeatureTable', function() { it('loads from JSON', function() { var featureTable = new Cesium3DTileFeatureTable({ @@ -34,3 +36,4 @@ defineSuite([ expect(properties).toEqual([0, 1, 2, 3, 4, 5]); }); }); +}); diff --git a/Specs/Scene/Cesium3DTilePassStateSpec.js b/Specs/Scene/Cesium3DTilePassStateSpec.js index 40dce19a96ab..7f4d82ff9366 100644 --- a/Specs/Scene/Cesium3DTilePassStateSpec.js +++ b/Specs/Scene/Cesium3DTilePassStateSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Scene/Cesium3DTilePassState', 'Scene/Cesium3DTilePass' ], function( Cesium3DTilePassState, Cesium3DTilePass) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTilePassState', function() { it('sets default values', function() { var passState = new Cesium3DTilePassState({ @@ -45,3 +47,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/Cesium3DTileSpec.js b/Specs/Scene/Cesium3DTileSpec.js index 32e70a9132f2..787ffeebbf65 100644 --- a/Specs/Scene/Cesium3DTileSpec.js +++ b/Specs/Scene/Cesium3DTileSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Cesium3DTile', 'Core/Cartesian3', 'Core/clone', @@ -28,7 +28,9 @@ defineSuite([ TileBoundingRegion, TileOrientedBoundingBox, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTile', function() { var tileWithBoundingSphere = { geometricError : 1, @@ -401,3 +403,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Cesium3DTileStyleSpec.js b/Specs/Scene/Cesium3DTileStyleSpec.js index 4f88119fb8ae..b52e4c191331 100644 --- a/Specs/Scene/Cesium3DTileStyleSpec.js +++ b/Specs/Scene/Cesium3DTileStyleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Cesium3DTileStyle', 'Core/Cartesian2', 'Core/Cartesian4', @@ -14,7 +14,9 @@ defineSuite([ Resource, ConditionsExpression, Expression) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTileStyle', function() { function MockFeature() { this._properties = {}; @@ -3867,3 +3869,4 @@ defineSuite([ expect(pointSizeFunction).toBeUndefined(); }); }); +}); diff --git a/Specs/Scene/Cesium3DTilesetHeatmapSpec.js b/Specs/Scene/Cesium3DTilesetHeatmapSpec.js index e9095f5af0a5..22a241a23bd1 100644 --- a/Specs/Scene/Cesium3DTilesetHeatmapSpec.js +++ b/Specs/Scene/Cesium3DTilesetHeatmapSpec.js @@ -1,26 +1,28 @@ -defineSuite([ +define([ 'Scene/Cesium3DTilesetHeatmap', - 'Scene/Cesium3DTile', - 'Scene/Cesium3DTileset', 'Core/clone', 'Core/Color', 'Core/JulianDate', 'Core/Math', 'Core/Matrix4', + 'Scene/Cesium3DTile', 'Scene/Cesium3DTileContentState', + 'Scene/Cesium3DTileset', 'Specs/createScene' ], function( Cesium3DTilesetHeatmap, - Cesium3DTile, - Cesium3DTileset, clone, Color, JulianDate, CesiumMath, Matrix4, + Cesium3DTile, Cesium3DTileContentState, + Cesium3DTileset, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTilesetHeatmap', function() { var tileWithBoundingSphere = { geometricError : 1, @@ -124,3 +126,4 @@ defineSuite([ verifyColor(tile._debugColor, expectedColor); }); }); +}); diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js index bf87a5c8fb9e..fe6bf3b6b449 100644 --- a/Specs/Scene/Cesium3DTilesetSpec.js +++ b/Specs/Scene/Cesium3DTilesetSpec.js @@ -1,11 +1,11 @@ -defineSuite([ +define([ 'Scene/Cesium3DTileset', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color', - 'Core/defined', 'Core/CullingVolume', + 'Core/defined', 'Core/getAbsoluteUri', 'Core/getStringFromTypedArray', 'Core/HeadingPitchRange', @@ -42,8 +42,8 @@ defineSuite([ Cartesian3, Cartographic, Color, - defined, CullingVolume, + defined, getAbsoluteUri, getStringFromTypedArray, HeadingPitchRange, @@ -74,7 +74,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/Cesium3DTileset', function() { // It's not easily possible to mock the most detailed pick functions // so don't run those tests when using the WebGL stub @@ -3714,3 +3716,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/CircleEmitterSpec.js b/Specs/Scene/CircleEmitterSpec.js index 2492d5b32961..395c91ec327f 100644 --- a/Specs/Scene/CircleEmitterSpec.js +++ b/Specs/Scene/CircleEmitterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/CircleEmitter', 'Core/Cartesian3', 'Scene/Particle' @@ -6,7 +6,9 @@ defineSuite([ CircleEmitter, Cartesian3, Particle) { - 'use strict'; + 'use strict'; + +describe('Scene/CircleEmitter', function() { var emitter; @@ -60,3 +62,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Scene/ClassificationModelSpec.js b/Specs/Scene/ClassificationModelSpec.js index 45fc1f661e3d..858f64d1f9dc 100644 --- a/Specs/Scene/ClassificationModelSpec.js +++ b/Specs/Scene/ClassificationModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ClassificationModel', 'Core/Cartesian3', 'Core/Cartographic', @@ -52,7 +52,9 @@ defineSuite([ addDefaults, parseGlb, updateVersion) { - 'use strict'; + 'use strict'; + +describe('Scene/ClassificationModel', function() { var scene; var modelMatrix; @@ -325,3 +327,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ClassificationPrimitiveSpec.js b/Specs/Scene/ClassificationPrimitiveSpec.js index d1afb517bcea..e0ab95609291 100644 --- a/Specs/Scene/ClassificationPrimitiveSpec.js +++ b/Specs/Scene/ClassificationPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ClassificationPrimitive', 'Core/BoxGeometry', 'Core/Cartesian3', @@ -48,7 +48,9 @@ defineSuite([ StencilConstants, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/ClassificationPrimitive', function() { var scene; @@ -1194,3 +1196,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ClippingPlaneCollectionSpec.js b/Specs/Scene/ClippingPlaneCollectionSpec.js index 2d261475ca33..cac58a23a6bf 100644 --- a/Specs/Scene/ClippingPlaneCollectionSpec.js +++ b/Specs/Scene/ClippingPlaneCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ClippingPlaneCollection', 'Core/AttributeCompression', 'Core/BoundingSphere', @@ -36,7 +36,9 @@ defineSuite([ TextureWrap, ClippingPlane, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/ClippingPlaneCollection', function() { var clippingPlanes; var planes = [ @@ -777,3 +779,4 @@ defineSuite([ scene.destroyForSpecs(); }); }); +}); diff --git a/Specs/Scene/ClippingPlaneSpec.js b/Specs/Scene/ClippingPlaneSpec.js index f21e3d3faddd..b92c048b831c 100644 --- a/Specs/Scene/ClippingPlaneSpec.js +++ b/Specs/Scene/ClippingPlaneSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ClippingPlane', 'Core/Cartesian3', 'Core/Math', @@ -12,7 +12,9 @@ defineSuite([ Matrix3, Matrix4, Plane) { - 'use strict'; + 'use strict'; + +describe('Scene/ClippingPlane', function() { it('constructs', function() { var normal = Cartesian3.UNIT_X; @@ -95,3 +97,4 @@ defineSuite([ expect(transformedPlane.normal.z).toEqual(-clippingPlane.normal.z); }); }); +}); diff --git a/Specs/Scene/Composite3DTileContentSpec.js b/Specs/Scene/Composite3DTileContentSpec.js index d4e056fdc73b..ad9356997428 100644 --- a/Specs/Scene/Composite3DTileContentSpec.js +++ b/Specs/Scene/Composite3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Color', 'Core/HeadingPitchRange', @@ -10,7 +10,9 @@ defineSuite([ HeadingPitchRange, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var centerLongitude = -1.31968; @@ -129,3 +131,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ConditionsExpressionSpec.js b/Specs/Scene/ConditionsExpressionSpec.js index 2647d8de3aaf..1aa52bb25fbb 100644 --- a/Specs/Scene/ConditionsExpressionSpec.js +++ b/Specs/Scene/ConditionsExpressionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ConditionsExpression', 'Core/Cartesian4', 'Core/Color' @@ -6,7 +6,9 @@ defineSuite([ ConditionsExpression, Cartesian4, Color) { - 'use strict'; + 'use strict'; + +describe('Scene/ConditionsExpression', function() { function MockFeature(value) { this._value = value; @@ -118,3 +120,4 @@ defineSuite([ expect(shaderFunction).toBeUndefined(); }); }); +}); diff --git a/Specs/Scene/ConeEmitterSpec.js b/Specs/Scene/ConeEmitterSpec.js index 9a0063eb158a..38e24b2800c2 100644 --- a/Specs/Scene/ConeEmitterSpec.js +++ b/Specs/Scene/ConeEmitterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ConeEmitter', 'Core/Cartesian3', 'Core/Math', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, CesiumMath, Particle) { - 'use strict'; + 'use strict'; + +describe('Scene/ConeEmitter', function() { it('default constructor', function() { var emitter = new ConeEmitter(); @@ -47,3 +49,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Scene/CreditDisplaySpec.js b/Specs/Scene/CreditDisplaySpec.js index 22687e0ab519..c43a8bb61940 100644 --- a/Specs/Scene/CreditDisplaySpec.js +++ b/Specs/Scene/CreditDisplaySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/CreditDisplay', 'Core/Credit', 'Core/defined', @@ -8,7 +8,9 @@ defineSuite([ Credit, defined, absolutize) { - 'use strict'; + 'use strict'; + +describe('Scene/CreditDisplay', function() { var container; var creditDisplay; @@ -384,3 +386,4 @@ defineSuite([ expect(creditDisplay._currentCesiumCredit).not.toBe(creditDisplay2._currentCesiumCredit); }); }); +}); diff --git a/Specs/Scene/DebugAppearanceSpec.js b/Specs/Scene/DebugAppearanceSpec.js index 2a91b3bae204..7cd2e9119598 100644 --- a/Specs/Scene/DebugAppearanceSpec.js +++ b/Specs/Scene/DebugAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DebugAppearance', 'Core/ComponentDatatype', 'Core/defaultValue', @@ -22,7 +22,9 @@ defineSuite([ Appearance, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/DebugAppearance', function() { var scene; var primitive; @@ -366,3 +368,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/DebugCameraPrimitiveSpec.js b/Specs/Scene/DebugCameraPrimitiveSpec.js index 90fe211053bb..fc7a43e58966 100644 --- a/Specs/Scene/DebugCameraPrimitiveSpec.js +++ b/Specs/Scene/DebugCameraPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DebugCameraPrimitive', 'Core/Cartesian3', 'Core/Color', @@ -10,7 +10,9 @@ defineSuite([ Color, Camera, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/DebugCameraPrimitive', function() { var scene; var camera; @@ -124,3 +126,4 @@ defineSuite([ expect(p.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/DebugModelMatrixPrimitiveSpec.js b/Specs/Scene/DebugModelMatrixPrimitiveSpec.js index 31550816bf00..604731e84a15 100644 --- a/Specs/Scene/DebugModelMatrixPrimitiveSpec.js +++ b/Specs/Scene/DebugModelMatrixPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DebugModelMatrixPrimitive', 'Core/Cartesian3', 'Core/Matrix4', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, Matrix4, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/DebugModelMatrixPrimitive', function() { var scene; @@ -88,3 +90,4 @@ defineSuite([ expect(p.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/DeviceOrientationCameraControllerSpec.js b/Specs/Scene/DeviceOrientationCameraControllerSpec.js index ade02cd14159..0e772c704ba6 100644 --- a/Specs/Scene/DeviceOrientationCameraControllerSpec.js +++ b/Specs/Scene/DeviceOrientationCameraControllerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DeviceOrientationCameraController', 'Core/Cartesian3', 'Core/Math', @@ -12,7 +12,9 @@ defineSuite([ createCamera, createCanvas, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Scene/DeviceOrientationCameraController', function() { var scene; var canvas; @@ -108,3 +110,4 @@ defineSuite([ expect(controller.isDestroyed()).toEqual(true); }); }); +}); diff --git a/Specs/Scene/DiscardEmptyTileImagePolicySpec.js b/Specs/Scene/DiscardEmptyTileImagePolicySpec.js index eca1d6b1308e..14a7804f8dc3 100644 --- a/Specs/Scene/DiscardEmptyTileImagePolicySpec.js +++ b/Specs/Scene/DiscardEmptyTileImagePolicySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DiscardEmptyTileImagePolicy', 'Core/Resource', 'Specs/pollToPromise', @@ -8,7 +8,9 @@ defineSuite([ Resource, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/DiscardEmptyTileImagePolicy', function() { afterEach(function() { Resource._Implementations.createImage = Resource._DefaultImplementations.createImage; @@ -52,3 +54,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/DiscardMissingTileImagePolicySpec.js b/Specs/Scene/DiscardMissingTileImagePolicySpec.js index 50ccd13b4515..55d06ddc5100 100644 --- a/Specs/Scene/DiscardMissingTileImagePolicySpec.js +++ b/Specs/Scene/DiscardMissingTileImagePolicySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/DiscardMissingTileImagePolicy', 'Core/Cartesian2', 'Core/Resource', @@ -10,7 +10,9 @@ defineSuite([ Resource, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/DiscardMissingTileImagePolicy', function() { var supportsImageBitmapOptions; beforeAll(function() { @@ -163,3 +165,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/EllipsoidPrimitiveSpec.js b/Specs/Scene/EllipsoidPrimitiveSpec.js index 858e3fba9f32..4efb9269c185 100644 --- a/Specs/Scene/EllipsoidPrimitiveSpec.js +++ b/Specs/Scene/EllipsoidPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/EllipsoidPrimitive', 'Core/Cartesian3', 'Core/defined', @@ -12,7 +12,9 @@ defineSuite([ Matrix4, Material, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/EllipsoidPrimitive', function() { var scene; var ellipsoid; @@ -198,3 +200,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js b/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js index 965119e3cfe3..b2696373d1ee 100644 --- a/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js +++ b/Specs/Scene/EllipsoidSurfaceAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/EllipsoidSurfaceAppearance', 'Core/ColorGeometryInstanceAttribute', 'Core/GeometryInstance', @@ -18,7 +18,9 @@ defineSuite([ Material, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/EllipsoidSurfaceAppearance', function() { var scene; var rectangle; @@ -83,3 +85,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Empty3DTileContentSpec.js b/Specs/Scene/Empty3DTileContentSpec.js index a28fa903e079..282856c202e5 100644 --- a/Specs/Scene/Empty3DTileContentSpec.js +++ b/Specs/Scene/Empty3DTileContentSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Scene/Empty3DTileContent' ], function( Empty3DTileContent) { - 'use strict'; + 'use strict'; + +describe('Scene/Empty3DTileContent', function() { it('destroys', function() { var content = new Empty3DTileContent(); @@ -29,3 +31,4 @@ defineSuite([ expect(content.batchTable).toBeUndefined(); }); }); +}); diff --git a/Specs/Scene/ExpressionSpec.js b/Specs/Scene/ExpressionSpec.js index 77749363fb76..d08c765615fc 100644 --- a/Specs/Scene/ExpressionSpec.js +++ b/Specs/Scene/ExpressionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Expression', 'Core/Cartesian2', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ Color, CesiumMath, ExpressionNodeType) { - 'use strict'; + 'use strict'; + +describe('Scene/Expression', function() { function MockFeature() { this._properties = {}; @@ -3667,3 +3669,4 @@ defineSuite([ }).toThrowRuntimeError(); }); }); +}); diff --git a/Specs/Scene/FrameRateMonitorSpec.js b/Specs/Scene/FrameRateMonitorSpec.js index fd637ebb5074..5afe7669a31a 100644 --- a/Specs/Scene/FrameRateMonitorSpec.js +++ b/Specs/Scene/FrameRateMonitorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/FrameRateMonitor', 'Core/defined', 'Core/getTimestamp', @@ -8,7 +8,9 @@ defineSuite([ defined, getTimestamp, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/FrameRateMonitor', function() { var scene; beforeAll(function() { @@ -258,3 +260,4 @@ defineSuite([ expect(nominalListener).toHaveBeenCalled(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/FrustumCommandsSpec.js b/Specs/Scene/FrustumCommandsSpec.js index 2011f9d08201..c47dbf1935e5 100644 --- a/Specs/Scene/FrustumCommandsSpec.js +++ b/Specs/Scene/FrustumCommandsSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Renderer/Pass', 'Scene/FrustumCommands' ], function( Pass, FrustumCommands) { - 'use strict'; + 'use strict'; + +describe('Renderer/Pass', function() { it('constructs without arguments', function() { var frustum = new FrustumCommands(); @@ -28,3 +30,4 @@ defineSuite([ expect(frustum.indices.length).toEqual(Pass.NUMBER_OF_PASSES); }); }); +}); diff --git a/Specs/Scene/Geometry3DTileContentSpec.js b/Specs/Scene/Geometry3DTileContentSpec.js index 55daac0acdf8..7d36e5159108 100644 --- a/Specs/Scene/Geometry3DTileContentSpec.js +++ b/Specs/Scene/Geometry3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Geometry3DTileContent', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -50,7 +50,9 @@ defineSuite([ StencilConstants, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Geometry3DTileContent', function() { var tilesetRectangle = Rectangle.fromDegrees(-0.01, -0.01, 0.01, 0.01); @@ -615,3 +617,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/GeometryRenderingSpec.js b/Specs/Scene/GeometryRenderingSpec.js index fb2662ac6159..4b8d4b44ac30 100644 --- a/Specs/Scene/GeometryRenderingSpec.js +++ b/Specs/Scene/GeometryRenderingSpec.js @@ -1,15 +1,14 @@ -defineSuite([ +define([ 'Core/ArcType', 'Core/BoundingSphere', 'Core/BoxGeometry', - 'Core/PlaneGeometry', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/CircleGeometry', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', - 'Core/CoplanarPolygonGeometry', 'Core/ComponentDatatype', + 'Core/CoplanarPolygonGeometry', 'Core/CornerType', 'Core/CorridorGeometry', 'Core/CylinderGeometry', @@ -23,6 +22,7 @@ defineSuite([ 'Core/Math', 'Core/Matrix4', 'Core/PerspectiveFrustum', + 'Core/PlaneGeometry', 'Core/PolygonGeometry', 'Core/PolylineGeometry', 'Core/PolylineVolumeGeometry', @@ -45,14 +45,13 @@ defineSuite([ ArcType, BoundingSphere, BoxGeometry, - PlaneGeometry, Cartesian2, Cartesian3, CircleGeometry, Color, ColorGeometryInstanceAttribute, - CoplanarPolygonGeometry, ComponentDatatype, + CoplanarPolygonGeometry, CornerType, CorridorGeometry, CylinderGeometry, @@ -66,6 +65,7 @@ defineSuite([ CesiumMath, Matrix4, PerspectiveFrustum, + PlaneGeometry, PolygonGeometry, PolylineGeometry, PolylineVolumeGeometry, @@ -84,7 +84,9 @@ defineSuite([ SceneMode, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Core/ArcType', function() { var scene; var ellipsoid; @@ -1745,3 +1747,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/GlobeSpec.js b/Specs/Scene/GlobeSpec.js index 057fd094d93e..2fec41da1cbf 100644 --- a/Specs/Scene/GlobeSpec.js +++ b/Specs/Scene/GlobeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Globe', 'Core/CesiumTerrainProvider', 'Core/Rectangle', @@ -14,7 +14,9 @@ defineSuite([ SingleTileImageryProvider, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Globe', function() { var scene; var globe; @@ -268,3 +270,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/GlobeSurfaceTileProviderSpec.js b/Specs/Scene/GlobeSurfaceTileProviderSpec.js index b9d2f4ddffdf..3d1e382a2873 100644 --- a/Specs/Scene/GlobeSurfaceTileProviderSpec.js +++ b/Specs/Scene/GlobeSurfaceTileProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/GlobeSurfaceTileProvider', 'Core/Cartesian3', 'Core/Cartesian4', @@ -60,7 +60,9 @@ defineSuite([ WebMapServiceImageryProvider, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/GlobeSurfaceTileProvider', function() { var scene; @@ -1066,3 +1068,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/GlobeSurfaceTileSpec.js b/Specs/Scene/GlobeSurfaceTileSpec.js index b4bb3e7877c9..a88583088e7f 100644 --- a/Specs/Scene/GlobeSurfaceTileSpec.js +++ b/Specs/Scene/GlobeSurfaceTileSpec.js @@ -1,5 +1,8 @@ -defineSuite([ +define([ 'Scene/GlobeSurfaceTile', + '../MockImageryProvider', + '../MockTerrainProvider', + '../TerrainTileProcessor', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/clone', @@ -14,12 +17,12 @@ defineSuite([ 'Scene/QuadtreeTileLoadState', 'Scene/TerrainState', 'Specs/createScene', - 'ThirdParty/when', - '../MockImageryProvider', - '../MockTerrainProvider', - '../TerrainTileProcessor' + 'ThirdParty/when' ], function( GlobeSurfaceTile, + MockImageryProvider, + MockTerrainProvider, + TerrainTileProcessor, Cartesian3, Cartesian4, clone, @@ -34,11 +37,10 @@ defineSuite([ QuadtreeTileLoadState, TerrainState, createScene, - when, - MockImageryProvider, - MockTerrainProvider, - TerrainTileProcessor) { - 'use strict'; + when) { + 'use strict'; + +describe('Scene/GlobeSurfaceTile', function() { var frameState; var tilingScheme; @@ -403,3 +405,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js b/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js index 973c32f220bb..4103662be485 100644 --- a/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js +++ b/Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/GoogleEarthEnterpriseImageryProvider', 'Core/decodeGoogleEarthEnterpriseData', 'Core/DefaultProxy', @@ -38,7 +38,9 @@ defineSuite([ pollToPromise, Uri, when) { - 'use strict'; + 'use strict'; + +describe('Scene/GoogleEarthEnterpriseImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -308,3 +310,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js b/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js index 0d6b0528f65e..b9e51188eb39 100644 --- a/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js +++ b/Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/GoogleEarthEnterpriseMapsProvider', 'Core/DefaultProxy', 'Core/GeographicTilingScheme', @@ -24,7 +24,9 @@ defineSuite([ ImageryProvider, ImageryState, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/GoogleEarthEnterpriseMapsProvider', function() { var supportsImageBitmapOptions; beforeAll(function() { @@ -508,3 +510,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/GridImageryProviderSpec.js b/Specs/Scene/GridImageryProviderSpec.js index b798552151f8..d305aef05ee0 100644 --- a/Specs/Scene/GridImageryProviderSpec.js +++ b/Specs/Scene/GridImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/GridImageryProvider', 'Core/Ellipsoid', 'Core/GeographicTilingScheme', @@ -14,7 +14,9 @@ defineSuite([ ImageryProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/GridImageryProvider', function() { it('conforms to ImageryProvider interface', function() { expect(GridImageryProvider).toConformToInterface(ImageryProvider); @@ -98,3 +100,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/GroundPolylinePrimitiveSpec.js b/Specs/Scene/GroundPolylinePrimitiveSpec.js index e1eda544a635..210dab6db862 100644 --- a/Specs/Scene/GroundPolylinePrimitiveSpec.js +++ b/Specs/Scene/GroundPolylinePrimitiveSpec.js @@ -1,9 +1,9 @@ -defineSuite([ +define([ 'Scene/GroundPolylinePrimitive', 'Core/ApproximateTerrainHeights', + 'Core/Cartesian3', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', - 'Core/Cartesian3', 'Core/destroyObject', 'Core/DistanceDisplayConditionGeometryInstanceAttribute', 'Core/Ellipsoid', @@ -22,9 +22,9 @@ defineSuite([ ], function( GroundPolylinePrimitive, ApproximateTerrainHeights, + Cartesian3, Color, ColorGeometryInstanceAttribute, - Cartesian3, destroyObject, DistanceDisplayConditionGeometryInstanceAttribute, Ellipsoid, @@ -40,7 +40,9 @@ defineSuite([ Primitive, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/GroundPolylinePrimitive', function() { var scene; var context; @@ -959,3 +961,4 @@ defineSuite([ ApproximateTerrainHeights._terrainHeights = terrainHeights; }); }, 'WebGL'); +}); diff --git a/Specs/Scene/GroundPrimitiveSpec.js b/Specs/Scene/GroundPrimitiveSpec.js index 6c8e3d22c64c..6549a7e38887 100644 --- a/Specs/Scene/GroundPrimitiveSpec.js +++ b/Specs/Scene/GroundPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/GroundPrimitive', 'Core/ApproximateTerrainHeights', 'Core/arraySlice', @@ -54,7 +54,9 @@ defineSuite([ createCanvas, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/GroundPrimitive', function() { var scene; var context; @@ -1387,3 +1389,4 @@ defineSuite([ ApproximateTerrainHeights._terrainHeights = terrainHeights; }); }, 'WebGL'); +}); diff --git a/Specs/Scene/HeightmapTessellatorSpec.js b/Specs/Scene/HeightmapTessellatorSpec.js index b8f0330a6fac..820218714478 100644 --- a/Specs/Scene/HeightmapTessellatorSpec.js +++ b/Specs/Scene/HeightmapTessellatorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/HeightmapTessellator', 'Core/Cartesian2', 'Core/Cartesian3', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Rectangle, WebMercatorProjection) { - 'use strict'; + 'use strict'; + +describe('Core/HeightmapTessellator', function() { it('throws when heightmap is not provided', function() { expect(function() { @@ -440,3 +442,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Scene/ImageryLayerCollectionSpec.js b/Specs/Scene/ImageryLayerCollectionSpec.js index 1f11af9357be..c637b73b71c3 100644 --- a/Specs/Scene/ImageryLayerCollectionSpec.js +++ b/Specs/Scene/ImageryLayerCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ImageryLayerCollection', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -34,7 +34,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/ImageryLayerCollection', function() { var fakeProvider = { isReady : function() { return false; } @@ -567,3 +569,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ImageryLayerSpec.js b/Specs/Scene/ImageryLayerSpec.js index 30cd72d8b67e..11f7c40bc251 100644 --- a/Specs/Scene/ImageryLayerSpec.js +++ b/Specs/Scene/ImageryLayerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ImageryLayer', 'Core/EllipsoidTerrainProvider', 'Core/Rectangle', @@ -44,7 +44,9 @@ defineSuite([ WebMapServiceImageryProvider, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/ImageryLayer', function() { var scene; var computeEngine; @@ -715,3 +717,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Instanced3DModel3DTileContentSpec.js b/Specs/Scene/Instanced3DModel3DTileContentSpec.js index bf7254ed943d..7d3482b27b8a 100644 --- a/Specs/Scene/Instanced3DModel3DTileContentSpec.js +++ b/Specs/Scene/Instanced3DModel3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Color', 'Core/HeadingPitchRange', @@ -22,7 +22,9 @@ defineSuite([ TileBoundingSphere, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var centerLongitude = -1.31968; @@ -378,3 +380,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/IonImageryProviderSpec.js b/Specs/Scene/IonImageryProviderSpec.js index d78f54b4f36b..4f01fdd4f6cd 100644 --- a/Specs/Scene/IonImageryProviderSpec.js +++ b/Specs/Scene/IonImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/IonImageryProvider', 'Core/Credit', 'Core/defaultValue', @@ -34,7 +34,9 @@ defineSuite([ WebMapServiceImageryProvider, WebMapTileServiceImageryProvider, when) { - 'use strict'; + 'use strict'; + +describe('Scene/IonImageryProvider', function() { function createTestProvider(endpointData) { endpointData = defaultValue(endpointData, { @@ -291,3 +293,4 @@ defineSuite([ return testExternalImagery('WMTS', { url: 'http://test.invalid', layer: '', style: '', tileMatrixSetID: 1 }, WebMapTileServiceImageryProvider); }); }); +}); diff --git a/Specs/Scene/JobSchedulerSpec.js b/Specs/Scene/JobSchedulerSpec.js index c1aa5fffc753..90e0e84c067d 100644 --- a/Specs/Scene/JobSchedulerSpec.js +++ b/Specs/Scene/JobSchedulerSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Scene/JobScheduler', 'Scene/JobType' ], function( JobScheduler, JobType) { - 'use strict'; + 'use strict'; + +describe('Scene/JobScheduler', function() { var originalGetTimestamp; @@ -192,3 +194,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/LabelCollectionSpec.js b/Specs/Scene/LabelCollectionSpec.js index 3aa59e007766..3f5417e5cfc8 100644 --- a/Specs/Scene/LabelCollectionSpec.js +++ b/Specs/Scene/LabelCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/LabelCollection', 'Core/BoundingRectangle', 'Core/BoundingSphere', @@ -38,7 +38,9 @@ defineSuite([ VerticalOrigin, createGlobe, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/LabelCollection', function() { // TODO: rendering tests for pixel offset, eye offset, horizontal origin, vertical origin, font, style, outlineColor, outlineWidth, and fillColor properties @@ -2406,3 +2408,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/MapboxImageryProviderSpec.js b/Specs/Scene/MapboxImageryProviderSpec.js index 5796f327c1f8..9669b1902215 100644 --- a/Specs/Scene/MapboxImageryProviderSpec.js +++ b/Specs/Scene/MapboxImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/MapboxImageryProvider', 'Core/DefaultProxy', 'Core/MapboxApi', @@ -26,7 +26,9 @@ defineSuite([ ImageryProvider, ImageryState, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/MapboxImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -326,3 +328,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/MapboxStyleImageryProviderSpec.js b/Specs/Scene/MapboxStyleImageryProviderSpec.js index 7625be15950d..3f09aafb6d5f 100644 --- a/Specs/Scene/MapboxStyleImageryProviderSpec.js +++ b/Specs/Scene/MapboxStyleImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/MapboxStyleImageryProvider', 'Core/MapboxApi', 'Core/Math', @@ -24,7 +24,9 @@ defineSuite([ ImageryProvider, ImageryState, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/MapboxStyleImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -358,3 +360,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/MaterialAppearanceSpec.js b/Specs/Scene/MaterialAppearanceSpec.js index 59d829f29344..e186e5bac956 100644 --- a/Specs/Scene/MaterialAppearanceSpec.js +++ b/Specs/Scene/MaterialAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/MaterialAppearance', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', @@ -22,7 +22,9 @@ defineSuite([ Material, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/MaterialAppearance', function() { var scene; var primitive; @@ -125,3 +127,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/MaterialSpec.js b/Specs/Scene/MaterialSpec.js index 5085391c19f0..d63666405573 100644 --- a/Specs/Scene/MaterialSpec.js +++ b/Specs/Scene/MaterialSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Material', 'Core/Cartesian3', 'Core/Color', @@ -30,7 +30,9 @@ defineSuite([ Primitive, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Material', function() { var scene; @@ -855,3 +857,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ModelInstanceCollectionSpec.js b/Specs/Scene/ModelInstanceCollectionSpec.js index ae5fe70d7496..5963e39c7ca5 100644 --- a/Specs/Scene/ModelInstanceCollectionSpec.js +++ b/Specs/Scene/ModelInstanceCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ModelInstanceCollection', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -32,7 +32,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/ModelInstanceCollection', function() { var boxUrl = './Data/Models/Box/CesiumBoxTest.gltf'; var cesiumAirUrl = './Data/Models/CesiumAir/Cesium_Air.gltf'; @@ -690,3 +692,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js index 0dce256ffe87..ed45e108fa43 100644 --- a/Specs/Scene/ModelSpec.js +++ b/Specs/Scene/ModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Model', 'Core/Cartesian2', 'Core/Cartesian3', @@ -74,7 +74,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/Model', function() { var boxUrl = './Data/Models/Box/CesiumBoxTest.gltf'; var boxNoTechniqueUrl = './Data/Models/Box/CesiumBoxTest-NoTechnique.gltf'; @@ -3541,3 +3543,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/MoonSpec.js b/Specs/Scene/MoonSpec.js index 8f1720172d1b..9e633d8345d2 100644 --- a/Specs/Scene/MoonSpec.js +++ b/Specs/Scene/MoonSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Moon', 'Core/BoundingSphere', 'Core/Color', @@ -18,7 +18,9 @@ defineSuite([ Simon1994PlanetaryPositions, Transforms, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Moon', function() { var scene; var backgroundColor = [255, 0, 0, 255]; @@ -85,3 +87,4 @@ defineSuite([ expect(moon.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/MultifrustumSpec.js b/Specs/Scene/MultifrustumSpec.js index 8a89b7a66d99..ac43b56c7040 100644 --- a/Specs/Scene/MultifrustumSpec.js +++ b/Specs/Scene/MultifrustumSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingSphere', 'Core/BoxGeometry', 'Core/Cartesian2', @@ -52,7 +52,9 @@ defineSuite([ TextureAtlas, createScene, when) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingSphere', function() { var scene; var context; @@ -374,3 +376,4 @@ defineSuite([ expect(scene.frustumCommandsList.length).toEqual(1); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/OctahedralProjectedCubeMapSpec.js b/Specs/Scene/OctahedralProjectedCubeMapSpec.js index 296d3748fb80..14e606604171 100644 --- a/Specs/Scene/OctahedralProjectedCubeMapSpec.js +++ b/Specs/Scene/OctahedralProjectedCubeMapSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/OctahedralProjectedCubeMap', 'Core/Cartesian3', 'Renderer/ComputeEngine', @@ -14,7 +14,9 @@ defineSuite([ createContext, createFrameState, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/OctahedralProjectedCubeMap', function() { var context; var computeEngine; @@ -199,3 +201,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/OrderedGroundPrimitiveCollectionSpec.js b/Specs/Scene/OrderedGroundPrimitiveCollectionSpec.js index 036d93cb3d68..7bb3f913f4ed 100644 --- a/Specs/Scene/OrderedGroundPrimitiveCollectionSpec.js +++ b/Specs/Scene/OrderedGroundPrimitiveCollectionSpec.js @@ -1,10 +1,12 @@ -defineSuite([ - 'Scene/OrderedGroundPrimitiveCollection', - 'Core/destroyObject' -], function( - OrderedGroundPrimitiveCollection, - destroyObject) { - 'use strict'; +define([ + 'Scene/OrderedGroundPrimitiveCollection', + 'Core/destroyObject' + ], function( + OrderedGroundPrimitiveCollection, + destroyObject) { + 'use strict'; + +describe('Scene/OrderedGroundPrimitiveCollection', function() { var updateCallOrder; @@ -267,3 +269,4 @@ defineSuite([ expect(collection.isDestroyed()).toBe(true); }); }); +}); diff --git a/Specs/Scene/ParticleSpec.js b/Specs/Scene/ParticleSpec.js index cfefce359c99..4e0c5abcb84c 100644 --- a/Specs/Scene/ParticleSpec.js +++ b/Specs/Scene/ParticleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Particle', 'Core/Cartesian2', 'Core/Cartesian3', @@ -8,7 +8,9 @@ defineSuite([ Cartesian2, Cartesian3, Color) { - 'use strict'; + 'use strict'; + +describe('Scene/Particle', function() { it('default constructor', function() { var p = new Particle(); @@ -97,3 +99,4 @@ defineSuite([ expect(p.update(dt)).toEqual(false); }); }); +}); diff --git a/Specs/Scene/ParticleSystemSpec.js b/Specs/Scene/ParticleSystemSpec.js index 5b6d7a265347..db3179f79ecb 100644 --- a/Specs/Scene/ParticleSystemSpec.js +++ b/Specs/Scene/ParticleSystemSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ParticleSystem', 'Core/Cartesian2', 'Core/Cartesian3', @@ -18,7 +18,9 @@ defineSuite([ CircleEmitter, ParticleBurst, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/ParticleSystem', function() { var scene; var greenImage; @@ -355,3 +357,4 @@ defineSuite([ expect(p.isDestroyed()).toEqual(true); }); }); +}); diff --git a/Specs/Scene/PerInstanceColorAppearanceSpec.js b/Specs/Scene/PerInstanceColorAppearanceSpec.js index 3b392ceed9f7..a11c62229b79 100644 --- a/Specs/Scene/PerInstanceColorAppearanceSpec.js +++ b/Specs/Scene/PerInstanceColorAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PerInstanceColorAppearance', 'Core/ColorGeometryInstanceAttribute', 'Core/GeometryInstance', @@ -16,7 +16,9 @@ defineSuite([ Appearance, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PerInstanceColorAppearance', function() { var scene; var rectangle; @@ -90,3 +92,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PickSpec.js b/Specs/Scene/PickSpec.js index c70982d0b3db..c83c093534ae 100644 --- a/Specs/Scene/PickSpec.js +++ b/Specs/Scene/PickSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color', @@ -56,7 +56,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { // It's not easily possible to mock the most detailed pick functions // so don't run those tests when using the WebGL stub @@ -2357,3 +2359,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js index c41613d0ce8b..3a46525d2837 100644 --- a/Specs/Scene/PointCloud3DTileContentSpec.js +++ b/Specs/Scene/PointCloud3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PointCloud3DTileContent', 'Core/Cartesian3', 'Core/Color', @@ -46,7 +46,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/PointCloud3DTileContent', function() { var scene; var centerLongitude = -1.31968; @@ -1032,3 +1034,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PointCloudEyeDomeLightingSpec.js b/Specs/Scene/PointCloudEyeDomeLightingSpec.js index 32e78f7aa1ca..254aee62ffe4 100644 --- a/Specs/Scene/PointCloudEyeDomeLightingSpec.js +++ b/Specs/Scene/PointCloudEyeDomeLightingSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Color', 'Core/defined', @@ -24,7 +24,9 @@ defineSuite([ PointCloudEyeDomeLighting, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var centerLongitude = -1.31968; @@ -92,3 +94,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PointCloudShadingSpec.js b/Specs/Scene/PointCloudShadingSpec.js index ffac43d24946..4985564e5a96 100644 --- a/Specs/Scene/PointCloudShadingSpec.js +++ b/Specs/Scene/PointCloudShadingSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Scene/PointCloudShading', 'Specs/createScene' ], function( PointCloudShading, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PointCloudShading', function() { it('creates expected instance from raw assignment and construction', function() { var pointCloudShading = new PointCloudShading(); @@ -47,3 +49,4 @@ defineSuite([ scene.destroyForSpecs(); }); }); +}); diff --git a/Specs/Scene/PointPrimitiveCollectionSpec.js b/Specs/Scene/PointPrimitiveCollectionSpec.js index 381908d6c52d..bd840d0e44db 100644 --- a/Specs/Scene/PointPrimitiveCollectionSpec.js +++ b/Specs/Scene/PointPrimitiveCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PointPrimitiveCollection', 'Core/BoundingRectangle', 'Core/BoundingSphere', @@ -26,7 +26,9 @@ defineSuite([ BlendOption, PointPrimitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PointPrimitiveCollection', function() { var scene; var camera; @@ -943,3 +945,4 @@ defineSuite([ expect(actual.radius).toBeGreaterThan(expected.radius); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PolylineCollectionSpec.js b/Specs/Scene/PolylineCollectionSpec.js index c722f9a8c71f..51712416a7fa 100644 --- a/Specs/Scene/PolylineCollectionSpec.js +++ b/Specs/Scene/PolylineCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PolylineCollection', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -24,7 +24,9 @@ defineSuite([ Material, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PolylineCollection', function() { var scene; var polylines; @@ -1659,3 +1661,4 @@ defineSuite([ expect(polylines.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PolylineColorAppearanceSpec.js b/Specs/Scene/PolylineColorAppearanceSpec.js index b1fbb025fd85..e1c91253afb2 100644 --- a/Specs/Scene/PolylineColorAppearanceSpec.js +++ b/Specs/Scene/PolylineColorAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PolylineColorAppearance', 'Core/ArcType', 'Core/Cartesian3', @@ -20,7 +20,9 @@ defineSuite([ Appearance, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PolylineColorAppearance', function() { var scene; var primitive; @@ -80,3 +82,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PolylineMaterialAppearanceSpec.js b/Specs/Scene/PolylineMaterialAppearanceSpec.js index 5ae00f21daac..b73f41db5677 100644 --- a/Specs/Scene/PolylineMaterialAppearanceSpec.js +++ b/Specs/Scene/PolylineMaterialAppearanceSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PolylineMaterialAppearance', 'Core/ArcType', 'Core/Cartesian3', @@ -18,7 +18,9 @@ defineSuite([ Material, Primitive, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PolylineMaterialAppearance', function() { var scene; var primitive; @@ -77,3 +79,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PostProcessStageCollectionSpec.js b/Specs/Scene/PostProcessStageCollectionSpec.js index fdc02f0bce6a..774cf755ed8a 100644 --- a/Specs/Scene/PostProcessStageCollectionSpec.js +++ b/Specs/Scene/PostProcessStageCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PostProcessStageCollection', 'Core/Color', 'Scene/PostProcessStage', @@ -12,7 +12,9 @@ defineSuite([ Tonemapper, createScene, ViewportPrimitive) { - 'use strict'; + 'use strict'; + +describe('Scene/PostProcessStageCollection', function() { var scene; @@ -357,3 +359,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PostProcessStageCompositeSpec.js b/Specs/Scene/PostProcessStageCompositeSpec.js index 30ad81cff991..0a1be156f873 100644 --- a/Specs/Scene/PostProcessStageCompositeSpec.js +++ b/Specs/Scene/PostProcessStageCompositeSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PostProcessStageComposite', 'Core/Color', 'Core/defined', @@ -14,7 +14,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/PostProcessStageComposite', function() { var scene; @@ -226,3 +228,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PostProcessStageLibrarySpec.js b/Specs/Scene/PostProcessStageLibrarySpec.js index 13aea8c8ce3e..0f6f6f64a6ee 100644 --- a/Specs/Scene/PostProcessStageLibrarySpec.js +++ b/Specs/Scene/PostProcessStageLibrarySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PostProcessStageLibrary', 'Core/Cartesian3', 'Core/defined', @@ -7,14 +7,14 @@ defineSuite([ 'Core/HeadingPitchRoll', 'Core/Matrix4', 'Core/Transforms', - 'Scene/Model', 'Renderer/Pass', 'Renderer/RenderState', - 'ThirdParty/when', + 'Scene/Model', 'Specs/createCanvas', 'Specs/createScene', 'Specs/pollToPromise', - 'Specs/ViewportPrimitive' + 'Specs/ViewportPrimitive', + 'ThirdParty/when' ], function( PostProcessStageLibrary, Cartesian3, @@ -24,15 +24,17 @@ defineSuite([ HeadingPitchRoll, Matrix4, Transforms, - Model, Pass, RenderState, - when, + Model, createCanvas, createScene, pollToPromise, - ViewportPrimitive) { - 'use strict'; + ViewportPrimitive, + when) { + 'use strict'; + +describe('Scene/PostProcessStageLibrary', function() { var scene; @@ -510,3 +512,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PostProcessStageSpec.js b/Specs/Scene/PostProcessStageSpec.js index b7eaf8630008..aee5ee101c19 100644 --- a/Specs/Scene/PostProcessStageSpec.js +++ b/Specs/Scene/PostProcessStageSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PostProcessStage', 'Core/BoundingRectangle', 'Core/Cartesian3', @@ -30,7 +30,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/PostProcessStage', function() { var scene; @@ -293,3 +295,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PrimitiveCollectionSpec.js b/Specs/Scene/PrimitiveCollectionSpec.js index c68966ee6083..b23304966928 100644 --- a/Specs/Scene/PrimitiveCollectionSpec.js +++ b/Specs/Scene/PrimitiveCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PrimitiveCollection', 'Core/ColorGeometryInstanceAttribute', 'Core/defaultValue', @@ -26,7 +26,9 @@ defineSuite([ Primitive, VerticalOrigin, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/PrimitiveCollection', function() { var scene; var context; @@ -624,3 +626,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PrimitiveCullingSpec.js b/Specs/Scene/PrimitiveCullingSpec.js index 53d88fa61b31..a44185b1e8ae 100644 --- a/Specs/Scene/PrimitiveCullingSpec.js +++ b/Specs/Scene/PrimitiveCullingSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/Color', 'Core/ColorGeometryInstanceAttribute', @@ -44,7 +44,9 @@ defineSuite([ SceneMode, VerticalOrigin, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var rectangle = Rectangle.fromDegrees(-100.0, 30.0, -93.0, 37.0); @@ -268,3 +270,4 @@ defineSuite([ testOcclusionCull(primitive); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PrimitivePipelineSpec.js b/Specs/Scene/PrimitivePipelineSpec.js index efbcff542d9e..da161759928e 100644 --- a/Specs/Scene/PrimitivePipelineSpec.js +++ b/Specs/Scene/PrimitivePipelineSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/PrimitivePipeline', 'Core/BoundingSphere', 'Core/BoxGeometry', @@ -18,7 +18,9 @@ defineSuite([ GeometryAttribute, GeometryAttributes, PrimitiveType) { - 'use strict'; + 'use strict'; + +describe('Scene/PrimitivePipeline', function() { it('can pack and unpack geometry', function() { var boxGeometry = BoxGeometry.createGeometry(BoxGeometry.fromDimensions({ @@ -63,3 +65,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/PrimitiveSpec.js b/Specs/Scene/PrimitiveSpec.js index b4a3106c8a47..98cf4a73737c 100644 --- a/Specs/Scene/PrimitiveSpec.js +++ b/Specs/Scene/PrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Primitive', 'Core/BoundingSphere', 'Core/BoxGeometry', @@ -66,7 +66,9 @@ defineSuite([ createFrameState, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Primitive', function() { var scene; var context; @@ -1328,3 +1330,4 @@ defineSuite([ expect(primitive.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/QuadtreePrimitiveSpec.js b/Specs/Scene/QuadtreePrimitiveSpec.js index 1e94d320cab8..29802fd5dd25 100644 --- a/Specs/Scene/QuadtreePrimitiveSpec.js +++ b/Specs/Scene/QuadtreePrimitiveSpec.js @@ -1,5 +1,7 @@ -defineSuite([ +define([ 'Scene/QuadtreePrimitive', + '../MockTerrainProvider', + '../TerrainTileProcessor', 'Core/Cartesian3', 'Core/Cartographic', 'Core/defined', @@ -18,11 +20,11 @@ defineSuite([ 'Scene/SceneMode', 'Specs/createScene', 'Specs/pollToPromise', - 'ThirdParty/when', - '../MockTerrainProvider', - '../TerrainTileProcessor' + 'ThirdParty/when' ], function( QuadtreePrimitive, + MockTerrainProvider, + TerrainTileProcessor, Cartesian3, Cartographic, defined, @@ -41,10 +43,10 @@ defineSuite([ SceneMode, createScene, pollToPromise, - when, - MockTerrainProvider, - TerrainTileProcessor) { - 'use strict'; + when) { + 'use strict'; + +describe('Scene/QuadtreePrimitive', function() { describe('selectTilesForRendering', function() { var scene; @@ -1029,3 +1031,4 @@ defineSuite([ camera.lookAt(cartesian, new Cartesian3(0.0, 0.0, distance)); } }); +}); diff --git a/Specs/Scene/QuadtreeTileSpec.js b/Specs/Scene/QuadtreeTileSpec.js index 6f01ff6d142a..ff98c69f4bdd 100644 --- a/Specs/Scene/QuadtreeTileSpec.js +++ b/Specs/Scene/QuadtreeTileSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/QuadtreeTile', 'Core/GeographicTilingScheme', 'Core/Math', @@ -10,7 +10,9 @@ defineSuite([ CesiumMath, Rectangle, WebMercatorTilingScheme) { - 'use strict'; + 'use strict'; + +describe('Scene/QuadtreeTile', function() { it('throws without a options', function() { expect(function() { @@ -367,3 +369,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js index 0e2ca8a872b6..0c93d2605a75 100644 --- a/Specs/Scene/SceneSpec.js +++ b/Specs/Scene/SceneSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Scene', 'Core/BoundingSphere', 'Core/Cartesian2', @@ -88,7 +88,9 @@ defineSuite([ createScene, pollToPromise, render) { - 'use strict'; + 'use strict'; + +describe('Scene/Scene', function() { var scene; var simpleShaderProgram; @@ -1769,3 +1771,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/SceneTransformsSpec.js b/Specs/Scene/SceneTransformsSpec.js index 1d85df72dda8..9c4f107b2197 100644 --- a/Specs/Scene/SceneTransformsSpec.js +++ b/Specs/Scene/SceneTransformsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/SceneTransforms', 'Core/Cartesian2', 'Core/Cartesian3', @@ -20,7 +20,9 @@ defineSuite([ Camera, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/SceneTransforms', function() { var scene; var defaultCamera; @@ -240,3 +242,4 @@ defineSuite([ scene.destroyForSpecs(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ScreenSpaceCameraControllerSpec.js b/Specs/Scene/ScreenSpaceCameraControllerSpec.js index a0521bcabdea..d61a4eb1d6b1 100644 --- a/Specs/Scene/ScreenSpaceCameraControllerSpec.js +++ b/Specs/Scene/ScreenSpaceCameraControllerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ScreenSpaceCameraController', 'Core/Cartesian2', 'Core/Cartesian3', @@ -42,7 +42,9 @@ defineSuite([ createCamera, createCanvas, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Scene/ScreenSpaceCameraController', function() { var usePointerEvents; var scene; @@ -1210,3 +1212,4 @@ defineSuite([ expect(controller.isDestroyed()).toEqual(true); }); }); +}); diff --git a/Specs/Scene/ShadowMapSpec.js b/Specs/Scene/ShadowMapSpec.js index ae6d8e266d0e..3ed025d5561b 100644 --- a/Specs/Scene/ShadowMapSpec.js +++ b/Specs/Scene/ShadowMapSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ShadowMap', 'Core/BoundingSphere', 'Core/BoxGeometry', @@ -62,7 +62,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/ShadowMap', function() { var scene; var sunShadowMap; @@ -1198,3 +1200,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ShadowVolumeAppearanceSpec.js b/Specs/Scene/ShadowVolumeAppearanceSpec.js index 8f08ce10f26f..0b78c67a398f 100644 --- a/Specs/Scene/ShadowVolumeAppearanceSpec.js +++ b/Specs/Scene/ShadowVolumeAppearanceSpec.js @@ -1,34 +1,36 @@ -defineSuite([ - 'Scene/ShadowVolumeAppearance', - 'Core/Cartesian3', - 'Core/Cartographic', - 'Core/Math', - 'Core/ComponentDatatype', - 'Core/Ellipsoid', - 'Core/EncodedCartesian3', - 'Core/Matrix4', - 'Core/WebMercatorProjection', - 'Core/Rectangle', - 'Core/Transforms', - 'Scene/Material', - 'Scene/MaterialAppearance', - 'Scene/PerInstanceColorAppearance' -], function( - ShadowVolumeAppearance, - Cartesian3, - Cartographic, - CesiumMath, - ComponentDatatype, - Ellipsoid, - EncodedCartesian3, - Matrix4, - WebMercatorProjection, - Rectangle, - Transforms, - Material, - MaterialAppearance, - PerInstanceColorAppearance) { -'use strict'; +define([ + 'Scene/ShadowVolumeAppearance', + 'Core/Cartesian3', + 'Core/Cartographic', + 'Core/ComponentDatatype', + 'Core/Ellipsoid', + 'Core/EncodedCartesian3', + 'Core/Math', + 'Core/Matrix4', + 'Core/Rectangle', + 'Core/Transforms', + 'Core/WebMercatorProjection', + 'Scene/Material', + 'Scene/MaterialAppearance', + 'Scene/PerInstanceColorAppearance' + ], function( + ShadowVolumeAppearance, + Cartesian3, + Cartographic, + ComponentDatatype, + Ellipsoid, + EncodedCartesian3, + CesiumMath, + Matrix4, + Rectangle, + Transforms, + WebMercatorProjection, + Material, + MaterialAppearance, + PerInstanceColorAppearance) { + 'use strict'; + +describe('Scene/ShadowVolumeAppearance', function() { // using ShadowVolumeAppearanceVS directly fails on Travis with the --release test var testVs = @@ -441,3 +443,4 @@ defineSuite([ expect(defines.length).toEqual(3); }); }); +}); diff --git a/Specs/Scene/SingleTileImageryProviderSpec.js b/Specs/Scene/SingleTileImageryProviderSpec.js index e4e78e226a0e..b4639e543455 100644 --- a/Specs/Scene/SingleTileImageryProviderSpec.js +++ b/Specs/Scene/SingleTileImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/SingleTileImageryProvider', 'Core/DefaultProxy', 'Core/Ellipsoid', @@ -24,7 +24,9 @@ defineSuite([ ImageryState, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/SingleTileImageryProvider', function() { afterEach(function() { Resource._Implementations.createImage = Resource._DefaultImplementations.createImage; @@ -223,3 +225,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/SkyAtmosphereSpec.js b/Specs/Scene/SkyAtmosphereSpec.js index e5d59a3da300..dd964f8de66b 100644 --- a/Specs/Scene/SkyAtmosphereSpec.js +++ b/Specs/Scene/SkyAtmosphereSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/SkyAtmosphere', 'Core/Cartesian3', 'Core/Ellipsoid', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/SkyAtmosphere', function() { var scene; @@ -159,3 +161,4 @@ defineSuite([ expect(s.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/SkyBoxSpec.js b/Specs/Scene/SkyBoxSpec.js index 9431ae62ff44..789d7e7e8cc3 100644 --- a/Specs/Scene/SkyBoxSpec.js +++ b/Specs/Scene/SkyBoxSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/SkyBox', 'Core/Resource', 'Scene/SceneMode', @@ -8,7 +8,9 @@ defineSuite([ Resource, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/SkyBox', function() { var scene; var skyBox; @@ -359,3 +361,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/SphereEmitterSpec.js b/Specs/Scene/SphereEmitterSpec.js index 9da5d1d938c0..17a444c2b1ad 100644 --- a/Specs/Scene/SphereEmitterSpec.js +++ b/Specs/Scene/SphereEmitterSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/SphereEmitter', 'Core/Cartesian3', 'Scene/Particle' @@ -6,7 +6,9 @@ defineSuite([ SphereEmitter, Cartesian3, Particle) { - 'use strict'; + 'use strict'; + +describe('Scene/SphereEmitter', function() { var emitter; @@ -59,3 +61,4 @@ defineSuite([ } }); }); +}); diff --git a/Specs/Scene/StyleExpressionSpec.js b/Specs/Scene/StyleExpressionSpec.js index b046ffd8e2c3..fb312926ce24 100644 --- a/Specs/Scene/StyleExpressionSpec.js +++ b/Specs/Scene/StyleExpressionSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Scene/StyleExpression' ], function( StyleExpression) { - 'use strict'; + 'use strict'; + +describe('Scene/StyleExpression', function() { function MockFeature() { } @@ -24,3 +26,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/SunSpec.js b/Specs/Scene/SunSpec.js index 0a3f7d0e148b..065187d326f1 100644 --- a/Specs/Scene/SunSpec.js +++ b/Specs/Scene/SunSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Sun', 'Core/BoundingSphere', 'Core/Color', @@ -12,7 +12,9 @@ defineSuite([ CesiumMath, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Sun', function() { var scene; var backgroundColor = [255, 0, 0, 255]; @@ -115,3 +117,4 @@ defineSuite([ expect(sun.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/TerrainFillMeshSpec.js b/Specs/Scene/TerrainFillMeshSpec.js index abd987c9efce..1265aa2e9f84 100644 --- a/Specs/Scene/TerrainFillMeshSpec.js +++ b/Specs/Scene/TerrainFillMeshSpec.js @@ -1,5 +1,7 @@ -defineSuite([ +define([ 'Scene/TerrainFillMesh', + '../MockTerrainProvider', + '../TerrainTileProcessor', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/GeographicProjection', @@ -12,11 +14,11 @@ defineSuite([ 'Scene/QuadtreePrimitive', 'Scene/SceneMode', 'Scene/TileBoundingRegion', - 'Scene/TileSelectionResult', - '../MockTerrainProvider', - '../TerrainTileProcessor' + 'Scene/TileSelectionResult' ], function( TerrainFillMesh, + MockTerrainProvider, + TerrainTileProcessor, Cartesian2, Cartesian3, GeographicProjection, @@ -29,10 +31,10 @@ defineSuite([ QuadtreePrimitive, SceneMode, TileBoundingRegion, - TileSelectionResult, - MockTerrainProvider, - TerrainTileProcessor) { - 'use strict'; + TileSelectionResult) { + 'use strict'; + +describe('Scene/TerrainFillMesh', function() { var processor; var scene; @@ -964,3 +966,4 @@ defineSuite([ expect(fill.mesh.vertices.length).toBe(count * fill.mesh.encoding.getStride()); } }); +}); diff --git a/Specs/Scene/TextureAtlasSpec.js b/Specs/Scene/TextureAtlasSpec.js index b22948eb0096..a54e698cc3ff 100644 --- a/Specs/Scene/TextureAtlasSpec.js +++ b/Specs/Scene/TextureAtlasSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TextureAtlas', 'Core/BoundingRectangle', 'Core/Cartesian2', @@ -18,7 +18,9 @@ defineSuite([ Resource, createScene, when) { - 'use strict'; + 'use strict'; + +describe('Scene/TextureAtlas', function() { var scene; var atlas; @@ -908,3 +910,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/TileBoundingRegionSpec.js b/Specs/Scene/TileBoundingRegionSpec.js index 0e15828e2010..6670e18a50eb 100644 --- a/Specs/Scene/TileBoundingRegionSpec.js +++ b/Specs/Scene/TileBoundingRegionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TileBoundingRegion', 'Core/Cartesian2', 'Core/Cartesian3', @@ -26,7 +26,9 @@ defineSuite([ Rectangle, SceneMode, createFrameState) { - 'use strict'; + 'use strict'; + +describe('Scene/TileBoundingRegion', function() { var boundingVolumeRegion = [0.0, 0.0, 1.0, 1.0, 0, 1]; var regionBox = boundingVolumeRegion.slice(0, 4); @@ -219,3 +221,4 @@ defineSuite([ expect(tileBoundingRegion.intersectPlane(plane)).toEqual(Intersect.INTERSECTING); }); }); +}); diff --git a/Specs/Scene/TileBoundingSphereSpec.js b/Specs/Scene/TileBoundingSphereSpec.js index 6b8adb213096..082af4faaf36 100644 --- a/Specs/Scene/TileBoundingSphereSpec.js +++ b/Specs/Scene/TileBoundingSphereSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TileBoundingSphere', 'Core/Cartesian3', 'Core/Color', @@ -14,7 +14,9 @@ defineSuite([ CesiumMath, Plane, createFrameState) { - 'use strict'; + 'use strict'; + +describe('Scene/TileBoundingSphere', function() { var tileBoundingSphere = new TileBoundingSphere(new Cartesian3(0.0, 0.0, 0.0), 1.0); var frameState = createFrameState(); @@ -70,3 +72,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/TileBoundingVolumeSpec.js b/Specs/Scene/TileBoundingVolumeSpec.js index 9cfd0378f379..e81e09543e28 100644 --- a/Specs/Scene/TileBoundingVolumeSpec.js +++ b/Specs/Scene/TileBoundingVolumeSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Scene/TileBoundingVolume' ], function( TileBoundingVolume) { - 'use strict'; + 'use strict'; + +describe('Scene/TileBoundingVolume', function() { it('throws', function() { var boundingVolume = new TileBoundingVolume(); @@ -17,3 +19,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/TileCoordinatesImageryProviderSpec.js b/Specs/Scene/TileCoordinatesImageryProviderSpec.js index ea26e3f42780..c62e88e0042a 100644 --- a/Specs/Scene/TileCoordinatesImageryProviderSpec.js +++ b/Specs/Scene/TileCoordinatesImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TileCoordinatesImageryProvider', 'Core/Ellipsoid', 'Core/GeographicTilingScheme', @@ -14,7 +14,9 @@ defineSuite([ ImageryProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/TileCoordinatesImageryProvider', function() { it('conforms to ImageryProvider interface', function() { expect(TileCoordinatesImageryProvider).toConformToInterface(ImageryProvider); @@ -98,3 +100,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/TileImagerySpec.js b/Specs/Scene/TileImagerySpec.js index 5ef590a1db95..50a7b6eeee78 100644 --- a/Specs/Scene/TileImagerySpec.js +++ b/Specs/Scene/TileImagerySpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Scene/TileImagery', 'Scene/ImageryState' ], function( TileImagery, ImageryState) { - 'use strict'; + 'use strict'; + +describe('Scene/TileImagery', function() { it('does not use ancestor ready imagery that needs to be reprojected', function() { var imageryLayer = { @@ -63,3 +65,4 @@ defineSuite([ expect(parentImagery.processStateMachineCalls).toBe(1); }); }); +}); diff --git a/Specs/Scene/TileOrientedBoundingBoxSpec.js b/Specs/Scene/TileOrientedBoundingBoxSpec.js index b405b5f66c54..cfb2a8c44618 100644 --- a/Specs/Scene/TileOrientedBoundingBoxSpec.js +++ b/Specs/Scene/TileOrientedBoundingBoxSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TileOrientedBoundingBox', 'Core/Cartesian3', 'Core/Color', @@ -16,7 +16,9 @@ defineSuite([ Matrix3, Plane, createFrameState) { - 'use strict'; + 'use strict'; + +describe('Scene/TileOrientedBoundingBox', function() { var center = new Cartesian3(0.0, 0.0, 0.0); var halfAxes = Matrix3.fromScale(new Cartesian3(0.5, 0.5, 0.5), new Matrix3()); @@ -106,3 +108,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/TileReplacementQueueSpec.js b/Specs/Scene/TileReplacementQueueSpec.js index 7e19424caaab..42def0f369d7 100644 --- a/Specs/Scene/TileReplacementQueueSpec.js +++ b/Specs/Scene/TileReplacementQueueSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TileReplacementQueue', 'Core/defined', 'Core/GeographicTilingScheme', @@ -10,7 +10,9 @@ defineSuite([ GeographicTilingScheme, QuadtreeTile, QuadtreeTileLoadState) { - 'use strict'; + 'use strict'; + +describe('Scene/TileReplacementQueue', function() { function Tile(num, loadedState, upsampledState) { this._num = num; @@ -174,3 +176,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/Tileset3DTileContentSpec.js b/Specs/Scene/Tileset3DTileContentSpec.js index 7ed264900d93..38be6cf00678 100644 --- a/Specs/Scene/Tileset3DTileContentSpec.js +++ b/Specs/Scene/Tileset3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/Cartesian3', 'Core/HeadingPitchRange', 'Specs/Cesium3DTilesTester', @@ -8,7 +8,9 @@ defineSuite([ HeadingPitchRange, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Core/Cartesian3', function() { var scene; var centerLongitude = -1.31968; @@ -62,3 +64,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/TimeDynamicImagerySpec.js b/Specs/Scene/TimeDynamicImagerySpec.js index e64361e5a986..067cdb47c16f 100644 --- a/Specs/Scene/TimeDynamicImagerySpec.js +++ b/Specs/Scene/TimeDynamicImagerySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TimeDynamicImagery', 'Core/Clock', 'Core/ClockStep', @@ -18,7 +18,9 @@ defineSuite([ RequestType, TimeIntervalCollection, when) { - 'use strict'; + 'use strict'; + +describe('Scene/TimeDynamicImagery', function() { var clock = new Clock({ clockStep : ClockStep.TICK_DEPENDENT, @@ -233,3 +235,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/TimeDynamicPointCloudSpec.js b/Specs/Scene/TimeDynamicPointCloudSpec.js index a2526529db31..430b12dba6b9 100644 --- a/Specs/Scene/TimeDynamicPointCloudSpec.js +++ b/Specs/Scene/TimeDynamicPointCloudSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TimeDynamicPointCloud', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -52,7 +52,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/TimeDynamicPointCloud', function() { var scene; @@ -789,3 +791,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/TweenCollectionSpec.js b/Specs/Scene/TweenCollectionSpec.js index f71172c18399..ef299bc8f141 100644 --- a/Specs/Scene/TweenCollectionSpec.js +++ b/Specs/Scene/TweenCollectionSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/TweenCollection', 'Core/Color', 'Core/EasingFunction' @@ -6,7 +6,9 @@ defineSuite([ TweenCollection, Color, EasingFunction) { - 'use strict'; + 'use strict'; + +describe('Scene/TweenCollection', function() { it('add() adds a tween', function() { var startObject = { @@ -413,3 +415,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/UrlTemplateImageryProviderSpec.js b/Specs/Scene/UrlTemplateImageryProviderSpec.js index a4f635b55de7..c4a467ad10e1 100644 --- a/Specs/Scene/UrlTemplateImageryProviderSpec.js +++ b/Specs/Scene/UrlTemplateImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/UrlTemplateImageryProvider', 'Core/DefaultProxy', 'Core/Ellipsoid', @@ -34,7 +34,9 @@ defineSuite([ ImageryState, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/UrlTemplateImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -807,3 +809,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/Vector3DTileContentSpec.js b/Specs/Scene/Vector3DTileContentSpec.js index 889b40d6ae70..2c16c070e1e8 100644 --- a/Specs/Scene/Vector3DTileContentSpec.js +++ b/Specs/Scene/Vector3DTileContentSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Vector3DTileContent', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -50,7 +50,9 @@ defineSuite([ StencilConstants, Cesium3DTilesTester, createScene) { - 'use strict'; + 'use strict'; + +describe('Scene/Vector3DTileContent', function() { var tilesetRectangle = Rectangle.fromDegrees(-0.01, -0.01, 0.01, 0.01); var combinedRectangle = Rectangle.fromDegrees(-0.02, -0.01, 0.02, 0.01); @@ -701,3 +703,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Vector3DTileGeometrySpec.js b/Specs/Scene/Vector3DTileGeometrySpec.js index d28b4e18fbf3..8bcece598f42 100644 --- a/Specs/Scene/Vector3DTileGeometrySpec.js +++ b/Specs/Scene/Vector3DTileGeometrySpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Vector3DTileGeometry', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -48,7 +48,9 @@ defineSuite([ createContext, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Vector3DTileGeometry', function() { createGeometrySpecs({}); var c = createContext({ requestWebgl2 : true }); @@ -793,3 +795,4 @@ defineSuite([ } }, 'WebGL'); +}); diff --git a/Specs/Scene/Vector3DTilePointsSpec.js b/Specs/Scene/Vector3DTilePointsSpec.js index 2b57d0975222..0a79a6af0ac4 100644 --- a/Specs/Scene/Vector3DTilePointsSpec.js +++ b/Specs/Scene/Vector3DTilePointsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Vector3DTilePoints', 'Core/Cartesian2', 'Core/Cartesian3', @@ -40,7 +40,9 @@ defineSuite([ VerticalOrigin, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Vector3DTilePoints', function() { var scene; var rectangle; @@ -450,3 +452,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/Vector3DTilePolygonsSpec.js b/Specs/Scene/Vector3DTilePolygonsSpec.js index 767e8642ae82..bfac3424c5cf 100644 --- a/Specs/Scene/Vector3DTilePolygonsSpec.js +++ b/Specs/Scene/Vector3DTilePolygonsSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Vector3DTilePolygons', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -50,7 +50,9 @@ defineSuite([ createContext, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Vector3DTilePolygons', function() { createPolygonSpecs({}); var c = createContext({ requestWebgl2 : true }); @@ -632,3 +634,4 @@ defineSuite([ } }, 'WebGL'); +}); diff --git a/Specs/Scene/Vector3DTilePolylinesSpec.js b/Specs/Scene/Vector3DTilePolylinesSpec.js index eea85b35e1d2..1659a78a03f4 100644 --- a/Specs/Scene/Vector3DTilePolylinesSpec.js +++ b/Specs/Scene/Vector3DTilePolylinesSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/Vector3DTilePolylines', 'Core/BoundingSphere', 'Core/Cartesian3', @@ -26,7 +26,9 @@ defineSuite([ ColorBlendMode, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/Vector3DTilePolylines', function() { var scene; var rectangle; @@ -244,3 +246,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Scene/ViewportQuadSpec.js b/Specs/Scene/ViewportQuadSpec.js index 960fdba65a4c..89307398a425 100644 --- a/Specs/Scene/ViewportQuadSpec.js +++ b/Specs/Scene/ViewportQuadSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/ViewportQuad', 'Core/BoundingRectangle', 'Core/Color', @@ -16,7 +16,9 @@ defineSuite([ Material, createScene, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/ViewportQuad', function() { var scene; var viewportQuad; @@ -117,3 +119,4 @@ defineSuite([ expect(vq.isDestroyed()).toEqual(true); }); }, 'WebGL'); +}); diff --git a/Specs/Scene/WebMapServiceImageryProviderSpec.js b/Specs/Scene/WebMapServiceImageryProviderSpec.js index 11d77419f8e2..ca25825a2735 100644 --- a/Specs/Scene/WebMapServiceImageryProviderSpec.js +++ b/Specs/Scene/WebMapServiceImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/WebMapServiceImageryProvider', 'Core/Cartographic', 'Core/Clock', @@ -50,7 +50,9 @@ defineSuite([ ImageryState, pollToPromise, Uri) { - 'use strict'; + 'use strict'; + +describe('Scene/WebMapServiceImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -1410,3 +1412,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/WebMapTileServiceImageryProviderSpec.js b/Specs/Scene/WebMapTileServiceImageryProviderSpec.js index 29d3ee1cdd53..2e2eb911397b 100644 --- a/Specs/Scene/WebMapTileServiceImageryProviderSpec.js +++ b/Specs/Scene/WebMapTileServiceImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/WebMapTileServiceImageryProvider', 'Core/Clock', 'Core/ClockStep', @@ -42,7 +42,9 @@ defineSuite([ ImageryState, pollToPromise, Uri) { - 'use strict'; + 'use strict'; + +describe('Scene/WebMapTileServiceImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -684,3 +686,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/computeFlyToLocationForRectangleSpec.js b/Specs/Scene/computeFlyToLocationForRectangleSpec.js index 8dcc633eee2d..3bbce5f34f8c 100644 --- a/Specs/Scene/computeFlyToLocationForRectangleSpec.js +++ b/Specs/Scene/computeFlyToLocationForRectangleSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/computeFlyToLocationForRectangle', 'Core/EllipsoidTerrainProvider', 'Core/Rectangle', @@ -14,7 +14,9 @@ defineSuite([ SceneMode, createScene, when) { - 'use strict'; + 'use strict'; + +describe('Scene/computeFlyToLocationForRectangle', function() { var scene; @@ -147,3 +149,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Scene/createOpenStreetMapImageryProviderSpec.js b/Specs/Scene/createOpenStreetMapImageryProviderSpec.js index 7d0648fdaf4b..eb393296c072 100644 --- a/Specs/Scene/createOpenStreetMapImageryProviderSpec.js +++ b/Specs/Scene/createOpenStreetMapImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/createOpenStreetMapImageryProvider', 'Core/DefaultProxy', 'Core/Math', @@ -24,7 +24,9 @@ defineSuite([ ImageryState, UrlTemplateImageryProvider, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Scene/createOpenStreetMapImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -274,3 +276,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js b/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js index 90fe8e88c5b9..3ff6b7741e08 100644 --- a/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js +++ b/Specs/Scene/createTangentSpaceDebugPrimitiveSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/createTangentSpaceDebugPrimitive', 'Core/Cartesian3', 'Core/EllipsoidGeometry', @@ -12,7 +12,9 @@ defineSuite([ Matrix4, PrimitiveType, VertexFormat) { - 'use strict'; + 'use strict'; + +describe('Scene/createTangentSpaceDebugPrimitive', function() { it('computes all attributes', function() { var geometry = new EllipsoidGeometry({ @@ -57,3 +59,4 @@ defineSuite([ }); }); +}); diff --git a/Specs/Scene/createTileMapServiceImageryProviderSpec.js b/Specs/Scene/createTileMapServiceImageryProviderSpec.js index f7b59938de4d..ad25ca01bccc 100644 --- a/Specs/Scene/createTileMapServiceImageryProviderSpec.js +++ b/Specs/Scene/createTileMapServiceImageryProviderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Scene/createTileMapServiceImageryProvider', 'Core/Cartesian2', 'Core/Cartographic', @@ -38,7 +38,9 @@ defineSuite([ UrlTemplateImageryProvider, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Scene/createTileMapServiceImageryProvider', function() { beforeEach(function() { RequestScheduler.clearForSpecs(); @@ -766,3 +768,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/ThirdParty/knockoutSpec.js b/Specs/ThirdParty/knockoutSpec.js index 52f7c16b7a25..a9a308df1325 100644 --- a/Specs/ThirdParty/knockoutSpec.js +++ b/Specs/ThirdParty/knockoutSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'ThirdParty/knockout' ], function( knockout) { - 'use strict'; + 'use strict'; + +describe('ThirdParty/knockout', function() { it('can track all properties', function() { var obj = { @@ -22,3 +24,4 @@ defineSuite([ expect(knockout.getObservable(obj, 'three')).not.toBeNull(); }); }); +}); diff --git a/Specs/ThirdParty/whenSpec.js b/Specs/ThirdParty/whenSpec.js index afdf7f3fcbd2..f85fd626d3f2 100644 --- a/Specs/ThirdParty/whenSpec.js +++ b/Specs/ThirdParty/whenSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'ThirdParty/when' ], function( when) { - 'use strict'; + 'use strict'; + +describe('ThirdParty/when', function() { // These tests are from my original attempt to write my own promise implementation. // When I switched to cujojs/when, I figured I may as well leave these here since @@ -293,3 +295,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Widgets/Animation/AnimationSpec.js b/Specs/Widgets/Animation/AnimationSpec.js index 416137b9bf1b..8358f60b2507 100644 --- a/Specs/Widgets/Animation/AnimationSpec.js +++ b/Specs/Widgets/Animation/AnimationSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Animation/Animation', 'Core/defined', 'Specs/pollToPromise', @@ -10,7 +10,9 @@ defineSuite([ pollToPromise, AnimationViewModel, ClockViewModel) { - 'use strict'; + 'use strict'; + +describe('Widgets/Animation/Animation', function() { var container; var animation; @@ -53,3 +55,4 @@ defineSuite([ animation = new Animation(container, animationViewModel); }); }); +}); diff --git a/Specs/Widgets/Animation/AnimationViewModelSpec.js b/Specs/Widgets/Animation/AnimationViewModelSpec.js index b94964ebadfa..e7fafd48dff1 100644 --- a/Specs/Widgets/Animation/AnimationViewModelSpec.js +++ b/Specs/Widgets/Animation/AnimationViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Animation/AnimationViewModel', 'Core/ClockRange', 'Core/ClockStep', @@ -10,7 +10,9 @@ defineSuite([ ClockStep, JulianDate, ClockViewModel) { - 'use strict'; + 'use strict'; + +describe('Widgets/Animation/AnimationViewModel', function() { var clockViewModel; beforeEach(function() { @@ -624,3 +626,4 @@ defineSuite([ expect(animationViewModel.getShuttleRingTicks()).toEqual([0.0, 2.0, 4.0, 8.0]); }); }); +}); diff --git a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js index 1f16c6fdf518..a91acf39615b 100644 --- a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js +++ b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/BaseLayerPicker/BaseLayerPicker', 'Core/EllipsoidTerrainProvider', 'Core/FeatureDetection', @@ -10,7 +10,9 @@ defineSuite([ FeatureDetection, ImageryLayerCollection, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Widgets/BaseLayerPicker/BaseLayerPicker', function() { function MockGlobe(){ this.imageryLayers = new ImageryLayerCollection(); @@ -87,3 +89,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js index 86a02e3bd125..3f226bb33ab1 100644 --- a/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js +++ b/Specs/Widgets/BaseLayerPicker/BaseLayerPickerViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/BaseLayerPicker/BaseLayerPickerViewModel', 'Core/EllipsoidTerrainProvider', 'Scene/ImageryLayerCollection', @@ -8,7 +8,9 @@ defineSuite([ EllipsoidTerrainProvider, ImageryLayerCollection, ProviderViewModel) { - 'use strict'; + 'use strict'; + +describe('Widgets/BaseLayerPicker/BaseLayerPickerViewModel', function() { function MockGlobe() { this.imageryLayers = new ImageryLayerCollection(); @@ -283,3 +285,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js b/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js index a07308607366..1ada116893b7 100644 --- a/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js +++ b/Specs/Widgets/BaseLayerPicker/ProviderViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/BaseLayerPicker/ProviderViewModel', 'ThirdParty/knockout', 'Widgets/createCommand' @@ -6,7 +6,9 @@ defineSuite([ ProviderViewModel, knockout, createCommand) { - 'use strict'; + 'use strict'; + +describe('Widgets/BaseLayerPicker/ProviderViewModel', function() { var spyCreationFunction; beforeEach(function() { @@ -151,3 +153,4 @@ defineSuite([ }); }); }); +}); diff --git a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js index cea3f6a047ed..4a58ace08124 100644 --- a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js +++ b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector', 'Core/Ellipsoid', 'Scene/Cesium3DTileset', @@ -10,7 +10,9 @@ defineSuite([ Cesium3DTileset, Globe, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector', function() { // Parent tile with content and four child tiles with content var tilesetUrl = './Data/Cesium3DTiles/Tilesets/Tileset/tileset.json'; @@ -82,3 +84,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js index 7a94209ff1d6..b39369a642bf 100644 --- a/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js +++ b/Specs/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel', 'Scene/Cesium3DTileset', 'Scene/Cesium3DTileStyle', @@ -12,7 +12,9 @@ defineSuite([ Globe, createScene, when) { - 'use strict'; + 'use strict'; + +describe('Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel', function() { // Parent tile with content and four child tiles with content var tilesetUrl = './Data/Cesium3DTiles/Tilesets/Tileset/tileset.json'; @@ -314,3 +316,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js b/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js index b8094ea7aa5a..64c24b9b77bd 100644 --- a/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js +++ b/Specs/Widgets/CesiumInspector/CesiumInspectorSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/CesiumInspector/CesiumInspector', 'Core/Ellipsoid', 'Scene/Globe', @@ -8,7 +8,9 @@ defineSuite([ Ellipsoid, Globe, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/CesiumInspector/CesiumInspector', function() { var scene; beforeAll(function() { @@ -55,3 +57,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js b/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js index d2f83616c1e5..5af6e9c9f914 100644 --- a/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js +++ b/Specs/Widgets/CesiumInspector/CesiumInspectorViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/CesiumInspector/CesiumInspectorViewModel', 'Core/defined', 'Core/GeometryInstance', @@ -26,7 +26,9 @@ defineSuite([ Primitive, QuadtreeTile, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/CesiumInspector/CesiumInspectorViewModel', function() { var scene; var performanceContainer; @@ -242,3 +244,4 @@ defineSuite([ }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js index 84ac1b1b086d..eea514ebc193 100644 --- a/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js +++ b/Specs/Widgets/CesiumWidget/CesiumWidgetSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/CesiumWidget/CesiumWidget', 'Core/Clock', 'Core/defaultValue', @@ -30,7 +30,9 @@ defineSuite([ DomEventSimulator, getWebGLStub, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Widgets/CesiumWidget/CesiumWidget', function() { var container; var widget; @@ -365,3 +367,4 @@ defineSuite([ }); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/ClockViewModelSpec.js b/Specs/Widgets/ClockViewModelSpec.js index 1ddf4541d1be..563768942b76 100644 --- a/Specs/Widgets/ClockViewModelSpec.js +++ b/Specs/Widgets/ClockViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/ClockViewModel', 'Core/Clock', 'Core/ClockRange', @@ -10,7 +10,9 @@ defineSuite([ ClockRange, ClockStep, JulianDate) { - 'use strict'; + 'use strict'; + +describe('Widgets/ClockViewModel', function() { it('default constructor creates a clock', function() { var clockViewModel = new ClockViewModel(); @@ -87,3 +89,4 @@ defineSuite([ expect(clockViewModel.shouldAnimate).toEqual(clock.shouldAnimate); }); }); +}); diff --git a/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js b/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js index fa5f68ad35c4..be382efaa94a 100644 --- a/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js +++ b/Specs/Widgets/FullscreenButton/FullscreenButtonSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Widgets/FullscreenButton/FullscreenButton' ], function( FullscreenButton) { - 'use strict'; + 'use strict'; + +describe('Widgets/FullscreenButton/FullscreenButton', function() { it('constructor sets default values', function() { var fullscreenButton = new FullscreenButton(document.body); @@ -43,3 +45,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js b/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js index a46a47731fef..0f4b2f1fdcfd 100644 --- a/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js +++ b/Specs/Widgets/FullscreenButton/FullscreenButtonViewModelSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/FullscreenButton/FullscreenButtonViewModel', 'Core/Fullscreen' ], function( FullscreenButtonViewModel, Fullscreen) { - 'use strict'; + 'use strict'; + +describe('Widgets/FullscreenButton/FullscreenButtonViewModel', function() { it('constructor sets default values', function() { var viewModel = new FullscreenButtonViewModel(); @@ -54,3 +56,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/Geocoder/GeocoderSpec.js b/Specs/Widgets/Geocoder/GeocoderSpec.js index d5eb07e6828d..02a518c5a2bd 100644 --- a/Specs/Widgets/Geocoder/GeocoderSpec.js +++ b/Specs/Widgets/Geocoder/GeocoderSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Geocoder/Geocoder', 'Core/Cartesian3', 'Specs/createScene', @@ -8,7 +8,9 @@ defineSuite([ Cartesian3, createScene, when) { - 'use strict'; + 'use strict'; + +describe('Widgets/Geocoder/Geocoder', function() { var scene; @@ -82,3 +84,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js b/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js index 17a35fc6ce18..3ec9ec18f3d3 100644 --- a/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js +++ b/Specs/Widgets/Geocoder/GeocoderViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Geocoder/GeocoderViewModel', 'Core/Cartesian3', 'Core/Rectangle', @@ -12,7 +12,9 @@ defineSuite([ createScene, pollToPromise, when) { - 'use strict'; + 'use strict'; + +describe('Widgets/Geocoder/GeocoderViewModel', function() { var scene; var mockDestination = new Cartesian3(1.0, 2.0, 3.0); @@ -256,3 +258,4 @@ defineSuite([ expect(viewModel._selectedSuggestion).toBeUndefined(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/HomeButton/HomeButtonSpec.js b/Specs/Widgets/HomeButton/HomeButtonSpec.js index 0571b157b76a..8f3e5208668f 100644 --- a/Specs/Widgets/HomeButton/HomeButtonSpec.js +++ b/Specs/Widgets/HomeButton/HomeButtonSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/HomeButton/HomeButton', 'Specs/createScene' ], function( HomeButton, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/HomeButton/HomeButton', function() { var scene; beforeAll(function() { @@ -53,3 +55,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js b/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js index b5dcb75ff524..ec8310b0d9a3 100644 --- a/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js +++ b/Specs/Widgets/HomeButton/HomeButtonViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/HomeButton/HomeButtonViewModel', 'Core/Ellipsoid', 'Scene/Globe', @@ -8,7 +8,9 @@ defineSuite([ Ellipsoid, Globe, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/HomeButton/HomeButtonViewModel', function() { var scene; var ellipsoid = Ellipsoid.WGS84; @@ -63,3 +65,4 @@ defineSuite([ viewModel.command(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/InfoBox/InfoBoxSpec.js b/Specs/Widgets/InfoBox/InfoBoxSpec.js index b70943123f89..2d5aa7b1b3a7 100644 --- a/Specs/Widgets/InfoBox/InfoBoxSpec.js +++ b/Specs/Widgets/InfoBox/InfoBoxSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/InfoBox/InfoBox', 'Core/defined', 'Specs/pollToPromise' @@ -6,7 +6,9 @@ defineSuite([ InfoBox, defined, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Widgets/InfoBox/InfoBox', function() { var testContainer; var infoBox; @@ -75,3 +77,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js b/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js index be27c3a2c579..ddb892593916 100644 --- a/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js +++ b/Specs/Widgets/InfoBox/InfoBoxViewModelSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Widgets/InfoBox/InfoBoxViewModel' ], function( InfoBoxViewModel) { - 'use strict'; + 'use strict'; + +describe('Widgets/InfoBox/InfoBoxViewModel', function() { it('constructor sets expected values', function() { var viewModel = new InfoBoxViewModel(); @@ -49,3 +51,4 @@ defineSuite([ expect(viewModel.cameraIconPath).toBe(disableTrackingPath); }); }); +}); diff --git a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js index 186b7abf8ef9..06baaa621e88 100644 --- a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js +++ b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/NavigationHelpButton/NavigationHelpButton', 'Core/FeatureDetection', 'Specs/DomEventSimulator' @@ -6,7 +6,9 @@ defineSuite([ NavigationHelpButton, FeatureDetection, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Widgets/NavigationHelpButton/NavigationHelpButton', function() { it('can create and destroy', function() { var container = document.createElement('span'); @@ -102,3 +104,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js index a39b1f8d6acb..eac1d3a519d2 100644 --- a/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js +++ b/Specs/Widgets/NavigationHelpButton/NavigationHelpButtonViewModelSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'Widgets/NavigationHelpButton/NavigationHelpButtonViewModel' ], function( NavigationHelpButtonViewModel) { - 'use strict'; + 'use strict'; + +describe('Widgets/NavigationHelpButton/NavigationHelpButtonViewModel', function() { it('Can construct', function() { var viewModel = new NavigationHelpButtonViewModel(); @@ -20,3 +22,4 @@ defineSuite([ expect(viewModel.showInstructions).toBe(false); }); }); +}); diff --git a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js index 925f06f4e95a..b90645949d4d 100644 --- a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js +++ b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/PerformanceWatchdog/PerformanceWatchdog', 'Specs/createScene' ], function( PerformanceWatchdog, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/PerformanceWatchdog/PerformanceWatchdog', function() { var scene; beforeAll(function() { @@ -72,3 +74,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js index 4421642da294..25140d10005c 100644 --- a/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js +++ b/Specs/Widgets/PerformanceWatchdog/PerformanceWatchdogViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel', 'Core/defined', 'Core/getTimestamp', @@ -10,7 +10,9 @@ defineSuite([ getTimestamp, FrameRateMonitor, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/PerformanceWatchdog/PerformanceWatchdogViewModel', function() { var scene; beforeAll(function() { @@ -205,3 +207,4 @@ defineSuite([ expect(viewModel.showingLowFrameRateMessage).toBe(false); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js b/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js index 49d20f94503c..389c0d2ae26d 100644 --- a/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js +++ b/Specs/Widgets/ProjectionPicker/ProjectionPickerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/ProjectionPicker/ProjectionPicker', 'Core/FeatureDetection', 'Specs/createScene', @@ -8,7 +8,9 @@ defineSuite([ FeatureDetection, createScene, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Widgets/ProjectionPicker/ProjectionPicker', function() { var scene; @@ -125,3 +127,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js b/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js index 1bbb0cb1998e..716cb105a869 100644 --- a/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js +++ b/Specs/Widgets/ProjectionPicker/ProjectionPickerViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/ProjectionPicker/ProjectionPickerViewModel', 'Core/OrthographicFrustum', 'Core/PerspectiveFrustum', @@ -10,7 +10,9 @@ defineSuite([ PerspectiveFrustum, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/ProjectionPicker/ProjectionPickerViewModel', function() { var scene; @@ -95,3 +97,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js b/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js index 2620f16043da..9d008b8839d8 100644 --- a/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js +++ b/Specs/Widgets/SceneModePicker/SceneModePickerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/SceneModePicker/SceneModePicker', 'Core/FeatureDetection', 'Specs/createScene', @@ -8,7 +8,9 @@ defineSuite([ FeatureDetection, createScene, DomEventSimulator) { - 'use strict'; + 'use strict'; + +describe('Widgets/SceneModePicker/SceneModePicker', function() { var scene; @@ -81,3 +83,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js b/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js index b361e014178e..0263c6a7e01c 100644 --- a/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js +++ b/Specs/Widgets/SceneModePicker/SceneModePickerViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/SceneModePicker/SceneModePickerViewModel', 'Core/Ellipsoid', 'Scene/Globe', @@ -10,7 +10,9 @@ defineSuite([ Globe, SceneMode, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/SceneModePicker/SceneModePickerViewModel', function() { var scene; var ellipsoid = Ellipsoid.WGS84; @@ -106,3 +108,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js b/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js index ddfaf63bcd63..b23f0d11c198 100644 --- a/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js +++ b/Specs/Widgets/SelectionIndicator/SelectionIndicatorSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/SelectionIndicator/SelectionIndicator', 'Specs/createScene' ], function( SelectionIndicator, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/SelectionIndicator/SelectionIndicator', function() { var scene; beforeAll(function() { @@ -46,3 +48,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js b/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js index f79ac25f07df..ef9bd9bbc289 100644 --- a/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js +++ b/Specs/Widgets/SelectionIndicator/SelectionIndicatorViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/SelectionIndicator/SelectionIndicatorViewModel', 'Core/Cartesian2', 'Core/Cartesian3', @@ -8,7 +8,9 @@ defineSuite([ Cartesian2, Cartesian3, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/SelectionIndicator/SelectionIndicatorViewModel', function() { var scene; var selectionIndicatorElement = document.createElement('div'); @@ -97,3 +99,4 @@ defineSuite([ document.body.removeChild(container); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/SvgPathBindingHandlerSpec.js b/Specs/Widgets/SvgPathBindingHandlerSpec.js index d9ccb2ce84cc..3a7ab6db42f1 100644 --- a/Specs/Widgets/SvgPathBindingHandlerSpec.js +++ b/Specs/Widgets/SvgPathBindingHandlerSpec.js @@ -1,8 +1,10 @@ -defineSuite([ +define([ 'ThirdParty/knockout' ], function( knockout) { - 'use strict'; + 'use strict'; + +describe('ThirdParty/knockout', function() { it('check binding with constants', function() { var div = document.createElement('div'); @@ -86,3 +88,4 @@ cesiumSvgPath: svgPath'); document.body.removeChild(div); }); }); +}); diff --git a/Specs/Widgets/Timeline/TimelineSpec.js b/Specs/Widgets/Timeline/TimelineSpec.js index 4bbe0e28214f..e5c014d44436 100644 --- a/Specs/Widgets/Timeline/TimelineSpec.js +++ b/Specs/Widgets/Timeline/TimelineSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/Timeline/Timeline', 'Core/Clock' ], function( Timeline, Clock) { - 'use strict'; + 'use strict'; + +describe('Widgets/Timeline/Timeline', function() { var container; beforeEach(function(){ @@ -27,3 +29,4 @@ defineSuite([ expect(timeline.isDestroyed()).toEqual(true); }); }); +}); diff --git a/Specs/Widgets/VRButton/VRButtonSpec.js b/Specs/Widgets/VRButton/VRButtonSpec.js index 625e3990c6cd..c4738b17ffc8 100644 --- a/Specs/Widgets/VRButton/VRButtonSpec.js +++ b/Specs/Widgets/VRButton/VRButtonSpec.js @@ -1,10 +1,12 @@ -defineSuite([ +define([ 'Widgets/VRButton/VRButton', 'Specs/createScene' ], function( VRButton, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/VRButton/VRButton', function() { var scene; @@ -61,3 +63,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/VRButton/VRButtonViewModelSpec.js b/Specs/Widgets/VRButton/VRButtonViewModelSpec.js index 90ff0610f9d0..764dffc533d3 100644 --- a/Specs/Widgets/VRButton/VRButtonViewModelSpec.js +++ b/Specs/Widgets/VRButton/VRButtonViewModelSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/VRButton/VRButtonViewModel', 'Core/Fullscreen', 'Specs/createScene' @@ -6,7 +6,9 @@ defineSuite([ VRButtonViewModel, Fullscreen, createScene) { - 'use strict'; + 'use strict'; + +describe('Widgets/VRButton/VRButtonViewModel', function() { var scene; @@ -72,3 +74,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }); +}); diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js index 6de5697812e3..b884e48b15c2 100644 --- a/Specs/Widgets/Viewer/ViewerSpec.js +++ b/Specs/Widgets/Viewer/ViewerSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Core/BoundingSphere', 'Core/Cartesian3', 'Core/CartographicGeocoderService', @@ -88,7 +88,9 @@ defineSuite([ SceneModePicker, SelectionIndicator, Timeline) { - 'use strict'; + 'use strict'; + +describe('Core/BoundingSphere', function() { var testProvider = { isReady : function() { @@ -1637,3 +1639,4 @@ defineSuite([ expect(postMixinDataSource.entities.collectionChanged._listeners.length).not.toEqual(postMixinListenerCount); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js b/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js index 11ccf9d8134e..2e20b1bcaf27 100644 --- a/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js +++ b/Specs/Widgets/Viewer/viewerDragDropMixinSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Viewer/viewerDragDropMixin', 'Core/defined', 'Core/TimeInterval', @@ -12,7 +12,9 @@ defineSuite([ createViewer, DomEventSimulator, pollToPromise) { - 'use strict'; + 'use strict'; + +describe('Widgets/Viewer/viewerDragDropMixin', function() { var container; var viewer; @@ -460,3 +462,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js index 718cc61ec0ee..ff029c815923 100644 --- a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js +++ b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/Viewer/viewerPerformanceWatchdogMixin', 'Specs/createViewer', 'Widgets/PerformanceWatchdog/PerformanceWatchdog' @@ -6,7 +6,9 @@ defineSuite([ viewerPerformanceWatchdogMixin, createViewer, PerformanceWatchdog) { - 'use strict'; + 'use strict'; + +describe('Widgets/Viewer/viewerPerformanceWatchdogMixin', function() { var container; var viewer; @@ -45,3 +47,4 @@ defineSuite([ }).toThrowDeveloperError(); }); }, 'WebGL'); +}); diff --git a/Specs/Widgets/createCommandSpec.js b/Specs/Widgets/createCommandSpec.js index 73dffd2923b0..fa0f116346a6 100644 --- a/Specs/Widgets/createCommandSpec.js +++ b/Specs/Widgets/createCommandSpec.js @@ -1,4 +1,4 @@ -defineSuite([ +define([ 'Widgets/createCommand', 'Specs/getArguments', 'ThirdParty/knockout' @@ -6,7 +6,9 @@ defineSuite([ createCommand, getArguments, knockout) { - 'use strict'; + 'use strict'; + +describe('Widgets/createCommand', function() { var spyFunction; var spyFunctionReturnValue = 5; @@ -93,3 +95,4 @@ defineSuite([ expect(afterExecuteSpy).not.toHaveBeenCalled(); }); }); +}); diff --git a/Specs/customizeJasmine.js b/Specs/customizeJasmine.js index 15d7b621b33c..1f1f035679c2 100644 --- a/Specs/customizeJasmine.js +++ b/Specs/customizeJasmine.js @@ -12,50 +12,8 @@ define([ // set this for uniform test resolution across devices window.devicePixelRatio = 1; - function defineSuite(deps, name, suite, categories, focus) { - /*global define,describe,fdescribe*/ - if (typeof suite === 'object' || typeof suite === 'string') { - categories = suite; - } - - if (typeof name === 'function') { - suite = name; - name = deps[0]; - } - - // exclude this spec if we're filtering by category and it's not the selected category - // otherwise if we have an excluded category, exclude this test if the category of this spec matches - if (includedCategory && categories !== includedCategory) { - return; - } else if (excludedCategory && categories === excludedCategory) { - return; - } - - define(deps, function() { - var args = arguments; - if (focus) { - fdescribe(name, function() { //eslint-disable-line - suite.apply(null, args); - }, categories); - } else { - describe(name, function() { - suite.apply(null, args); - }, categories); - } - }); - } - window.specsUsingRelease = release; - window.fdefineSuite = function(deps, name, suite, categories) { - defineSuite(deps, name, suite, categories, true); - }; - - window.defineSuite = function(deps, name, suite, categories) { - defineSuite(deps, name, suite, categories, false); - - }; - var originalDescribe = window.describe; window.describe = function (name, suite, categories) { diff --git a/Specs/spec-main.js b/Specs/spec-main.js index 5c6cc047f707..84ffc4376e71 100644 --- a/Specs/spec-main.js +++ b/Specs/spec-main.js @@ -10,7 +10,7 @@ [jasmine-gem]: http://github.com/pivotal/jasmine-gem */ -/*global define,require*/ +/*global require*/ (function() { 'use strict'; @@ -79,25 +79,6 @@ window.specsUsingRelease = release; - window.defineSuite = function(deps, name, suite, categories) { - /*global define,describe*/ - if (typeof suite === 'object' || typeof suite === 'string') { - categories = suite; - } - - if (typeof name === 'function') { - suite = name; - name = deps[0]; - } - - define(deps, function() { - var args = arguments; - describe(name, function() { - suite.apply(null, args); - }, categories); - }); - }; - /** * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference. */