Skip to content

Commit 0562f24

Browse files
songyumengsongyumeng
committed
【fix】优化iportal相关测试 review by xiongjj
1 parent 11b63aa commit 0562f24

File tree

4 files changed

+46
-20
lines changed

4 files changed

+46
-20
lines changed

‎src/common/iPortal/iPortalUser.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class IPortalUser extends IPortalServiceBase {
4949
*/
5050
addMap(addMapParams) {
5151
if (!(addMapParams instanceof IPortalAddResourceParam)) {
52-
this.getErrMsgPromise("addMapParams is not instanceof IPortalAddResourceParam !");
52+
return this.getErrMsgPromise("addMapParams is not instanceof IPortalAddResourceParam !");
5353
}
5454
let cloneAddMapParams = {
5555
rootUrl: addMapParams.rootUrl,
@@ -71,7 +71,7 @@ export class IPortalUser extends IPortalServiceBase {
7171
*/
7272
addScene(addSceneParams) {
7373
if (!(addSceneParams instanceof IPortalAddResourceParam)) {
74-
this.getErrMsgPromise("addSceneParams is not instanceof IPortalAddResourceParam !");
74+
return this.getErrMsgPromise("addSceneParams is not instanceof IPortalAddResourceParam !");
7575
}
7676
let cloneAddSceneParams = {
7777
rootUrl: addSceneParams.rootUrl,
@@ -93,7 +93,7 @@ export class IPortalUser extends IPortalServiceBase {
9393
*/
9494
registerService(registerParams) {
9595
if(!(registerParams instanceof IPortalRegisterServiceParam)) {
96-
this.getErrMsgPromise("registerParams is not instanceof IPortalRegisterServiceParam !");
96+
return this.getErrMsgPromise("registerParams is not instanceof IPortalRegisterServiceParam !");
9797
}
9898
let cloneRegisterParams = {
9999
type: registerParams.type,
@@ -145,7 +145,7 @@ export class IPortalUser extends IPortalServiceBase {
145145
*/
146146
addData(params,formData) {
147147
if(!(params instanceof IPortalAddDataParam)){
148-
this.getErrMsgPromise("params is not instanceof iPortalAddDataParam !");
148+
return this.getErrMsgPromise("params is not instanceof iPortalAddDataParam !");
149149
}
150150
var datasUrl = this.iportalUrl + "/web/mycontent/datas.json";
151151
var entity = {
@@ -157,7 +157,7 @@ export class IPortalUser extends IPortalServiceBase {
157157
var dataMetaInfo;
158158
if(type === "excel" || type === "csv"){
159159
if(!(params.dataMetaInfo instanceof IPortalDataMetaInfoParam)){
160-
this.getErrMsgPromise("params.dataMetaInfo is not instanceof iPortalDataMetaInfoParam !");
160+
return this.getErrMsgPromise("params.dataMetaInfo is not instanceof iPortalDataMetaInfoParam !");
161161
}
162162
dataMetaInfo = {
163163
xField:params.dataMetaInfo.xField,
@@ -170,10 +170,10 @@ export class IPortalUser extends IPortalServiceBase {
170170
entity.dataMetaInfo = dataMetaInfo;
171171
}else if(type === "hdfs" || type === "hbase") {
172172
if(!(params.dataMetaInfo instanceof IPortalDataMetaInfoParam)){
173-
this.getErrMsgPromise("params.dataMetaInfo is not instanceof iPortalDataMetaInfoParam !");
173+
return this.getErrMsgPromise("params.dataMetaInfo is not instanceof iPortalDataMetaInfoParam !");
174174
}
175175
if(!(params.dataMetaInfo.dataStoreInfo instanceof IPortalDataStoreInfoParam)){
176-
this.getErrMsgPromise("params.dataMetaInfo.dataStoreInfo is not instanceof iPortalDataStoreInfoParam !");
176+
return this.getErrMsgPromise("params.dataMetaInfo.dataStoreInfo is not instanceof iPortalDataStoreInfoParam !");
177177
}
178178
var dataStoreInfo = {
179179
type:params.dataMetaInfo.dataStoreInfo.type
@@ -188,7 +188,7 @@ export class IPortalUser extends IPortalServiceBase {
188188
break;
189189
case "hbase":
190190
if(!(params.dataMetaInfo.dataStoreInfo.connectionInfo instanceof IPortalDataConnectionInfoParam)){
191-
this.getErrMsgPromise("params.dataMetaInfo.dataStoreInfo.connectionInfo is not instanceof iPortalDataConnectionInfoParam !");
191+
return this.getErrMsgPromise("params.dataMetaInfo.dataStoreInfo.connectionInfo is not instanceof iPortalDataConnectionInfoParam !");
192192
}
193193
dataStoreInfo.connectionInfo = {
194194
dataBase:params.dataMetaInfo.dataStoreInfo.connectionInfo.dataBase,
@@ -229,7 +229,7 @@ export class IPortalUser extends IPortalServiceBase {
229229
*/
230230
publishOrUnpublish(option,forPublish){
231231
if(!option.dataId || !option.serviceType) {
232-
this.getErrMsgPromise("option.dataID and option.serviceType are Required!");
232+
return this.getErrMsgPromise("option.dataID and option.serviceType are Required!");
233233
}
234234
var dataId = option.dataId;
235235
var dataServiceId = option.dataServiceId;

‎test/common/iPortal/iPortalResourceSpec.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import {IPortalResource} from '../../../src/common/iPortal/iPortalResource';
2+
import { FetchRequest } from '../../../src/common/util/FetchRequest';
23

34
describe('iPortalResource', () => {
5+
beforeAll(() => {
6+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
7+
return Promise.resolve(new Response("{}"));
8+
});
9+
})
410
it('constructor_default', () => {
511
var iPortalResource = new IPortalResource("https://iportal.supermap.io/iportal",{resourceType:'MAP'});
612
expect(iPortalResource).not.toBeNull();

‎test/common/iPortal/iPortalSpec.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@ import {IPortal} from '../../../src/common/iPortal/iPortal';
22
import {IPortalQueryParam} from "../../../src/common/iPortal/iPortalQueryParam";
33
import {IPortalShareParam} from "../../../src/common/iPortal/iPortalShareParam";
44
import { FetchRequest } from '../../../src/common/util/FetchRequest';
5+
56
describe('iportal', () => {
7+
beforeAll(() => {
8+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
9+
return Promise.resolve(new Response("{}"));
10+
});
11+
})
612
var iportalUrl = "http://rdc.ispeco.com";
713
var iportal = new IPortal(iportalUrl);
814
it('constructor', () => {
915
expect(iportal.iportalUrl).toBe(iportalUrl);
1016
})
1117

12-
it('queryResources', () => {
18+
it('queryResources', (done) => {
1319
// 传入错误的参数
1420
let queryParams = {
1521
resourceType: "",
@@ -20,10 +26,11 @@ describe('iportal', () => {
2026
};
2127
iportal.queryResources(queryParams).then(res => {
2228
expect(res).toBe("queryParams is not instanceof iPortalQueryParam !");
29+
done();
2330
})
2431
})
2532

26-
it('updateResourcesShareSetting', () => {
33+
it('updateResourcesShareSetting', (done) => {
2734
// 传入错误的参数
2835
let shareParams = {
2936
ids: [],
@@ -32,6 +39,7 @@ describe('iportal', () => {
3239
};
3340
iportal.updateResourcesShareSetting(shareParams).then(res => {
3441
expect(res).toBe("shareParams is not instanceof iPortalShareParam !");
42+
done();
3543
})
3644
})
3745
})

‎test/common/iPortal/iPortalUserSpec.js

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import {IPortalUser} from '../../../src/common/iPortal/iPortalUser';
2+
import { FetchRequest } from '../../../src/common/util/FetchRequest';
23

34
describe('IPortalUser', () => {
5+
beforeAll(() => {
6+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
7+
return Promise.resolve(new Response("{}"));
8+
});
9+
})
410
it('constructor_default', () => {
511
var iportalUrl = 'https://iptl.supermap.io/iportal';
612
var iPortalUser = new IPortalUser(iportalUrl);
@@ -13,7 +19,7 @@ describe('IPortalUser', () => {
1319
expect(iPortalUser.deleteResources({ids: [], resourceType: "MAP"}) instanceof Promise).toBeTruthy();
1420
});
1521

16-
it('addMap', () => {
22+
it('addMap', (done) => {
1723
let iportalUrl = 'https://iptl.supermap.io/iportal';
1824
let iPortalUser = new IPortalUser(iportalUrl);
1925
// 传入错误的参数
@@ -30,11 +36,12 @@ describe('IPortalUser', () => {
3036
]
3137
};
3238
iPortalUser.addMap(addMapParams).then(res => {
33-
expect(res).toBe("addMapParams is not instanceof IPortalAddMapParam !");
39+
expect(res).toBe("addMapParams is not instanceof IPortalAddResourceParam !");
40+
done();
3441
})
3542
});
3643

37-
it('addScene', () => {
44+
it('addScene', (done) => {
3845
let iportalUrl = 'https://iptl.supermap.io/iportal';
3946
let iPortalUser = new IPortalUser(iportalUrl);
4047
// 传入错误的参数
@@ -51,11 +58,12 @@ describe('IPortalUser', () => {
5158
]
5259
};
5360
iPortalUser.addScene(addSceneParams).then(res => {
54-
expect(res).toBe("addSceneParams is not instanceof IPortalAddSceneParam !");
61+
expect(res).toBe("addSceneParams is not instanceof IPortalAddResourceParam !");
62+
done();
5563
})
5664
});
5765

58-
it('registerService', () => {
66+
it('registerService', (done) => {
5967
let iportalUrl = 'https://iptl.supermap.io/iportal';
6068
let iPortalUser = new IPortalUser(iportalUrl);
6169
// 传入错误的参数
@@ -75,7 +83,8 @@ describe('IPortalUser', () => {
7583
addedSceneNames: []
7684
}
7785
iPortalUser.registerService(registerServiceParams).then(res => {
78-
expect(res).toBe("registerParams is not instanceof iPortalRegisterServiceParam !");
86+
expect(res).toBe("registerParams is not instanceof IPortalRegisterServiceParam !");
87+
done();
7988
})
8089
})
8190

@@ -102,7 +111,7 @@ describe('IPortalUser', () => {
102111
expect(iPortalUser.addData(addDataParam,formData) instanceof Promise).toBeTruthy();
103112
});
104113

105-
it('publishOrUnpublish', ()=> {
114+
it('publishOrUnpublish', (done)=> {
106115
var options = {
107116
dataId:null,
108117
serviceType:'RESTDATA',
@@ -113,6 +122,7 @@ describe('IPortalUser', () => {
113122
var iPortalUser = new IPortalUser(iportalUrl);
114123
iPortalUser.publishOrUnpublish(options,forPublish).then(res => {
115124
expect(res).toBe("option.dataID and option.serviceType are Required!");
125+
done();
116126
})
117127
});
118128

@@ -124,7 +134,7 @@ describe('IPortalUser', () => {
124134
expect(iPortalUser.getDataPublishedStatus(dataId,dataServiceId) instanceof Promise).toBeTruthy();
125135
});
126136

127-
it('unPublishDataService', ()=> {
137+
it('unPublishDataService', (done)=> {
128138
var options = {
129139
dataId:1,
130140
serviceType:null,
@@ -134,10 +144,11 @@ describe('IPortalUser', () => {
134144
var iPortalUser = new IPortalUser(iportalUrl);
135145
iPortalUser.unPublishDataService(options).then(res => {
136146
expect(res).toBe("option.dataID and option.serviceType are Required!");
147+
done();
137148
})
138149
});
139150

140-
it('publishDataService', ()=> {
151+
it('publishDataService', (done)=> {
141152
var options = {
142153
dataId:1,
143154
serviceType:null,
@@ -147,6 +158,7 @@ describe('IPortalUser', () => {
147158
var iPortalUser = new IPortalUser(iportalUrl);
148159
iPortalUser.publishDataService(options).then(res => {
149160
expect(res).toBe("option.dataID and option.serviceType are Required!");
161+
done();
150162
})
151163
});
152164
});

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy