1
0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-08-24 14:33:02 +02:00

Clean code.

This commit is contained in:
Lars Jung
2015-04-22 19:34:35 +02:00
parent c396800dfa
commit 882bf8ae11
17 changed files with 202 additions and 148 deletions

View File

@@ -59,25 +59,34 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.sub()', function () {
it('.sub() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.sub);
});
});
it('.unsub() is function', function () {
describe('.unsub()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.unsub);
});
});
it('.pub() is function', function () {
describe('.pub()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.pub);
});
});
describe('works', function () {
it('works', function () {

View File

@@ -59,33 +59,24 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.setDefaultMetric()', function () {
it('.setDefaultMetric() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.setDefaultMetric);
});
});
it('.formatSize() is function', function () {
describe('.formatSize()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.formatSize);
});
it('.setDefaultDateFormat() is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.setDefaultDateFormat);
});
it('.formatDate() is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.formatDate);
});
it('.formatSize() defaults to decimal metric', function () {
it('defaults to decimal metric', function () {
var instance = this.applyFn();
assert.strictEqual(instance.formatSize(1024), '1 KB');
@@ -95,7 +86,7 @@ describe('module "' + ID + '"', function () {
assert.strictEqual(instance.formatSize(1024), '1 KB');
});
describe('.formatSize() with decimal metric', function () {
describe('decimal metric', function () {
_.each([
[0, '0 B'],
@@ -130,7 +121,7 @@ describe('module "' + ID + '"', function () {
});
});
describe('.formatSize() with binary metric', function () {
describe('binary metric', function () {
_.each([
[0, '0 B'],
@@ -165,8 +156,26 @@ describe('module "' + ID + '"', function () {
});
});
});
});
it('.formatDate() with default format', function () {
describe('.setDefaultDateFormat()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.setDefaultDateFormat);
});
});
describe('.formatDate()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.formatDate);
});
it('default format', function () {
var instance = this.applyFn();
assert.strictEqual(instance.formatDate(0), '');
@@ -187,26 +196,23 @@ describe('module "' + ID + '"', function () {
assert.strictEqual(instance.formatDate(1400000000000), '18 14 20');
});
describe('.formatDate()', function () {
_.each([
[0, 'YYYY-MM-DD HH:mm:ss', ''],
[1000, 'YYYY-MM-DD HH:mm:ss', '1970-01-01 01:00:01'],
[-1000, 'YYYY-MM-DD HH:mm:ss', '1970-01-01 00:59:59'],
[1400000000000, 'YYYY-MM-DD HH:mm:ss', '2014-05-13 18:53:20'],
[1400000000000, 'XYYYYXMMXDDXHHXmmXssX', 'X2014X05X13X18X53X20X'],
[1400000000000, 'YYYY YY Y MM M DD D HH H mm m ss s', '2014 14 2014 05 5 13 13 18 18 53 53 20 20']
], function (data) {
_.each([
[0, 'YYYY-MM-DD HH:mm:ss', ''],
[1000, 'YYYY-MM-DD HH:mm:ss', '1970-01-01 01:00:01'],
[-1000, 'YYYY-MM-DD HH:mm:ss', '1970-01-01 00:59:59'],
[1400000000000, 'YYYY-MM-DD HH:mm:ss', '2014-05-13 18:53:20'],
[1400000000000, 'XYYYYXMMXDDXHHXmmXssX', 'X2014X05X13X18X53X20X'],
[1400000000000, 'YYYY YY Y MM M DD D HH H mm m ss s', '2014 14 2014 05 5 13 13 18 18 53 53 20 20']
], function (data) {
var arg1 = data[0];
var arg2 = data[1];
var exp = data[2];
var arg1 = data[0];
var arg2 = data[1];
var exp = data[2];
it('.formatDate(' + arg1 + ', ' + arg2 + ') => "' + exp + '"', function () {
it('.formatDate(' + arg1 + ', ' + arg2 + ') => "' + exp + '"', function () {
var instance = this.applyFn();
assert.strictEqual(instance.formatDate(arg1, arg2), exp);
});
var instance = this.applyFn();
assert.strictEqual(instance.formatDate(arg1, arg2), exp);
});
});
});

View File

@@ -73,81 +73,78 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.forceEncoding()', function () {
describe('.forceEncoding()', function () {
it('is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.forceEncoding);
});
});
var instance = this.applyFn();
assert.isFunction(instance.forceEncoding);
});
describe('.getDomain()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.getDomain);
});
describe('.getDomain()', function () {
it('returns document.domain', function () {
it('is function', function () {
var instance = this.applyFn();
assert.strictEqual(instance.getDomain(), document.domain);
});
});
var instance = this.applyFn();
assert.isFunction(instance.getDomain);
});
describe('.getAbsHref()', function () {
it('returns document.domain', function () {
it('is function', function () {
var instance = this.applyFn();
assert.strictEqual(instance.getDomain(), document.domain);
});
var instance = this.applyFn();
assert.isFunction(instance.getAbsHref);
});
describe('.getAbsHref()', function () {
it('returns null before .setLocation()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.getAbsHref);
});
it('returns null before .setLocation()', function () {
var instance = this.applyFn();
assert.isNull(instance.getAbsHref());
});
var instance = this.applyFn();
assert.isNull(instance.getAbsHref());
});
});
describe('.getItem()', function () {
describe('.getItem()', function () {
it('is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.getItem);
});
var instance = this.applyFn();
assert.isFunction(instance.getItem);
});
});
describe('.setLocation()', function () {
describe('.setLocation()', function () {
it('is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.setLocation);
});
var instance = this.applyFn();
assert.isFunction(instance.setLocation);
});
});
describe('.refresh()', function () {
describe('.refresh()', function () {
it('is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.refresh);
});
var instance = this.applyFn();
assert.isFunction(instance.refresh);
});
});
describe('.setLink()', function () {
describe('.setLink()', function () {
it('is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.setLink);
});
var instance = this.applyFn();
assert.isFunction(instance.setLink);
});
});
});

View File

@@ -77,15 +77,15 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.set()', function () {
it('.set() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.ok(_.isFunction(instance.set));
});
it('.set() works', function () {
it('works', function () {
var instance = this.applyFn();

View File

@@ -16,7 +16,7 @@ describe('module "' + ID + '"', function () {
b: 'myTheme/b.jpg'
}
};
this.xSettings = {appHref: '/some/app/href/'};
this.xSettings = {appHref: util.uniqPath('/appHref/')};
this.applyFn = function () {
return this.definition.fn(_, this.xConfig, this.xSettings);
@@ -66,21 +66,15 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.image()', function () {
it('.image() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.image);
});
it('.icon() is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.icon);
});
it('.image() works', function () {
it('works', function () {
var instance = this.applyFn();
var ui = this.xSettings.appHref + 'client/images/ui/';
@@ -90,8 +84,17 @@ describe('module "' + ID + '"', function () {
assert.strictEqual(instance.image(''), ui + '.svg');
assert.strictEqual(instance.image('a'), ui + 'a.svg');
});
});
it('.icon() works', function () {
describe('.icon()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.icon);
});
it('works', function () {
var instance = this.applyFn();
var themes = this.xSettings.appHref + 'client/images/themes/';

View File

@@ -98,21 +98,27 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.backend', function () {
it('.backend is set correct', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.backend, this.xConfig.setup.BACKEND);
});
});
it('.name is set correct', function () {
describe('.name', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.name, this.xConfig.setup.SERVER_NAME);
});
});
it('.version is set correct', function () {
describe('.version', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.version, this.xConfig.setup.SERVER_VERSION);

View File

@@ -73,7 +73,7 @@ describe('module "' + ID + '"', function () {
describe('publics', function () {
it('are extended from options', function () {
it('extended from options', function () {
var instance = this.applyFn();
assert.strictEqual(instance.someOptions, this.xConfig.options.someOptions);
@@ -81,20 +81,29 @@ describe('module "' + ID + '"', function () {
assert.strictEqual(instance.more, this.xConfig.options.more);
assert.strictEqual(_.keys(instance).length, _.keys(this.xConfig.options).length + 3);
});
});
it('.appHref is set correct', function () {
describe('.appHref', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.appHref, this.xConfig.setup.APP_HREF);
});
});
it('.rootHref is set correct', function () {
describe('.rootHref', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.rootHref, this.xConfig.setup.ROOT_HREF);
});
});
it('.currentHref is set correct', function () {
describe('.currentHref', function () {
it('set correct', function () {
var instance = this.applyFn();
assert.strictEqual(instance.currentHref, this.xConfig.setup.CURRENT_HREF);

View File

@@ -71,27 +71,32 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.put()', function () {
var key1 = 'test1';
var value1 = '1234';
var key2 = 'test2';
var value2 = '5678';
it('.put() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.put);
});
});
it('.get() is function', function () {
describe('.get()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.get);
});
});
describe('works', function () {
it('works', function () {
var key1 = 'test1';
var value1 = '1234';
var key2 = 'test2';
var value2 = '5678';
var instance = this.applyFn();
assert.isNull(window.localStorage.getItem(this.storeKey));

View File

@@ -64,15 +64,15 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.getType()', function () {
it('.getType() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.getType);
});
it('.getType() works', function () {
it('works', function () {
var instance = this.applyFn();
assert.strictEqual(instance.getType('file.a'), 'a');

View File

@@ -59,20 +59,14 @@ describe('module "' + ID + '"', function () {
});
});
describe('publics', function () {
describe('.regularCmpFn()', function () {
it('.regularCmpFn() is function', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.regularCmpFn);
});
it('.naturalCmpFn() is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.naturalCmpFn);
});
_.each([
[0, 0, 0],
[1, 0, 1],
@@ -93,6 +87,15 @@ describe('module "' + ID + '"', function () {
assert.strictEqual(instance.regularCmpFn(arg1, arg2), exp);
});
});
});
describe('.naturalCmpFn()', function () {
it('is function', function () {
var instance = this.applyFn();
assert.isFunction(instance.naturalCmpFn);
});
_.each([
[0, 0, 0],