Skip to content

Commit

Permalink
add code coverage statistics
Browse files Browse the repository at this point in the history
  • Loading branch information
biasmv committed Jan 24, 2015
1 parent a97b9b7 commit 9f3fbb6
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 33 deletions.
40 changes: 40 additions & 0 deletions js/blanket.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ PV.prototype = {
},

cartoon : function(name, structure, opts) {
var options = this._handleStandardOptions(opts, structure);
var options = this._handleStandardMolOptions(opts, structure);
options.color = options.color || color.bySS();
options.strength = options.strength || 1.0;
options.splineDetail = options.splineDetail || this.options('splineDetail');
Expand Down
51 changes: 26 additions & 25 deletions tests/all.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,34 @@
</td>
</tr></table>
<script src="/js/qunit.js"></script>
<script src='/js/blanket.min.js'></script>
<script src="/tests/assertions.js"></script>
<script src='/src/gl-matrix.js'></script>
<script src='/src/core.js'></script>
<script src='/src/geom.js'></script>
<script src='/src/trace.js'></script>
<script src='/src/symmetry.js'></script>
<script src='/src/mol.js'></script>
<script src='/src/io.js'></script>
<script src='/src/vert-assoc.js'></script>
<script src='/src/buffer-allocators.js'></script>
<script src='/src/vertex-array-base.js'></script>
<script src='/src/indexed-vertex-array.js'></script>
<script src='/src/vertex-array.js'></script>
<script src='/src/chain-data.js'></script>
<script src='/src/geom-builders.js'></script>
<script src='/src/scene.js'></script>
<script src='/src/render.js'></script>
<script src='/src/shade.js'></script>
<script src='/src/cam.js'></script>
<script src='/src/shaders.js'></script>
<script src='/src/framebuffer.js'></script>
<script src='/src/slab.js'></script>
<script src='/src/animation.js'></script>
<script src='/src/touch.js'></script>
<script src='/src/custom-mesh.js'></script>
<script src='/src/viewer.js'></script>
<script src='/src/viewpoint.js'></script>
<script src='/src/core.js' data-cover></script>
<script src='/src/geom.js' data-cover></script>
<script src='/src/trace.js' data-cover></script>
<script src='/src/symmetry.js' data-cover></script>
<script src='/src/mol.js' data-cover></script>
<script src='/src/io.js' data-cover></script>
<script src='/src/vert-assoc.js' data-cover></script>
<script src='/src/buffer-allocators.js' data-cover></script>
<script src='/src/vertex-array-base.js' data-cover></script>
<script src='/src/indexed-vertex-array.js' data-cover></script>
<script src='/src/vertex-array.js' data-cover></script>
<script src='/src/chain-data.js' data-cover></script>
<script src='/src/geom-builders.js' data-cover></script>
<script src='/src/scene.js' data-cover></script>
<script src='/src/render.js' data-cover></script>
<script src='/src/shade.js' data-cover></script>
<script src='/src/cam.js' data-cover></script>
<script src='/src/shaders.js' data-cover></script>
<script src='/src/framebuffer.js' data-cover></script>
<script src='/src/slab.js' data-cover></script>
<script src='/src/animation.js' data-cover></script>
<script src='/src/touch.js' data-cover></script>
<script src='/src/custom-mesh.js' data-cover></script>
<script src='/src/viewer.js' data-cover></script>
<script src='/src/viewpoint.js' data-cover></script>
<script src="/tests/binary-search.js"></script>
<script src="/tests/mol-iterators.js"></script>
<script src="/tests/colors.js"></script>
Expand Down
19 changes: 12 additions & 7 deletions tests/viewer-render.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ test('renders molecule asymmetric units in all styles', function(assert) {
for (var i = 0; i < ALL_STYLES.length; ++i) {
var obj = viewer.renderAs(ALL_STYLES[i], structure, ALL_STYLES[i]);
assert.ok(!!obj);
viewer.clear();
}
viewer.destroy();

done();
// this make sure we get one draw before tearing everything down and
// increases code coverage.
setTimeout(function() {
viewer.destroy();
done();
}, 100);
});
});

Expand All @@ -35,10 +37,13 @@ test('renders molecule assembly 1 in all styles', function(assert) {
var obj = viewer.renderAs(ALL_STYLES[i], structure,
ALL_STYLES[i], { showRelated : '1'});
assert.ok(!!obj);
viewer.clear();
}
viewer.destroy();
done();
// this make sure we get one draw before tearing everything down and
// increases code coverage.
setTimeout(function() {
viewer.destroy();
done();
}, 100);
});
});

Expand Down

0 comments on commit 9f3fbb6

Please sign in to comment.