Skip to content

Commit 520b9c2

Browse files
songyumengsongyumeng
committed
【fix】尝试修复不稳定测试 ，图片使用本地图片 review by zhurch
1 parent 87759f6 commit 520b9c2

File tree

4 files changed

+66
-50
lines changed

4 files changed

+66
-50
lines changed

‎test/karma.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module.exports = function (config) {
3232
/***测试文件***/
3333
'./tool/**.js',
3434
'./resources/**.js',
35+
'./resources/img/**.png',
3536
/***classic的源码***/
3637
/*由于除了classic其他都不依赖于8c,所以classic 的引入放在最后，以免被common覆盖*/
3738
{pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-16820.js', include: false},

‎test/openlayers/overlay/vectortile/MapboxStylesSpec.js

Lines changed: 64 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -72,30 +72,17 @@ describe('openlayers_MapboxStyles', () => {
7272
it('getStyleFunction', (done) => {
7373
var style;
7474
mapboxStyles = new MapboxStyles(stylesOptions);
75-
setTimeout(() => {
75+
mapboxStyles.on("styleloaded", () => {
7676
style = mapboxStyles.getStyleFunction();
7777
expect(style).not.toBeNull();
7878
done();
79-
}, 2000);
79+
})
8080
});
8181

8282
it('getStyleFunction,setSelectedId', (done) => {
83-
var style;
8483
mapboxStyles = new MapboxStyles(stylesOptions);
85-
var feature = new ol.Feature({
86-
geometry: new ol.geom.Polygon([
87-
[
88-
[0, 0],
89-
[-10, 30],
90-
[-30, 0],
91-
[0, 0]
92-
]
93-
]),
94-
layer: "Military_R@California"
95-
});
96-
feature.setId(1);
9784
mapboxStyles.on("styleloaded", () => {
98-
var style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758);
85+
var style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758);
9986
expect(style).not.toBeNull();
10087
expect(style[0].getFill().getColor()).not.toBeNull();
10188
var color = ol.color.asArray(style[0].getFill().getColor());
@@ -110,16 +97,16 @@ describe('openlayers_MapboxStyles', () => {
11097
"id": "Military_R@California#26",
11198
"maxzoom": 17,
11299
});
113-
style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758/2);
100+
style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758 / 2);
114101
expect(style).not.toBeNull();
115102
expect(style[0].getFill().getColor()).not.toBeNull();
116-
// color = ol.color.asArray(style[0].getFill().getColor());
117-
// expect(color[0]).toBeCloseTo(249);
118-
// expect(color[1]).toBeCloseTo(0);
119-
// expect(color[2]).toBeCloseTo(0);
120-
// expect(color[3]).toBeCloseTo(0.9);
103+
color = ol.color.asArray(style[0].getFill().getColor());
104+
expect(color[0]).toBeCloseTo(249);
105+
expect(color[1]).toBeCloseTo(0);
106+
expect(color[2]).toBeCloseTo(0);
107+
expect(color[3]).toBeCloseTo(0.9);
121108
mapboxStyles.setSelectedId(1, "Military_R@California");
122-
style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758);
109+
style = mapboxStyles.getStyleFunction()(feature, 2.388657133911758);
123110
expect(style).not.toBeNull();
124111
expect(style[0].getFill().getColor()).not.toBeNull();
125112
color = ol.color.asArray(style[0].getFill().getColor());
@@ -129,27 +116,43 @@ describe('openlayers_MapboxStyles', () => {
129116
expect(color[3]).toBeCloseTo(1);
130117
done();
131118
})
119+
var feature = new ol.Feature({
120+
geometry: new ol.geom.Polygon([
121+
[
122+
[0, 0],
123+
[-10, 30],
124+
[-30, 0],
125+
[0, 0]
126+
]
127+
]),
128+
layer: "Military_R@California"
129+
});
130+
feature.setId(1);
131+
132132

133133
});
134134

135135
it('getStylesBySourceLayer', (done) => {
136-
var layer;
137136
mapboxStyles = new MapboxStyles(stylesOptions);
138-
setTimeout(() => {
139-
layer = mapboxStyles.getStylesBySourceLayer("Military_R@California");
140-
expect(layer).not.toBeNull();
141-
expect(layer[0].paint).not.toBeNull();
142-
expect(layer[0].paint["fill-color"]).toBe("rgba(249,224,219,0.90)");
143-
vectorstylesEscapedJson.layers[2].paint["fill-color"] = "rgba(255,0,0,0)";
144-
delete vectorstylesEscapedJson.sprite;
145-
delete vectorstylesEscapedJson.glyphs;
146-
mapboxStyles.setStyle(vectorstylesEscapedJson);
147-
layer = mapboxStyles.getStylesBySourceLayer("Military_R@California");
148-
expect(layer).not.toBeNull();
149-
expect(layer[0].paint).not.toBeNull();
150-
expect(layer[0].paint["fill-color"]).toBe("rgba(255,0,0,0)");
151-
done();
152-
}, 2000);
137+
mapboxStyles.once("styleloaded", () => {
138+
try {
139+
var layer = mapboxStyles.getStylesBySourceLayer("Military_R@California");
140+
expect(layer).not.toBeNull();
141+
expect(layer[0].paint).not.toBeNull();
142+
expect(layer[0].paint["fill-color"]).toBe("rgba(249,224,219,0.90)");
143+
vectorstylesEscapedJson.layers[2].paint["fill-color"] = "rgba(255,0,0,0)";
144+
mapboxStyles.setStyle(vectorstylesEscapedJson);
145+
layer = mapboxStyles.getStylesBySourceLayer("Military_R@California");
146+
expect(layer).not.toBeNull();
147+
expect(layer[0].paint).not.toBeNull();
148+
expect(layer[0].paint["fill-color"]).toBe("rgba(255,0,0,0)");
149+
done();
150+
} catch (e) {
151+
console.log("'getStylesBySourceLayer'案例失败" + e.name + ":" + e.message);
152+
expect(false).toBeTruthy();
153+
done();
154+
}
155+
});
153156
});
154157

155158
it('init_StyleObject', (done) => {
@@ -159,11 +162,17 @@ describe('openlayers_MapboxStyles', () => {
159162
map: map,
160163
source: 'California'
161164
});
162-
setTimeout(() => {
163-
style = mapboxStyles.getStyleFunction();
164-
expect(style).not.toBeNull();
165-
done();
166-
}, 2000);
165+
mapboxStyles.on("styleloaded", () => {
166+
try {
167+
style = mapboxStyles.getStyleFunction();
168+
expect(style).not.toBeNull();
169+
done();
170+
} catch (e) {
171+
console.log("'init_StyleObject'案例失败" + e.name + ":" + e.message);
172+
expect(false).toBeTruthy();
173+
done();
174+
}
175+
});
167176
});
168177

169178
it('init_StyleUrl', (done) => {
@@ -173,11 +182,17 @@ describe('openlayers_MapboxStyles', () => {
173182
map: map,
174183
source: 'California'
175184
});
176-
setTimeout(() => {
177-
style = mapboxStyles.getStyleFunction();
178-
expect(style).not.toBeNull();
179-
done();
180-
}, 2000);
185+
mapboxStyles.on("styleloaded", () => {
186+
try {
187+
style = mapboxStyles.getStyleFunction();
188+
expect(style).not.toBeNull();
189+
done();
190+
} catch (e) {
191+
console.log("'init_StyleUrl'案例失败" + e.name + ":" + e.message);
192+
expect(false).toBeTruthy();
193+
done();
194+
}
195+
});
181196
});
182197

183198
})

‎test/resources/MapboxStyles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var vectorstylesEscapedJson={
88
}
99
},
1010
"name": "California",
11-
"sprite": "http://iclsvr.supermap.io/iserver/services/map-mvt-California/rest/maps/California/tilefeature/mvtsprites/sprite@2x",
11+
"sprite": "../../base/resources/img/sprite@2x",
1212
"layers": [
1313
{
1414
"paint": {

‎test/resources/img/sprite.png

26 KB
Loading

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