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

Refactored ViewportQuadSpec #2987

Merged
merged 4 commits into from
Aug 31, 2015
Merged

Refactored ViewportQuadSpec #2987

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d5dfc0
Refactored ViewportQuadSpec
lilleyse Aug 31, 2015
d9d1326
Small fix
lilleyse Aug 31, 2015
d21069b
Removed clear commands
lilleyse Aug 31, 2015
ab5833d
Small fix
lilleyse Aug 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 24 additions & 42 deletions Specs/Scene/ViewportQuadSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ defineSuite([
'Renderer/ClearCommand',
'Renderer/Texture',
'Scene/Material',
'Specs/createCamera',
'Specs/createContext',
'Specs/createFrameState',
'Specs/pollToPromise',
'Specs/render'
'Specs/createScene',
'Specs/pollToPromise'
], function(
ViewportQuad,
BoundingRectangle,
Expand All @@ -20,44 +17,33 @@ defineSuite([
ClearCommand,
Texture,
Material,
createCamera,
createContext,
createFrameState,
pollToPromise,
render) {
createScene,
pollToPromise) {
"use strict";
/*global jasmine,describe,xdescribe,it,xit,expect,beforeEach,afterEach,beforeAll,afterAll,spyOn*/

var context;
var frameState;
var scene;
var viewportQuad;
var us;
var testImage;

beforeAll(function() {
context = createContext();
frameState = createFrameState();

scene = createScene();
return loadImage('./Data/Images/Red16x16.png').then(function(image) {
testImage = image;
});
});

afterAll(function() {
context.destroyForSpecs();
scene.destroyForSpecs();
});

beforeEach(function() {
viewportQuad = new ViewportQuad();
viewportQuad.rectangle = new BoundingRectangle(0, 0, 2, 2);

us = context.uniformState;
us.update(context, createFrameState(createCamera()));
});

afterEach(function() {
viewportQuad = viewportQuad && viewportQuad.destroy();
us = undefined;
scene.primitives.removeAll();
});

it('constructs with a rectangle', function() {
Expand All @@ -77,42 +63,40 @@ defineSuite([
new Color(1.0, 1.0, 1.0, 1.0));
});

it('throws when rendered with without a rectangle', function() {
it('throws when rendered without a rectangle', function() {
viewportQuad.rectangle = undefined;

expect(function() {
render(context, frameState, viewportQuad);
scene.primitives.add(viewportQuad);
Copy link
Contributor

Choose a reason for hiding this comment

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

Only put the part that we expect to throw in the callback so, here and below, move this above:

scene.primitives.add(viewportQuad);

scene.renderForSpecs();
}).toThrowDeveloperError();
});

it('throws when rendered with without a material', function() {
it('throws when rendered without a material', function() {
viewportQuad.material = undefined;

expect(function() {
render(context, frameState, viewportQuad);
scene.primitives.add(viewportQuad);
scene.renderForSpecs();
}).toThrowDeveloperError();
});

it('does not render when show is false', function() {
ClearCommand.ALL.execute(context);
expect(context.readPixels()).toEqual([0, 0, 0, 0]);

viewportQuad.show = false;
render(context, frameState, viewportQuad);
expect(context.readPixels()).toEqual([0, 0, 0, 0]);
expect(scene.renderForSpecs()).toEqual([0, 0, 0, 255]);
scene.primitives.add(viewportQuad);
expect(scene.renderForSpecs()).toEqual([0, 0, 0, 255]);
});

it('renders material', function() {
ClearCommand.ALL.execute(context);
expect(context.readPixels()).toEqual([0, 0, 0, 0]);

render(context, frameState, viewportQuad);
expect(context.readPixels()).not.toEqual([0, 0, 0, 0]);
expect(scene.renderForSpecs()).toEqual([0, 0, 0, 255]);
scene.primitives.add(viewportQuad);
expect(scene.renderForSpecs()).not.toEqual([0, 0, 0, 255]);
});

it('renders user created texture', function() {
var texture = new Texture({
context : context,
context : scene.context,
source : testImage
});

Expand All @@ -122,11 +106,9 @@ defineSuite([
pollToPromise(function() {
return viewportQuad.material._loadedImages.length !== 0;
}).then(function() {
ClearCommand.ALL.execute(context);
expect(context.readPixels()).toEqual([0, 0, 0, 0]);

render(context, frameState, viewportQuad);
expect(context.readPixels()).toEqual([255, 0, 0, 255]);
expect(scene.renderForSpecs()).toEqual([0, 0, 0, 255]);
scene.primitives.add(viewportQuad);
expect(scene.renderForSpecs()).toEqual([255, 0, 0, 255]);
});
});

Expand Down