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

Commit a51d164

Browse files
nezroynezroy
committed
Update table spec to Citadel 1.1 schema and data
1 parent ffdd5ce commit a51d164

1 file changed

Lines changed: 26 additions & 20 deletions

File tree

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

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var promise;
1616

1717
var progress_counter;
1818

19-
var inv_types_size = 22382;
19+
var inv_types_size = 28948;
2020

2121
function progress_track() {
2222
progress_counter++;
@@ -60,15 +60,14 @@ describe("SDD.Table pre-load", function() {
6060
it("has expected metainfo", function() {
6161
var table = SDD.GetTable("invTypes");
6262
var columns = [
63-
"typeID", "groupID", "typeName", "mass", "volume", "capacity", "portionSize",
64-
"raceID", "basePrice", "published", "marketGroupID", "chanceOfDuplicating", "iconID"
63+
"typeID", "groupID", "typeName", "marketGroupID", "published", "iconID"
6564
];
6665
expect(table.name).toEqual("invTypes");
6766
expect(table.keyname).toEqual("typeID");
6867
expect(table.columns).toEqual(columns);
6968
expect(table.segments.length).toEqual(1);
7069
expect(table.c.index).toEqual(0);
71-
expect(table.c.published).toEqual(9);
70+
expect(table.c.published).toEqual(4);
7271
});
7372
it("returns false for unknown entries", function() {
7473
expect(table.GetEntry(37)).toEqual(false);
@@ -112,7 +111,7 @@ describe("SDD.Table", function() {
112111
});
113112
it("has expected index data for entry", function() {
114113
var row = table.GetEntry(37);
115-
expect(row.length).toEqual(13);
114+
expect(row.length).toEqual(6);
116115
expect(row[0]).toEqual(37);
117116
expect(row[table.c.index]).toEqual(37);
118117
expect(row[table.c.typeID]).toEqual(37);
@@ -121,23 +120,16 @@ describe("SDD.Table", function() {
121120
var row = table.GetEntry(37);
122121
expect(row[table.c.groupID]).toEqual(18);
123122
expect(row[table.c.typeName]).toEqual("Isogen");
124-
expect(row[table.c.mass]).toEqual(0);
125-
expect(row[table.c.volume]).toEqual(0.01);
126-
expect(row[table.c.capacity]).toEqual(0);
127-
expect(row[table.c.portionSize]).toEqual(1);
128-
expect(row[table.c.raceID]).toEqual(0);
129-
expect(row[table.c.basePrice]).toEqual(128.00);
130123
expect(row[table.c.published]).toEqual(true);
131124
expect(row[table.c.marketGroupID]).toEqual(1857);
132-
expect(row[table.c.chanceOfDuplicating]).toEqual(0);
133125
expect(row[table.c.iconID]).toEqual(402);
134126
});
135127
});
136128

137129
describe("SDD.Table.Load partial", function() {
138130
it("returns a promise", function(done) {
139131
var table = SDD.GetTable("invTypesDesc");
140-
expect(table.segments.length).toEqual(3);
132+
expect(table.segments.length).toEqual(6);
141133
progress_counter = 0;
142134
promise = table.Load({
143135
key: 37,
@@ -161,10 +153,14 @@ describe("SDD.Table partial", function() {
161153
expect(progress_counter).toEqual(1);
162154
});
163155
it("has expected data", function() {
164-
expect(table.loaded).toEqual(7500);
156+
expect(table.loaded).toEqual(5000);
165157
expect(table.length).toEqual(inv_types_size);
166158
expect(table.segments[0].loaded).toEqual(true);
167159
expect(table.segments[1].loaded).toEqual(false);
160+
expect(table.segments[2].loaded).toEqual(false);
161+
expect(table.segments[3].loaded).toEqual(false);
162+
expect(table.segments[4].loaded).toEqual(false);
163+
expect(table.segments[5].loaded).toEqual(false);
168164
});
169165
it("returns null for non-existent entries", function() {
170166
expect(table.GetEntry(1)).toBeNull();
@@ -185,23 +181,30 @@ describe("SDD.Table partial", function() {
185181
});
186182
it("has expected index data for entry", function() {
187183
var row = table.GetEntry(37);
188-
expect(row.length).toEqual(3);
184+
expect(row.length).toEqual(17);
189185
expect(row[0]).toEqual(37);
190186
expect(row[table.c.index]).toEqual(37);
191187
expect(row[table.c.typeID]).toEqual(37);
192188
});
193189
it("has expected column data for entry", function() {
194190
var row = table.GetEntry(37);
195-
expect(row[table.c.description]).toEqual("Light-bluish crystal, formed by intense pressure deep within large asteroids and moons. Used in electronic and weapon manufacturing. Only found in abundance in a few areas.\n\nMay be obtained by reprocessing the following ores:\n\n<color='0xFFFF0000'>0.0</color> security status solar system or lower:\n<a href=showinfo:1229>Gneiss</a>, <a href=showinfo:17865>Iridescent Gneiss</a>, <a href=showinfo:17866>Prismatic Gneiss</a>\n\n<color='0xFFFF4D00'>0.2</color> security status solar system or lower:\n<a href=showinfo:21>Hedbergite</a>, <a href=showinfo:17440>Vitric Hedbergite</a>, <a href=showinfo:17441>Glazed Hedbergite</a>\n<a href=showinfo:1231>Hemorphite</a>, <a href=showinfo:17444>Vivid Hemorphite</a>, <a href=showinfo:17445>Radiant Hemorphite</a>\n\n<color='0xFF00FF00'>0.7</color> security status solar system or lower:\n<a href=showinfo:20>Kernite</a>, <a href=showinfo:17452>Luminous Kernite</a>, <a href=showinfo:17453>Fiery Kernite</a>\n<a href=showinfo:1227>Omber</a>, <a href=showinfo:17867>Silvery Omber</a>, <a href=showinfo:17868>Golden Omber</a>");
196-
expect(row[table.c.yamldata].hasOwnProperty("iconID")).toEqual(true);
197-
expect(row[table.c.yamldata].iconID).toEqual(402);
191+
expect(row[table.c.mass]).toEqual(0);
192+
expect(row[table.c.volume]).toEqual(0.01);
193+
expect(row[table.c.capacity]).toEqual(0);
194+
expect(row[table.c.portionSize]).toEqual(1);
195+
expect(row[table.c.raceID]).toEqual(null);
196+
expect(row[table.c.basePrice]).toEqual(128);
197+
expect(row[table.c.chanceOfDuplicating]).toEqual(0);
198+
expect(row[table.c.description]).toEqual(
199+
"Light-bluish crystal, formed by intense pressure deep within large asteroids and moons. Used in electronic and weapon manufacturing. Only found in abundance in a few areas.\r\n\r\nMay be obtained by reprocessing the following ores:\r\n\r\n<color='0xFFFF0000'>0.0</color> security status solar system or lower:\r\n<a href=showinfo:1232>Dark Ochre</a>, <a href=showinfo:17436>Onyx Ochre</a>, <a href=showinfo:17437>Obsidian Ochre</a>\r\n<a href=showinfo:1229>Gneiss</a>, <a href=showinfo:17865>Iridescent Gneiss</a>, <a href=showinfo:17866>Prismatic Gneiss</a>\r\n<a href=showinfo:19>Spodumain</a>, <a href=showinfo:17466>Bright Spodumain</a>, <a href=showinfo:17467>Gleaming Spodumain</a>\r\n\r\n<color='0xFFFF4D00'>0.2</color> security status solar system or lower:\r\n<a href=showinfo:21>Hedbergite</a>, <a href=showinfo:17440>Vitric Hedbergite</a>, <a href=showinfo:17441>Glazed Hedbergite</a>\r\n<a href=showinfo:1231>Hemorphite</a>, <a href=showinfo:17444>Vivid Hemorphite</a>, <a href=showinfo:17445>Radiant Hemorphite</a>\r\n\r\n<color='0xFF00FF00'>0.7</color> security status solar system or lower:\r\n<a href=showinfo:20>Kernite</a>, <a href=showinfo:17452>Luminous Kernite</a>, <a href=showinfo:17453>Fiery Kernite</a>\r\n<a href=showinfo:1227>Omber</a>, <a href=showinfo:17867>Silvery Omber</a>, <a href=showinfo:17868>Golden Omber</a>"
200+
);
198201
});
199202
});
200203

201204
describe("SDD.Table.Load remaining", function() {
202205
it("returns a promise", function(done) {
203206
var table = SDD.GetTable("invTypesDesc");
204-
expect(table.segments.length).toEqual(3);
207+
expect(table.segments.length).toEqual(6);
205208
progress_counter = 0;
206209
promise = table.Load({
207210
progress: progress_track
@@ -222,14 +225,17 @@ describe("SDD.Table remaining", function() {
222225
});
223226

224227
it("called progress tracker", function() {
225-
expect(progress_counter).toEqual(2);
228+
expect(progress_counter).toEqual(5);
226229
});
227230
it("has expected data", function() {
228231
expect(table.loaded).toEqual(table.length);
229232
expect(table.length).toEqual(inv_types_size);
230233
expect(table.segments[0].loaded).toEqual(true);
231234
expect(table.segments[1].loaded).toEqual(true);
232235
expect(table.segments[2].loaded).toEqual(true);
236+
expect(table.segments[3].loaded).toEqual(true);
237+
expect(table.segments[4].loaded).toEqual(true);
238+
expect(table.segments[5].loaded).toEqual(true);
233239
});
234240
it("returns null for non-existent entries", function() {
235241
expect(table.GetEntry(1)).toBeNull();

0 commit comments

Comments
 (0)