diff --git a/test/test-class-abstract.js b/test/test-class-abstract.js index 3dde593..49e9b47 100644 --- a/test/test-class-abstract.js +++ b/test/test-class-abstract.js @@ -22,11 +22,10 @@ * @package test */ -var common = require( './common' ), - assert = require( 'assert' ), - Class = common.require( 'class' ), - abstractMethod = common.require( 'util' ).createAbstractMethod, - util = common.require( 'util' ); +var common = require( './common' ), + assert = require( 'assert' ), + Class = common.require( 'class' ), + util = common.require( 'util' ); // not abstract var Foo = Class.extend( {} ); @@ -68,22 +67,6 @@ var ConcreteFoo = AbstractFoo.extend( }); -assert.ok( - ( abstractMethod() instanceof Function ), - "abstractMethod() returns a function" -); - -assert.ok( - ( util.isAbstractMethod( abstractMethod() ) ), - "Functions returned by abstractMethod() are considered to be abstract by " + - "util.isAbstractMethod" -); - -assert.throws( function() -{ - abstractMethod()(); -}, Error, "Abstract methods cannot be called" ); - assert.ok( ( Foo.isAbstract instanceof Function ), "All classes should have an isAbstract() method" diff --git a/test/test-util-abstract.js b/test/test-util-abstract.js new file mode 100644 index 0000000..10185d3 --- /dev/null +++ b/test/test-util-abstract.js @@ -0,0 +1,45 @@ +/** + * Tests util abstract functions + * + * Copyright (C) 2010 Mike Gerwitz + * + * This file is part of ease.js. + * + * ease.js is free software: you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @author Mike Gerwitz + * @package test + */ + +var common = require( './common' ), + assert = require( 'assert' ), + util = common.require( 'util' ); + + +assert.ok( + ( util.createAbstractMethod() instanceof Function ), + "abstractMethod() returns a function" +); + +assert.ok( + ( util.isAbstractMethod( util.createAbstractMethod() ) ), + "Functions returned by abstractMethod() are considered to be abstract by " + + "util.isAbstractMethod" +); + +assert.throws( function() +{ + util.createAbstractMethod()(); +}, Error, "Abstract methods cannot be called" ); +