Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix unit test for sprite #3870

Merged
merged 1 commit into from Feb 21, 2019
Merged

fix unit test for sprite #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion cocos2d/core/renderer/canvas/renderers/sprite/index.js
View file
Open in desktop
Expand Up @@ -30,6 +30,11 @@ let simple = require('./simple');
let sliced = require('./sliced');
let tiled = require('./tiled');

if (CC_TEST) {
// 2.x not support test with the canvas simple, in order to test in local test construct.
cc._Test._spriteWebGLAssembler = require('../../../webgl/assemblers/sprite/index.js');
}

module.exports = {
getAssembler: function (sprite) {
switch (sprite.type) {
Expand All @@ -52,4 +57,4 @@ module.exports = {
createData (sprite) {
return sprite._assembler.createData(sprite);
}
};
};
30 changes: 19 additions & 11 deletions test/qunit/unit-es5/test-spriteRenderer.js
View file
Open in desktop
@@ -1,6 +1,13 @@
largeModule('Sprite');

var originalAssembler = cc.Sprite._assembler;
var originalCalDynamicAtlas = cc.Sprite.prototype._calDynamicAtlas;

test('basic test', function () {
//
cc.Sprite._assembler = cc._Test._spriteWebGLAssembler;
cc.Sprite.prototype._calDynamicAtlas = function () {};

var url = assetDir + '/button.png';

var node = new cc.Node();
Expand Down Expand Up @@ -143,8 +150,8 @@ if (!isPhantomJS) {
var vertices = sprite._renderData._data;
var uvs = sprite._spriteFrame.uvSliced;

strictEqual(uvs.length == 16, true, 'have 16 uvs');
strictEqual(vertices.length == 20, true, 'have 20 vertices');
strictEqual(uvs.length === 16, true, 'have 16 uvs');
strictEqual(vertices.length === 20, true, 'have 20 vertices');
strictEqual(vertices[4].x, 0, 'x0 test success');
strictEqual(vertices[4].y, 0, 'y0 test success');
strictEqual(vertices[9].x, 5, 'x1 test success');
Expand Down Expand Up @@ -190,8 +197,9 @@ if (!isPhantomJS) {

sprite._assembler.updateRenderData(sprite);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改为

let assembler = cc._Test._spriteWebGLAssembler.getAssembler(sprite);
sprite._calDynamicAtlas = function () {};
assembler.updateRenderData(sprite);

var vertices = sprite._renderData._data;
var uvs = sprite._spriteFrame.uv;

strictEqual(vertices.length == 8, true, 'have 8 vertices');
strictEqual(vertices.length === 8, true, 'have 8 vertices');
strictEqual(vertices[0].x, 0, 'x0 test success');
strictEqual(vertices[1].x, 40, 'x1 test success');
strictEqual(vertices[2].x, 80, 'x2 test success');
Expand All @@ -200,14 +208,10 @@ if (!isPhantomJS) {
strictEqual(vertices[1].y, 60, 'y1 test success');
strictEqual(vertices[2].y, 100, 'y2 test success');
//
deepClose(vertices[0].u, 10 / 100, 0.01, 'full quad u0 test success');
deepClose(vertices[0].v, 70 / 100, 0.01, 'full quad v0 test success');
deepClose(vertices[3].u, 50 / 100, 0.01, 'full quad u1 test success');
deepClose(vertices[3].v, 10 / 100, 0.01, 'full quad v1 test success');
deepClose(vertices[4].u, 10 / 100, 0.01, 'part quad u0 test success');
deepClose(vertices[4].v, 70 / 100, 0.01, 'part quad v0 test success');
deepClose(vertices[7].u, 30 / 100, 0.01, 'part quad u1 test success');
deepClose(vertices[7].v, 30 / 100, 0.01, 'part quad v1 test success');
deepClose(uvs[0], 10 / 100, 0.01, 'full quad u0 test success');
deepClose(uvs[1], 70 / 100, 0.01, 'full quad v0 test success');
deepClose(uvs[6], 50 / 100, 0.01, 'full quad u1 test success');
deepClose(uvs[7], 10 / 100, 0.01, 'full quad v1 test success');
};
if (spriteFrame.textureLoaded()) {
testCallBack();
Expand Down Expand Up @@ -364,6 +368,10 @@ if (!isPhantomJS) {
deepClose(vertices[4].y, p1.y, 0.01, 'p1 test success');
deepClose(vertices[5].x, p2.x, 0.01, 'p2 test success');
deepClose(vertices[5].y, p2.y, 0.01, 'p2 test success');

//
cc.Sprite._assembler = originalAssembler;
cc.Sprite.prototype._calDynamicAtlas = originalCalDynamicAtlas;
};
if (spriteFrame.textureLoaded()) {
testCallBack();
Expand Down