1bb0880 · unity8 · git.iko.soy

87 },

88 {

89 "name": "Art, header, summary - horizontal",

90− "layout": { "template": { "card-layout": "horizontal", "card-size": "medium" },

90+ "layout": { "template": { "card-layout": "horizontal" },

91 "components": JSON.parse(fullMapping) }

92 },

93 ]

219 { tag: "Small", width: units.gu(12), size: "small", index: 0 },

220 { tag: "Large", width: units.gu(38), size: "large", index: 0 },

221 { tag: "Wide", width: units.gu(18.5), aspect: 0.5, index: 0 },

222+ { tag: "Horizontal", width: units.gu(38), index: 5 },

222 ]

223 ]

223 }

224 }

224

225

298 tryCompare(artImage, "height", data.height);

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

299 }

300 }

301 }

301−

302− function test_card_horizontal_layout_data() {

303− return [

304− { tag: "Horizontal", width: units.gu(38), index: 5 }

305− ]

306− }

307−

308− function test_card_horizontal_layout(data) {

309− selector.selectedIndex = data.index;

310−

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

312− tryCompare(card, "width", data.width);

313− }

314− }

315

302

316− function test_art_anchors_data() {

303+ function test_art_layout_data() {

317 return [

304 return [

318 { tag: "CardVertical", headerX: 0, index: 0 },

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

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

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

320 ];

307 ];

321 }

308 }

322

309

323− function test_art_anchors(data) {

310+ function test_art_layout(data) {

324 selector.selectedIndex = data.index;

311 selector.selectedIndex = data.index;

325

312

326 if (data.hasOwnProperty("headerX")) {

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

328 }

315 }

329 }

316 }

330

317

331− function test_header_anchors_data() {

318+ function test_header_layout_data() {

332 return [

319 return [

333− { tag: "CardVertical", top: art.bottom, left: card.left, index: 0 },

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

334− { tag: "CardHorizontal", top: art.top, left: art.right, index: 5 }

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

335 ]

322 ]

336 }

323 }

337

324

338− function test_header_anchors(data) {

325+ function test_header_layout(data) {

339 selector.selectedIndex = data.index;

326 selector.selectedIndex = data.index;

340

327

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

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

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

342− tryCompare(testCase.header, "left", data.left);

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

343 }

331 }

344

332

345 }

333 }