Test restructuring. No functional change.
This commit is contained in:
Marc Jansen
@@ -57,106 +57,113 @@ describe("ol.geom.point", function() {
|
|||||||
if (instances.hasOwnProperty(instancesDesc)) {
|
if (instances.hasOwnProperty(instancesDesc)) {
|
||||||
var instance = instances[instancesDesc];
|
var instance = instances[instancesDesc];
|
||||||
|
|
||||||
it("constructs instances (" + instancesDesc + ")", function() {
|
describe("instantiate with " + instancesDesc, function() {
|
||||||
expect(instance).toEqual(jasmine.any(ol.geom.Point));
|
|
||||||
|
it("constructs instances", function() {
|
||||||
|
expect(instance).toEqual(jasmine.any(ol.geom.Point));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("constructs instances of ol.geom.Geometry", function() {
|
||||||
|
expect(instance).toEqual(jasmine.any(ol.geom.Geometry));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("has coordinate getter/setter methods", function() {
|
||||||
|
expect(instance.x).not.toBeUndefined();
|
||||||
|
expect(instance.y).not.toBeUndefined();
|
||||||
|
expect(instance.z).not.toBeUndefined();
|
||||||
|
|
||||||
|
// always a number
|
||||||
|
expect( !isNaN( instance.x() ) ).toBe(true);
|
||||||
|
// setter returns self
|
||||||
|
expect(instance.x(47)).toBeA(ol.geom.Point);
|
||||||
|
// getter returns correct number
|
||||||
|
expect(instance.x()).toBe(47);
|
||||||
|
|
||||||
|
// always a number
|
||||||
|
expect( !isNaN( instance.y() ) ).toBe(true);
|
||||||
|
// setter returns self
|
||||||
|
expect(instance.y(74)).toBeA(ol.geom.Point);
|
||||||
|
// getter returns correct number
|
||||||
|
expect(instance.y()).toBe(74);
|
||||||
|
|
||||||
|
// always number or undefined
|
||||||
|
expect(instance.z() === undefined || !isNaN(instance.z()) ).toBe(true);
|
||||||
|
// setter returns self
|
||||||
|
expect(instance.z(0.074)).toBeA(ol.geom.Point);
|
||||||
|
// getter returns correct number
|
||||||
|
expect(instance.z()).toBe(0.074);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
it("has projection getter/setter methods", function() {
|
||||||
|
expect(instance.projection).not.toBeUndefined();
|
||||||
|
|
||||||
|
var getRes = instance.projection();
|
||||||
|
expect(getRes === null || getRes instanceof ol.Projection).toBe(true);
|
||||||
|
|
||||||
|
var setRes = instance.projection("EPSG:12345");
|
||||||
|
expect(setRes instanceof ol.geom.Point).toBe(true);
|
||||||
|
|
||||||
|
getRes = instance.projection();
|
||||||
|
expect(getRes).toBeA(ol.Projection);
|
||||||
|
expect(getRes.code()).toEqual("EPSG:12345");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("constructs instances of ol.geom.Geometry (" + instancesDesc + ")", function() {
|
|
||||||
expect(instance).toEqual(jasmine.any(ol.geom.Geometry));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("has coordinate getter/setter methods (" + instancesDesc + ")", function() {
|
|
||||||
expect(instance.x).not.toBeUndefined();
|
|
||||||
expect(instance.y).not.toBeUndefined();
|
|
||||||
expect(instance.z).not.toBeUndefined();
|
|
||||||
|
|
||||||
// always a number
|
|
||||||
expect( !isNaN( instance.x() ) ).toBe(true);
|
|
||||||
// setter returns self
|
|
||||||
expect(instance.x(47)).toBeA(ol.geom.Point);
|
|
||||||
// getter returns correct number
|
|
||||||
expect(instance.x()).toBe(47);
|
|
||||||
|
|
||||||
// always a number
|
|
||||||
expect( !isNaN( instance.y() ) ).toBe(true);
|
|
||||||
// setter returns self
|
|
||||||
expect(instance.y(74)).toBeA(ol.geom.Point);
|
|
||||||
// getter returns correct number
|
|
||||||
expect(instance.y()).toBe(74);
|
|
||||||
|
|
||||||
// always number or undefined
|
|
||||||
expect(instance.z() === undefined || !isNaN(instance.z()) ).toBe(true);
|
|
||||||
// setter returns self
|
|
||||||
expect(instance.z(0.074)).toBeA(ol.geom.Point);
|
|
||||||
// getter returns correct number
|
|
||||||
expect(instance.z()).toBe(0.074);
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
it("has projection getter/setter methods (" + instancesDesc + ")", function() {
|
|
||||||
expect(instance.projection).not.toBeUndefined();
|
|
||||||
|
|
||||||
var getRes = instance.projection();
|
|
||||||
expect(getRes === null || getRes instanceof ol.Projection).toBe(true);
|
|
||||||
|
|
||||||
var setRes = instance.projection("EPSG:12345");
|
|
||||||
expect(setRes instanceof ol.geom.Point).toBe(true);
|
|
||||||
|
|
||||||
getRes = instance.projection();
|
|
||||||
expect(getRes).toBeA(ol.Projection);
|
|
||||||
expect(getRes.code()).toEqual("EPSG:12345");
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
it("has functional getters (no arguments passed)", function(){
|
describe('the getters are functional', function(){
|
||||||
expect(pNoArgs.x()).toBe(0);
|
it("works when no arguments passed", function(){
|
||||||
expect(pNoArgs.y()).toBe(0);
|
expect(pNoArgs.x()).toBe(0);
|
||||||
expect(pNoArgs.z()).toBeUndefined();
|
expect(pNoArgs.y()).toBe(0);
|
||||||
expect(pNoArgs.projection()).toBeNull();
|
expect(pNoArgs.z()).toBeUndefined();
|
||||||
});
|
expect(pNoArgs.projection()).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Array[x,y]> passed)", function(){
|
it("works when one argument <Array[x,y]> passed", function(){
|
||||||
expect(pNoZ_arr.x()).toBe(21);
|
expect(pNoZ_arr.x()).toBe(21);
|
||||||
expect(pNoZ_arr.y()).toBe(4);
|
expect(pNoZ_arr.y()).toBe(4);
|
||||||
expect(pNoZ_arr.z()).toBeUndefined();
|
expect(pNoZ_arr.z()).toBeUndefined();
|
||||||
expect(pNoZ_arr.projection()).toBeNull();
|
expect(pNoZ_arr.projection()).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Array[x,y,z]> passed)", function(){
|
it("works when one argument <Array[x,y,z]> passed", function(){
|
||||||
expect(pWithZ_arr.x()).toBe(21);
|
expect(pWithZ_arr.x()).toBe(21);
|
||||||
expect(pWithZ_arr.y()).toBe(4);
|
expect(pWithZ_arr.y()).toBe(4);
|
||||||
expect(pWithZ_arr.z()).toBe(8);
|
expect(pWithZ_arr.z()).toBe(8);
|
||||||
expect(pWithZ_arr.projection()).toBeNull();
|
expect(pWithZ_arr.projection()).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Array[x,y,z,projection]> passed)", function(){
|
it("works when one argument <Array[x,y,z,projection]> passed", function(){
|
||||||
expect(p_arr.x()).toBe(21);
|
expect(p_arr.x()).toBe(21);
|
||||||
expect(p_arr.y()).toBe(4);
|
expect(p_arr.y()).toBe(4);
|
||||||
expect(p_arr.z()).toBe(8);
|
expect(p_arr.z()).toBe(8);
|
||||||
expect(p_arr.projection()).not.toBeNull();
|
expect(p_arr.projection()).not.toBeNull();
|
||||||
expect(p_arr.projection()).toBeA(ol.Projection);
|
expect(p_arr.projection()).toBeA(ol.Projection);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Object{x,y}> passed)", function(){
|
it("works when one argument <Object{x,y}> passed", function(){
|
||||||
expect(pNoZ_obj.x()).toBe(21);
|
expect(pNoZ_obj.x()).toBe(21);
|
||||||
expect(pNoZ_obj.y()).toBe(4);
|
expect(pNoZ_obj.y()).toBe(4);
|
||||||
expect(pNoZ_obj.z()).toBeUndefined();
|
expect(pNoZ_obj.z()).toBeUndefined();
|
||||||
expect(pNoZ_obj.projection()).toBeNull();
|
expect(pNoZ_obj.projection()).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Object{x,y,z}> passed)", function(){
|
it("works when one argument <Object{x,y,z}> passed", function(){
|
||||||
expect(pWithZ_obj.x()).toBe(21);
|
expect(pWithZ_obj.x()).toBe(21);
|
||||||
expect(pWithZ_obj.y()).toBe(4);
|
expect(pWithZ_obj.y()).toBe(4);
|
||||||
expect(pWithZ_obj.z()).toBe(8);
|
expect(pWithZ_obj.z()).toBe(8);
|
||||||
expect(pWithZ_obj.projection()).toBeNull();
|
expect(pWithZ_obj.projection()).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (one argument <Object{x,y,z,projection}> passed)", function(){
|
it("works when one argument <Object{x,y,z,projection}> passed", function(){
|
||||||
expect(p_obj.x()).toBe(21);
|
expect(p_obj.x()).toBe(21);
|
||||||
expect(p_obj.y()).toBe(4);
|
expect(p_obj.y()).toBe(4);
|
||||||
expect(p_obj.z()).toBe(8);
|
expect(p_obj.z()).toBe(8);
|
||||||
expect(p_obj.projection()).not.toBeNull();
|
expect(p_obj.projection()).not.toBeNull();
|
||||||
expect(p_obj.projection()).toEqual(jasmine.any(ol.Projection));
|
expect(p_obj.projection()).toEqual(jasmine.any(ol.Projection));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -35,89 +35,92 @@ describe("ol.geom.Point", function() {
|
|||||||
if (instances.hasOwnProperty(instancesDesc)) {
|
if (instances.hasOwnProperty(instancesDesc)) {
|
||||||
var instance = instances[instancesDesc];
|
var instance = instances[instancesDesc];
|
||||||
|
|
||||||
it("constructs instances (" + instancesDesc + ")", function() {
|
describe("instantiate with " + instancesDesc, function() {
|
||||||
expect(instance).toEqual(jasmine.any(ol.geom.Point));
|
|
||||||
});
|
|
||||||
|
|
||||||
it("constructs instances of ol.geom.Geometry (" + instancesDesc + ")", function() {
|
it("constructs instances", function() {
|
||||||
expect(instance).toEqual(jasmine.any(ol.geom.Geometry));
|
expect(instance).toEqual(jasmine.any(ol.geom.Point));
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has the coordinate accessor methods (" + instancesDesc + ")", function() {
|
it("constructs instances of ol.geom.Geometry", function() {
|
||||||
expect(instance.getX).not.toBeUndefined();
|
expect(instance).toEqual(jasmine.any(ol.geom.Geometry));
|
||||||
expect(instance.getY).not.toBeUndefined();
|
});
|
||||||
expect(instance.getZ).not.toBeUndefined();
|
|
||||||
expect(instance.setX).not.toBeUndefined();
|
|
||||||
expect(instance.setY).not.toBeUndefined();
|
|
||||||
expect(instance.setZ).not.toBeUndefined();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("has the projection accessor methods (" + instancesDesc + ")", function() {
|
it("has the coordinate accessor methods", function() {
|
||||||
expect(instance.getProjection).not.toBeUndefined();
|
expect(instance.getX).not.toBeUndefined();
|
||||||
expect(instance.setProjection).not.toBeUndefined();
|
expect(instance.getY).not.toBeUndefined();
|
||||||
});
|
expect(instance.getZ).not.toBeUndefined();
|
||||||
|
expect(instance.setX).not.toBeUndefined();
|
||||||
|
expect(instance.setY).not.toBeUndefined();
|
||||||
|
expect(instance.setZ).not.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("has the projection accessor methods", function() {
|
||||||
|
expect(instance.getProjection).not.toBeUndefined();
|
||||||
|
expect(instance.setProjection).not.toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
describe('the getters are functional', function(){
|
||||||
|
it("works when two arguments <x>,<y> passed", function(){
|
||||||
|
|
||||||
it("has functional getters (two arguments <x>,<y> passed)", function(){
|
expect(p2Args.getX()).toBe(21);
|
||||||
|
expect(p2Args.getY()).toBe(4);
|
||||||
|
expect(p2Args.getZ()).toBeUndefined();
|
||||||
|
expect(p2Args.getProjection()).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
expect(p2Args.getX()).toBe(21);
|
it("works when three arguments <x>,<y>,<z> passed", function(){
|
||||||
expect(p2Args.getY()).toBe(4);
|
expect(p3Args.getX()).toBe(21);
|
||||||
expect(p2Args.getZ()).toBeUndefined();
|
expect(p3Args.getY()).toBe(4);
|
||||||
expect(p2Args.getProjection()).toBeNull();
|
expect(p3Args.getZ()).not.toBeUndefined();
|
||||||
|
expect(p3Args.getZ()).toBe(8);
|
||||||
|
expect(p3Args.getProjection()).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("works when four arguments <x>,<y>,<z>,<projection> passed", function(){
|
||||||
|
expect(p4Args.getX()).toBe(21);
|
||||||
|
expect(p4Args.getY()).toBe(4);
|
||||||
|
expect(p4Args.getZ()).toBe(8);
|
||||||
|
expect(p4Args.getProjection()).not.toBeNull();
|
||||||
|
expect(p4Args.getProjection()).toBeA(ol.Projection);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("has functional getters (three arguments <x>,<y>,<z> passed)", function(){
|
describe("transformation is functional", function(){
|
||||||
expect(p3Args.getX()).toBe(21);
|
it("can be transformed", function(){
|
||||||
expect(p3Args.getY()).toBe(4);
|
// save for later comparison
|
||||||
expect(p3Args.getZ()).not.toBeUndefined();
|
var old = {
|
||||||
expect(p3Args.getZ()).toBe(8);
|
x: p4Args.getX().toFixed(3),
|
||||||
expect(p3Args.getProjection()).toBeNull();
|
y: p4Args.getY().toFixed(3)
|
||||||
});
|
};
|
||||||
|
// with code only
|
||||||
|
var transformedPoint = p4Args.transform("EPSG:3857");
|
||||||
|
|
||||||
it("has functional getters (four arguments <x>,<y>,<z>,<projection> passed)", function(){
|
// is it still an instance of ol.geom.Point?
|
||||||
expect(p4Args.getX()).toBe(21);
|
expect(transformedPoint).toBeA(ol.geom.Point);
|
||||||
expect(p4Args.getY()).toBe(4);
|
// coordinates OK?
|
||||||
expect(p4Args.getZ()).toBe(8);
|
expect(transformedPoint.getX().toFixed(3)).toBe("2337709.306");
|
||||||
expect(p4Args.getProjection()).not.toBeNull();
|
expect(transformedPoint.getY().toFixed(3)).toBe("445640.110");
|
||||||
expect(p4Args.getProjection()).toBeA(ol.Projection);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("can be transformed", function(){
|
// with an ol.Projection
|
||||||
// save for later comparison
|
var retransformedPoint = transformedPoint.transform(new ol.Projection("EPSG:4326"));
|
||||||
var old = {
|
expect(retransformedPoint).toBeA(ol.geom.Point);
|
||||||
x: p4Args.getX().toFixed(3),
|
|
||||||
y: p4Args.getY().toFixed(3)
|
|
||||||
};
|
|
||||||
// with code only
|
|
||||||
var transformedPoint = p4Args.transform("EPSG:3857");
|
|
||||||
|
|
||||||
// is it still an instance of ol.geom.Point?
|
// coordinates shopulkd be the originally configured
|
||||||
expect(transformedPoint).toBeA(ol.geom.Point);
|
expect(retransformedPoint.getX().toFixed(3)).toBe(old.x);
|
||||||
// coordinates OK?
|
expect(retransformedPoint.getY().toFixed(3)).toBe(old.y);
|
||||||
expect(transformedPoint.getX().toFixed(3)).toBe("2337709.306");
|
});
|
||||||
expect(transformedPoint.getY().toFixed(3)).toBe("445640.110");
|
|
||||||
|
|
||||||
// with an ol.Projection
|
it("throws an exception when you try to transform without a source projection", function(){
|
||||||
var retransformedPoint = transformedPoint.transform(new ol.Projection("EPSG:4326"));
|
expect(function() {
|
||||||
expect(retransformedPoint).toBeA(ol.geom.Point);
|
p2Args.transform("EPSG:3857");
|
||||||
|
}).toThrow();
|
||||||
// coordinates shopulkd be the originally configured
|
|
||||||
expect(retransformedPoint.getX().toFixed(3)).toBe(old.x);
|
|
||||||
expect(retransformedPoint.getY().toFixed(3)).toBe(old.y);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("throws an exception when you try to transform without a source projection", function(){
|
|
||||||
|
|
||||||
expect(function() {
|
|
||||||
p2Args.transform("EPSG:3857");
|
|
||||||
}).toThrow();
|
|
||||||
|
|
||||||
expect(function() {
|
|
||||||
p3Args.transform("EPSG:3857");
|
|
||||||
}).toThrow();
|
|
||||||
|
|
||||||
|
expect(function() {
|
||||||
|
p3Args.transform("EPSG:3857");
|
||||||
|
}).toThrow();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user