增加attributeFilter相关测试

songyumeng · songyumeng · commit 5bbf6ce87454 · 2018-03-29T10:01:37.000+08:00
diff --git a/test/common/iServer/GenerateSpatialDataServiceSpec.js b/test/common/iServer/GenerateSpatialDataServiceSpec.js
@@ -45,6 +45,7 @@ describe('GenerateSpatialDataService', () => {
         var generateSpatialDataParameters = new GenerateSpatialDataParameters({
             routeTable: "RouteDT_road@Changchun",
             routeIDField: "RouteID",
+            attributeFilter: "SMID = 1",
             eventTable: "PointEventTabDT@Changchun",
             eventRouteIDField: "RouteID",
             measureField: "measure",
@@ -58,7 +59,7 @@ describe('GenerateSpatialDataService', () => {
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + "/datasets/RouteDT_road@Changchun/linearreferencing/generatespatialdata.json?returnContent=true");
-            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'eventTable':\"PointEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"measure\",'measureStartField':null,'measureEndField':null,'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':1000,'dataset':\"GenerateSpatial_Point_DS_Test\",'dataReturnMode':\"DATASET_ONLY\",'deleteExistResultDataset':true}}";
+            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'attributeFilter':\"SMID = 1\",'eventTable':\"PointEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"measure\",'measureStartField':null,'measureEndField':null,'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':1000,'dataset':\"GenerateSpatial_Point_DS_Test\",'dataReturnMode':\"DATASET_ONLY\",'deleteExistResultDataset':true}}";
             expect(params).toBe(expectParams);
             expect(options).not.toBeNull();
             var escapedJson = "{\"succeed\":true,\"recordset\":null,\"message\":null,\"dataset\":\"GenerateSpatial_Point_DS_Test@Changchun\"}";
@@ -108,7 +109,7 @@ describe('GenerateSpatialDataService', () => {
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + "/datasets/RouteDT_road@Changchun/linearreferencing/generatespatialdata.json?returnContent=true");
-            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'eventTable':\"LinearEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"\",'measureStartField':\"LineMeasureFrom\",'measureEndField':\"LineMeasureTo\",'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':1000,'dataset':\"GenerateSpatial_Linear_DS_Test\",'dataReturnMode':\"DATASET_ONLY\",'deleteExistResultDataset':true}}";
+            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'attributeFilter':null,'eventTable':\"LinearEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"\",'measureStartField':\"LineMeasureFrom\",'measureEndField':\"LineMeasureTo\",'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':1000,'dataset':\"GenerateSpatial_Linear_DS_Test\",'dataReturnMode':\"DATASET_ONLY\",'deleteExistResultDataset':true}}";
             expect(params).toBe(expectParams);
             expect(options).not.toBeNull();
             var escapedJson = "{\"succeed\":true,\"recordset\":null,\"message\":null,\"dataset\":\"GenerateSpatial_Linear_DS_Test@Changchun\"}";
@@ -155,7 +156,7 @@ describe('GenerateSpatialDataService', () => {
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + "/datasets/RouteDT_road@Changchun/linearreferencing/generatespatialdata.json?returnContent=true");
-            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'eventTable':\"PointEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"measure\",'measureStartField':null,'measureEndField':null,'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':2,'dataset':\"\",'dataReturnMode':\"RECORDSET_ONLY\",'deleteExistResultDataset':true}}";
+            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'attributeFilter':null,'eventTable':\"PointEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"measure\",'measureStartField':null,'measureEndField':null,'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':2,'dataset':\"\",'dataReturnMode':\"RECORDSET_ONLY\",'deleteExistResultDataset':true}}";
             expect(params).toBe(expectParams);
             expect(options).not.toBeNull();
             var escapedJson = "{\"succeed\":true,\"recordset\":{\"features\":[{\"fieldNames\":[\"SmID\",\"SmX\",\"SmY\",\"SmLibTileID\",\"SmUserID\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"Measure\",\"Event_SMID\"],\"geometry\":{\"center\":{\"x\":4567.867467731736,\"y\":-4052.8153568908647},\"parts\":[1],\"style\":null,\"prjCoordSys\":null,\"id\":1,\"type\":\"POINT\",\"partTopo\":null,\"points\":[{\"x\":4567.867467731736,\"y\":-4052.8153568908647}]},\"fieldValues\":[\"1\",\"4567.867467731736\",\"-4052.8153568908647\",\"1\",\"24\",\"20\",\"3309568\",\"560\",\"356.0\",\"1\"],\"ID\":1},{\"fieldNames\":[\"SmID\",\"SmX\",\"SmY\",\"SmLibTileID\",\"SmUserID\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"Measure\",\"Event_SMID\"],\"geometry\":{\"center\":{\"x\":5470.7165973049505,\"y\":-2922.2119992383105},\"parts\":[1],\"style\":null,\"prjCoordSys\":null,\"id\":2,\"type\":\"POINT\",\"partTopo\":null,\"points\":[{\"x\":5470.7165973049505,\"y\":-2922.2119992383105}]},\"fieldValues\":[\"2\",\"5470.7165973049505\",\"-2922.2119992383105\",\"1\",\"24\",\"20\",\"3309588\",\"720\",\"158.0\",\"2\"],\"ID\":2}],\"fieldCaptions\":[\"SmID\",\"SmX\",\"SmY\",\"SmLibTileID\",\"SmUserID\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"Measure\",\"Event_SMID\"],\"fieldTypes\":[\"INT32\",\"DOUBLE\",\"DOUBLE\",\"INT32\",\"INT32\",\"INT32\",\"INT64\",\"INT32\",\"DOUBLE\",\"INT32\"],\"datasetName\":null,\"fields\":[\"SmID\",\"SmX\",\"SmY\",\"SmLibTileID\",\"SmUserID\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"Measure\",\"Event_SMID\"]},\"message\":null,\"dataset\":null}";
@@ -203,7 +204,7 @@ describe('GenerateSpatialDataService', () => {
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
             expect(method).toBe('POST');
             expect(testUrl).toBe(url + "/datasets/RouteDT_road@Changchun/linearreferencing/generatespatialdata.json?returnContent=true");
-            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'eventTable':\"LinearEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"\",'measureStartField':\"LineMeasureFrom\",'measureEndField':\"LineMeasureTo\",'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':2,'dataset':\"\",'dataReturnMode':\"RECORDSET_ONLY\",'deleteExistResultDataset':true}}";
+            var expectParams = "{'routeTable':\"RouteDT_road@Changchun\",'routeIDField':\"RouteID\",'attributeFilter':null,'eventTable':\"LinearEventTabDT@Changchun\",'eventRouteIDField':\"RouteID\",'measureField':\"\",'measureStartField':\"LineMeasureFrom\",'measureEndField':\"LineMeasureTo\",'measureOffsetField':\"\",'errorInfoField':\"\",'retainedFields':null,'dataReturnOption':{'expectCount':2,'dataset':\"\",'dataReturnMode':\"RECORDSET_ONLY\",'deleteExistResultDataset':true}}";
             expect(params).toBe(expectParams);
             expect(options).not.toBeNull();
             var escapedJson = "{\"succeed\":true,\"recordset\":{\"features\":[{\"fieldNames\":[\"SmID\",\"SmSdriW\",\"SmSdriN\",\"SmSdriE\",\"SmSdriS\",\"SmUserID\",\"SmTopoError\",\"SmMaxMeasure\",\"SmMinMeasure\",\"SmLength\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"LineMeasureFrom\",\"LineMeasureTo\",\"NAME\",\"TrafficStatus\",\"Event_SMID\"],\"geometry\":{\"line\":null,\"center\":null,\"length\":1258.8231315962066,\"minM\":0,\"type\":\"LINEM\",\"points\":[{\"measure\":0,\"x\":4030.2000322076688,\"y\":-5758.197662443126},{\"measure\":425.4514780663061,\"x\":4455.639319487514,\"y\":-5754.976943948421},{\"measure\":1258.8231315962066,\"x\":5289.01068425431,\"y\":-5754.283190470987}],\"parts\":[3],\"maxM\":1258.8231315962066,\"style\":null,\"prjCoordSys\":null,\"id\":1,\"region\":null,\"partTopo\":null},\"fieldValues\":[\"1\",\"4030.2\",\"-5754.283\",\"5289.0107\",\"-5758.1978\",\"0\",\"0\",\"1258.8231315962066\",\"0.0\",\"1258.8231315962066\",\"84\",\"16056320\",\"10\",\"0.0\",\"1258.8231315962066\",\"南湖大路\",\"畅通\",\"1\"],\"ID\":1},{\"fieldNames\":[\"SmID\",\"SmSdriW\",\"SmSdriN\",\"SmSdriE\",\"SmSdriS\",\"SmUserID\",\"SmTopoError\",\"SmMaxMeasure\",\"SmMinMeasure\",\"SmLength\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"LineMeasureFrom\",\"LineMeasureTo\",\"NAME\",\"TrafficStatus\",\"Event_SMID\"],\"geometry\":{\"line\":null,\"center\":null,\"length\":1246.05997322132,\"minM\":0,\"type\":\"LINEM\",\"points\":[{\"measure\":0,\"x\":4031.546988614261,\"y\":-6673.697364254913},{\"measure\":348.24461005823053,\"x\":4379.791383014397,\"y\":-6673.309803302958},{\"measure\":805.9462905472112,\"x\":4837.492515116954,\"y\":-6674.018318987329},{\"measure\":1064.909015494496,\"x\":5096.454997753926,\"y\":-6673.664061145143},{\"measure\":1246.05997322132,\"x\":5277.604874646225,\"y\":-6673.038291818071}],\"parts\":[5],\"maxM\":1246.05997322132,\"style\":null,\"prjCoordSys\":null,\"id\":2,\"region\":null,\"partTopo\":null},\"fieldValues\":[\"2\",\"4031.5469\",\"-6673.038\",\"5277.605\",\"-6674.0186\",\"0\",\"0\",\"1246.05997322132\",\"0.0\",\"1246.05997322132\",\"132\",\"16056404\",\"20\",\"0.0\",\"1246.05997322132\",\"卫星路\",\"畅通\",\"2\"],\"ID\":2}],\"fieldCaptions\":[\"SmID\",\"SmSdriW\",\"SmSdriN\",\"SmSdriE\",\"SmSdriS\",\"SmUserID\",\"SmTopoError\",\"SmMaxMeasure\",\"SmMinMeasure\",\"SmLength\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"LineMeasureFrom\",\"LineMeasureTo\",\"Name\",\"TrafficStatus\",\"Event_SMID\"],\"fieldTypes\":[\"INT32\",\"SINGLE\",\"SINGLE\",\"SINGLE\",\"SINGLE\",\"INT32\",\"INT32\",\"DOUBLE\",\"DOUBLE\",\"DOUBLE\",\"INT32\",\"INT64\",\"INT32\",\"DOUBLE\",\"DOUBLE\",\"TEXT\",\"TEXT\",\"INT32\"],\"datasetName\":null,\"fields\":[\"SmID\",\"SmSdriW\",\"SmSdriN\",\"SmSdriE\",\"SmSdriS\",\"SmUserID\",\"SmTopoError\",\"SmMaxMeasure\",\"SmMinMeasure\",\"SmLength\",\"SmGeometrySize\",\"SmGeoPosition\",\"RouteID\",\"LineMeasureFrom\",\"LineMeasureTo\",\"NAME\",\"TrafficStatus\",\"Event_SMID\"]},\"message\":null,\"dataset\":null}";
