08a6e43 · unity8 · git.iko.soy

252 { tag: "Large", width: units.gu(38), index: 2 },

253 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },

254 { tag: "Fit", height: units.gu(38), size: "large", width: units.gu(19), index: 4 },

255+ { tag: "Horizontal", height: function() { return header.height }, index: 5},

255 ]

256 ]

256 }

257 }

257

258

269 }

270 }

270

271

271 if (data.hasOwnProperty("width")) {

272 if (data.hasOwnProperty("width")) {

273+ var width = typeof data.width === "function" ? data.width() : data.width;

272− tryCompare(art, "width", data.width);

274+ tryCompare(art, "width", width);

273 }

275 }

274

276

275 if (data.hasOwnProperty("height")) {

277 if (data.hasOwnProperty("height")) {

278+ var height = typeof data.height === "function" ? data.height() : data.height;

276− tryCompare(art, "height", data.height);

279+ tryCompare(art, "height", height);

277 }

280 }

278

281

279 if (data.hasOwnProperty("fill")) {

282 if (data.hasOwnProperty("fill")) {

281 }

284 }

282 }

285 }

283

286

284− function test_art_image_size_data() {

285− return [

286− { tag: "CardVerticalMedium", width: header.width, index: 0 },

287− { tag: "CardHorizontalMedium", height: header.height, index: 5 },

288− ]

289− }

290−

291− function test_art_image_size(data) {

292− selector.selectedIndex = data.index;

293−

294− if (data.hasOwnProperty("width")) {

295− tryCompare(artImage, "width", data.width);

296− }

297−

298− if (data.hasOwnProperty("height")) {

299− tryCompare(artImage, "height", data.height);

300− }

301− }

302−

303 function test_art_layout_data() {

287 function test_art_layout_data() {

304 return [

288 return [

305− { tag: "CardVertical", headerX: 0, index: 0 },

289+ { tag: "Vertical", left: function() { return 0 }, index: 0},

306− { tag: "CardHorizontal", headerX: artImage.width, index: 5 },

290+ { tag: "Horizontal", left: function() { return art.width }, index: 5 }

307 ];

291 ];

308 }

292 }

309

293

310 function test_art_layout(data) {

294 function test_art_layout(data) {

311 selector.selectedIndex = data.index;

295 selector.selectedIndex = data.index;

312

296

313− if (data.hasOwnProperty("headerX")) {

314− tryCompare(testCase.header.x, data.headerLeft, data.value);

297+ tryCompare(testCase.header, "x", data.left());

315− }

316 }

298 }

317

299

318 function test_header_layout_data() {

300 function test_header_layout_data() {

319 return [

301 return [

320− { tag: "CardVertical", top: art.y + art.height, left: card.x, index: 0 },

302+ { tag: "Vertical", top: function() { return art.y + art.height },

303+ left: function() { return art.x }, index: 0 },

304+ { tag: "Horizontal", top: function() { return art.y },

321− { tag: "CardHorizontal", top: art.x, left: art.x + art.width, index: 5 }

305+ left: function() { return art.x + art.width }, index: 5 }

322 ]

306 ]

323 }

307 }

324

308

325 function test_header_layout(data) {

309 function test_header_layout(data) {

326 selector.selectedIndex = data.index;

310 selector.selectedIndex = data.index;

327

311

328− tryCompare(testCase.header, "y", data.top);

312+ tryCompare(testCase.header, "y", data.top());

329−// XXX karni: Can't get this to pass:

330−// tryCompare(testCase.header, "x", data.left);

313+ tryCompare(testCase.header, "x", data.left());

331 }

314 }

332−

333 }

315 }

334}

316}