Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit fc719cf

Browse files
nezroynezroy
committed
update specs to reference common testprops
1 parent b8ca621 commit fc719cf

6 files changed

Lines changed: 39 additions & 25 deletions

File tree

‎test/spec/SDD.Source.spec.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22

3+
var props = require("../testprops.js");
34
var EVEoj = require("../../src/EVEoj.js");
45

56
var SDD;
@@ -63,11 +64,11 @@ describe("SDD.Source.LoadMeta", function() {
6364
it("returns a promise", function() {
6465
if (EVEoj.Utils.isBrowser) {
6566
SDD = EVEoj.SDD.Create("json", {
66-
path: "http://eve-oj.dev/sdd/105658"
67+
path: props.SDD_URL_path
6768
});
6869
} else {
6970
SDD = EVEoj.SDD.Create("json", {
70-
path: "D:\\projects\\xyjax\\static\\sdd\\105658"
71+
path: props.SDD_file_path
7172
});
7273
}
7374
promise2 = SDD.LoadMeta();
@@ -97,9 +98,9 @@ describe("SDD.Source", function() {
9798
});
9899
});
99100
it("has valid metainfo", function() {
100-
expect(SDD.version).toEqual(105658);
101-
expect(SDD.verdesc).toEqual("Oceanus 1.0");
102-
expect(SDD.schema).toEqual(100038);
101+
expect(SDD.version).toEqual(props.SDD_version);
102+
expect(SDD.verdesc).toEqual(props.SDD_verdesc);
103+
expect(SDD.schema).toEqual(props.SDD_schema);
103104
});
104105
it("has expected tables", function() {
105106
var schema_100038 = [

‎test/spec/SDD.Table.spec.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22

3+
var props = require("../testprops.js");
34
var EVEoj = require("../../src/EVEoj.js");
45

56
var SDD;
@@ -9,6 +10,8 @@ var promise_done;
910
var promise_fail;
1011
var progress_counter;
1112

13+
var inv_types_size = 22328;
14+
1215
function promise_wait() {
1316
if (promise_done) return true;
1417
return false;
@@ -32,11 +35,11 @@ describe("SDD.Table setup", function() {
3235
it("loads a valid source", function() {
3336
if (EVEoj.Utils.isBrowser) {
3437
SDD = EVEoj.SDD.Create("json", {
35-
path: "http://eve-oj.dev/sdd/105658"
38+
path: props.SDD_URL_path
3639
});
3740
} else {
3841
SDD = EVEoj.SDD.Create("json", {
39-
path: "D:\\projects\\xyjax\\static\\sdd\\105658"
42+
path: props.SDD_file_path
4043
});
4144
}
4245
expect(SDD).not.toBeNull(null);
@@ -58,9 +61,9 @@ describe("SDD.Table setup", function() {
5861
});
5962
});
6063
it("has valid metainfo", function() {
61-
expect(SDD.version).toEqual(105658);
62-
expect(SDD.verdesc).toEqual("Oceanus 1.0");
63-
expect(SDD.schema).toEqual(100038);
64+
expect(SDD.version).toEqual(props.SDD_version);
65+
expect(SDD.verdesc).toEqual(props.SDD_verdesc);
66+
expect(SDD.schema).toEqual(props.SDD_schema);
6467
});
6568
});
6669

@@ -119,7 +122,7 @@ describe("SDD.Table", function() {
119122
});
120123
it("has expected data", function() {
121124
expect(table.length).toEqual(table.loaded);
122-
expect(table.length).toEqual(21975);
125+
expect(table.length).toEqual(inv_types_size);
123126
});
124127
it("returns null for non-existent entries", function() {
125128
expect(table.GetEntry(60000000)).toBeNull();
@@ -193,7 +196,7 @@ describe("SDD.Table partial", function() {
193196
});
194197
it("has expected data", function() {
195198
expect(table.loaded).toEqual(7500);
196-
expect(table.length).toEqual(21975);
199+
expect(table.length).toEqual(inv_types_size);
197200
expect(table.segments[0].loaded).toEqual(true);
198201
expect(table.segments[1].loaded).toEqual(false);
199202
});
@@ -265,7 +268,7 @@ describe("SDD.Table remaining", function() {
265268
});
266269
it("has expected data", function() {
267270
expect(table.loaded).toEqual(table.length);
268-
expect(table.length).toEqual(21975);
271+
expect(table.length).toEqual(inv_types_size);
269272
expect(table.segments[0].loaded).toEqual(true);
270273
expect(table.segments[1].loaded).toEqual(true);
271274
expect(table.segments[2].loaded).toEqual(true);

‎test/spec/SDD.spec.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22

3+
var props = require("../testprops.js");
34
var EVEoj = require("../../src/EVEoj.js");
45

56
describe("SDD.Create", function() {
@@ -11,11 +12,11 @@ describe("SDD.Create", function() {
1112
var SDD;
1213
if (EVEoj.Utils.isBrowser) {
1314
SDD = EVEoj.SDD.Create("json", {
14-
path: "http://eve-oj.dev/sdd/105658"
15+
path: props.SDD_URL_path
1516
});
1617
} else {
1718
SDD = EVEoj.SDD.Create("json", {
18-
path: "D:\\projects\\xyjax\\static\\sdd\\105658"
19+
path: props.SDD_file_path
1920
});
2021
}
2122
expect(SDD).not.toBeNull(null);

‎test/spec/map.System.spec.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22

3+
var props = require("../testprops.js");
34
var EVEoj = require("../../src/EVEoj.js");
45

56
var SDD;
@@ -28,11 +29,11 @@ describe("map.System setup", function() {
2829
it("loads a valid source", function() {
2930
if (EVEoj.Utils.isBrowser) {
3031
SDD = EVEoj.SDD.Create("json", {
31-
path: "http://eve-oj.dev/sdd/105658"
32+
path: props.SDD_URL_path
3233
});
3334
} else {
3435
SDD = EVEoj.SDD.Create("json", {
35-
path: "D:\\projects\\xyjax\\static\\sdd\\105658"
36+
path: props.SDD_file_path
3637
});
3738
}
3839
expect(SDD).not.toBeNull(null);
@@ -54,9 +55,9 @@ describe("map.System setup", function() {
5455
});
5556
});
5657
it("has valid metainfo", function() {
57-
expect(SDD.version).toEqual(105658);
58-
expect(SDD.verdesc).toEqual("Oceanus 1.0");
59-
expect(SDD.schema).toEqual(100038);
58+
expect(SDD.version).toEqual(props.SDD_version);
59+
expect(SDD.verdesc).toEqual(props.SDD_verdesc);
60+
expect(SDD.schema).toEqual(props.SDD_schema);
6061
});
6162
it("returns a new object for a valid type", function() {
6263
map = EVEoj.map.Create(SDD, "K");

‎test/spec/map.spec.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22

3+
var props = require("../testprops.js");
34
var EVEoj = require("../../src/EVEoj.js");
45

56
var SDD;
@@ -69,11 +70,11 @@ describe("map setup", function() {
6970
it("loads a valid source", function() {
7071
if (EVEoj.Utils.isBrowser) {
7172
SDD = EVEoj.SDD.Create("json", {
72-
path: "http://eve-oj.dev/sdd/105658"
73+
path: props.SDD_URL_path
7374
});
7475
} else {
7576
SDD = EVEoj.SDD.Create("json", {
76-
path: "D:\\projects\\xyjax\\static\\sdd\\105658"
77+
path: props.SDD_file_path
7778
});
7879
}
7980
expect(SDD).not.toBeNull(null);
@@ -95,9 +96,9 @@ describe("map setup", function() {
9596
});
9697
});
9798
it("has valid metainfo", function() {
98-
expect(SDD.version).toEqual(105658);
99-
expect(SDD.verdesc).toEqual("Oceanus 1.0");
100-
expect(SDD.schema).toEqual(100038);
99+
expect(SDD.version).toEqual(props.SDD_version);
100+
expect(SDD.verdesc).toEqual(props.SDD_verdesc);
101+
expect(SDD.schema).toEqual(props.SDD_schema);
101102
});
102103
});
103104

‎test/testprops.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
exports.SDD_file_path = "D:\\projects\\xyjax\\static\\sdd\\109013";
4+
exports.SDD_URL_path = "http://eve-oj.dev/sdd/109013";
5+
exports.SDD_version = 109013;
6+
exports.SDD_verdesc = "Rhea 1.0";
7+
exports.SDD_schema = 109013;

0 commit comments

Comments
 (0)