diff --git a/Config/Options.js b/Config/Options.js index 35ebc30..cccc258 100644 --- a/Config/Options.js +++ b/Config/Options.js @@ -1,7 +1,7 @@ /** * Options class. * - * This is a generic options class for storing options. This is usefull for handling options in other modules + * This is a generic options class for storing options. This is useful for handling options in other modules * without redefining the same behaviour multiple times. * * @copyright Dennis Eichhorn @@ -9,82 +9,74 @@ * @version 1.0.0 * @since 1.0.0 */ -(function (jsOMS) -{ - "use strict"; +export class Options { + /** + * @constructor + * + * @since 1.0.0 + */ + constructor () + { + this.options = {}; + }; - /** @namespace jsOMS.Config */ - jsOMS.Autoloader.defineNamespace('jsOMS.Config'); + /** + * Set option. + * + * @param {int|string} key Option key + * @param {boolean|int|float|string|Array} value Option value + * @param {boolean} [overwrite] Overwrite value + * + * @return {boolean} + * + * @since 1.0.0 + */ + set (key, value, overwrite = false) + { + if (overwrite || typeof this.options[key] === 'undefined') { + this.options[key] = value; - jsOMS.Config.Options = class { - /** - * @constructor - * - * @since 1.0.0 - */ - constructor () - { - this.options = {}; - }; + return true; + } - /** - * Set option. - * - * @param {int|string} key Option key - * @param {boolean|int|float|string|Array} value Option value - * @param {boolean} [overwrite] Overwrite value - * - * @return {boolean} - * - * @since 1.0.0 - */ - set (key, value, overwrite = false) - { - if (overwrite || typeof this.options[key] === 'undefined') { - this.options[key] = value; + return false; + }; - return true; - } + /** + * Get option. + * + * @param {int|string} key Option key + * + * @return {boolean|int|float|string|Array} + * + * @since 1.0.0 + */ + get (key) + { + if (typeof this.options[key] !== 'undefined') { + return this.options[key]; + } - return false; - }; + return null; + }; - /** - * Get option. - * - * @param {int|string} key Option key - * - * @return {boolean|int|float|string|Array} - * - * @since 1.0.0 - */ - get (key) - { - if (typeof this.options[key] !== 'undefined') { - return this.options[key]; - } + /** + * Remove option. + * + * @param {int|string} key Option key + * + * @return {boolean} + * + * @since 1.0.0 + */ + remove (key) + { + if (typeof this.options[key] !== 'undefined') { + delete this.options[key]; - return null; - }; + return true; + } - /** - * Remove option. - * - * @param {int|string} key Option key - * - * @return {boolean} - * - * @since 1.0.0 - */ - remove (key) - { - if (typeof this.options[key] !== 'undefined') { - delete this.options[key]; - - return true; - } - - return false; - }; - } -}(window.jsOMS = window.jsOMS || {})); + return false; + }; +} diff --git a/tests/Account/AccountManagerTest.js b/tests/Account/AccountManagerTest.js index 4e55ca6..6af6c7f 100644 --- a/tests/Account/AccountManagerTest.js +++ b/tests/Account/AccountManagerTest.js @@ -1,4 +1,6 @@ -describe('AccounManagertTest', function () +import { AccountManager } from '../Account/AccountManager.js'; + +describe('AccountManagerTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('AccounManagertTest', function () { it('Testing default functionality', function () { - let obj = new jsOMS.Account.AccountManager(); + let obj = new AccountManager(); expect(obj.get(2)).toBe(null); }); @@ -16,8 +18,8 @@ describe('AccounManagertTest', function () { it('Testing default functionality', function () { - let obj = new jsOMS.Account.AccountManager(); - let acc = new jsOMS.Account.Account(); + let obj = new AccountManager(); + let acc = new Account(); obj.add(acc); expect(obj.get(0)).toBe(acc); diff --git a/tests/Account/AccountTest.js b/tests/Account/AccountTest.js index 4d0c825..ebf7276 100644 --- a/tests/Account/AccountTest.js +++ b/tests/Account/AccountTest.js @@ -1,3 +1,5 @@ +import { Account } from '../Account/Account.js'; + describe('AccountTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('AccountTest', function () { it('Testing default functionality', function () { - let obj = new jsOMS.Account.Account(); + let obj = new Account(); expect(obj.getId()).toBe(0); }); diff --git a/tests/Account/AccountTypeTest.js b/tests/Account/AccountTypeTest.js index b06288e..b2eeb79 100644 --- a/tests/Account/AccountTypeTest.js +++ b/tests/Account/AccountTypeTest.js @@ -1,3 +1,5 @@ +import { AccountType } from '../Account/AccountType.js'; + describe('AccountTypeTest', function () { "use strict"; @@ -6,13 +8,13 @@ describe('AccountTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Account.AccountType).length).toBe(2); + expect(Object.keys(AccountType).length).toBe(2); }); it('Testing values of enums', function () { - expect(jsOMS.Account.AccountType.USER).toBe(0); - expect(jsOMS.Account.AccountType.GROUP).toBe(1); + expect(AccountType.USER).toBe(0); + expect(AccountType.GROUP).toBe(1); }); }); }); diff --git a/tests/Asset/AssetManagerTest.js b/tests/Asset/AssetManagerTest.js index 65f443c..5efd51d 100644 --- a/tests/Asset/AssetManagerTest.js +++ b/tests/Asset/AssetManagerTest.js @@ -1,3 +1,5 @@ +import { AssetManager } from '../Asset/AssetManager.js'; + describe('AssetManagerTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('AssetManagerTest', function () { it('Testing default functionality', function () { - let asset = new jsOMS.Asset.AssetManager(); + let asset = new AssetManager(); expect(asset.get('invalid')).toBe(null); expect(asset.remove('invalid')).toBeFalsy(); }); @@ -16,7 +18,7 @@ describe('AssetManagerTest', function () { it('Testing asset interaction functionality', function () { - let asset = new jsOMS.Asset.AssetManager(), + let asset = new AssetManager(), base = window.location.href.substr(0, window.location.href.length - 15); asset.registerLoadedAssets(); diff --git a/tests/Config/OptionsTest.js b/tests/Config/OptionsTest.js index 13ad0ca..048c360 100644 --- a/tests/Config/OptionsTest.js +++ b/tests/Config/OptionsTest.js @@ -1,3 +1,5 @@ +import { Options } from '../Config/Options.js'; + describe('OptionsTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('OptionsTest', function () { it('Testing default functionality', function () { - let option = new jsOMS.Config.Options(); + let option = new Options(); expect(option.get('invalid')).toBe(null); expect(option.remove('invalid')).toBeFalsy(); }); @@ -16,7 +18,7 @@ describe('OptionsTest', function () { it('Testing set/get functionality', function () { - let option = new jsOMS.Config.Options(); + let option = new Options(); expect(option.set('a', 2)).toBeTruthy(); expect(option.get('a')).toBe(2); diff --git a/tests/DataStorage/LocalStorageTest.js b/tests/DataStorage/LocalStorageTest.js index 185110d..cb0c0d8 100644 --- a/tests/DataStorage/LocalStorageTest.js +++ b/tests/DataStorage/LocalStorageTest.js @@ -1,3 +1,5 @@ +import { LocalStorage } from '../DataStorage/LocalStorage.js'; + describe('LocalStorageTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('LocalStorageTest', function () { it('Testing default functionality', function () { - expect(jsOMS.DataStorage.LocalStorage.available()).toBeTruthy(); + expect(LocalStorage.available()).toBeTruthy(); }); }); }); diff --git a/tests/Event/EventManagerTest.js b/tests/Event/EventManagerTest.js index 72e2da4..eb69540 100644 --- a/tests/Event/EventManagerTest.js +++ b/tests/Event/EventManagerTest.js @@ -1,3 +1,5 @@ +import { EventManager } from '../Event/EventManager.js'; + describe('EventManagerTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('EventManagerTest', function () { it('Testing default functionality', function () { - let manager = new jsOMS.Event.EventManager(); + let manager = new EventManager(); expect(manager.hasOutstanding('invalid')).toBeFalsy(null); expect(manager.trigger('invalid')).toBeFalsy(null); @@ -18,7 +20,7 @@ describe('EventManagerTest', function () { it('Testing base functionality', function () { - let manager = new jsOMS.Event.EventManager(); + let manager = new EventManager(); expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy(); expect(manager.attach('group', function() { return true; }, false, false)).toBeTruthy(); @@ -30,7 +32,7 @@ describe('EventManagerTest', function () { it('Testing reset functionality', function () { - let manager = new jsOMS.Event.EventManager(); + let manager = new EventManager(); expect(manager.attach('group', function() { return true; }, false, true)).toBeTruthy(); manager.addGroup('group', 'id1'); @@ -47,7 +49,7 @@ describe('EventManagerTest', function () { it('Testing detach functionality', function () { - let manager = new jsOMS.Event.EventManager(); + let manager = new EventManager(); expect(manager.attach('group', function() { return true; }, false, true)).toBeTruthy(); manager.addGroup('group', 'id1'); @@ -64,7 +66,7 @@ describe('EventManagerTest', function () { it('Testing remove functionality', function () { - let manager = new jsOMS.Event.EventManager(); + let manager = new EventManager(); expect(manager.attach('group1', function() { return true; }, true, false)).toBeTruthy(); expect(manager.attach('group2', function() { return true; }, true, false)).toBeTruthy(); diff --git a/tests/Log/LogLevelTest.js b/tests/Log/LogLevelTest.js index df03d01..d96e5ba 100644 --- a/tests/Log/LogLevelTest.js +++ b/tests/Log/LogLevelTest.js @@ -1,3 +1,5 @@ +import { LogLevel } from '../../Log/LogLevel.js'; + describe('LogLevelTest', function () { "use strict"; @@ -6,19 +8,19 @@ describe('LogLevelTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Log.LogLevel).length).toBe(8); + expect(Object.keys(LogLevel).length).toBe(8); }); it('Testing values of enums', function () { - expect(jsOMS.Log.LogLevel.EMERGENCY).toBe('emergency'); - expect(jsOMS.Log.LogLevel.ALERT).toBe('alert'); - expect(jsOMS.Log.LogLevel.CRITICAL).toBe('critical'); - expect(jsOMS.Log.LogLevel.ERROR).toBe('error'); - expect(jsOMS.Log.LogLevel.WARNING).toBe('warning'); - expect(jsOMS.Log.LogLevel.NOTICE).toBe('notice'); - expect(jsOMS.Log.LogLevel.INFO).toBe('info'); - expect(jsOMS.Log.LogLevel.DEBUG).toBe('debug'); + expect(LogLevel.EMERGENCY).toBe('emergency'); + expect(LogLevel.ALERT).toBe('alert'); + expect(LogLevel.CRITICAL).toBe('critical'); + expect(LogLevel.ERROR).toBe('error'); + expect(LogLevel.WARNING).toBe('warning'); + expect(LogLevel.NOTICE).toBe('notice'); + expect(LogLevel.INFO).toBe('info'); + expect(LogLevel.DEBUG).toBe('debug'); }); }); }); diff --git a/tests/Log/LoggerTest.js b/tests/Log/LoggerTest.js index f2c612e..3321915 100644 --- a/tests/Log/LoggerTest.js +++ b/tests/Log/LoggerTest.js @@ -1,3 +1,5 @@ +import { Logger } from '../../Log/Logger.js'; + describe('LoggerTest', function () { "use strict"; @@ -8,7 +10,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.emergency(); expect(console.log).toHaveBeenCalled(); @@ -18,7 +20,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.alert(); expect(console.log).toHaveBeenCalled(); @@ -28,7 +30,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.critical(); expect(console.log).toHaveBeenCalled(); @@ -38,7 +40,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.error(); expect(console.log).toHaveBeenCalled(); @@ -48,7 +50,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.warning(); expect(console.log).toHaveBeenCalled(); @@ -58,7 +60,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.notice(); expect(console.log).toHaveBeenCalled(); @@ -68,7 +70,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.info(); expect(console.log).toHaveBeenCalled(); @@ -78,7 +80,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.debug(); expect(console.log).toHaveBeenCalled(); @@ -88,7 +90,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.log(); expect(console.log).toHaveBeenCalled(); @@ -98,7 +100,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.log(); expect(console.log).toHaveBeenCalled(); @@ -108,7 +110,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(true, false, false); + let log = new Logger(true, false, false); log.console(); expect(console.log).toHaveBeenCalled(); @@ -121,7 +123,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.emergency(); expect(console.log).not.toHaveBeenCalled(); @@ -131,7 +133,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.alert(); expect(console.log).not.toHaveBeenCalled(); @@ -141,7 +143,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.critical(); expect(console.log).not.toHaveBeenCalled(); @@ -151,7 +153,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.error(); expect(console.log).not.toHaveBeenCalled(); @@ -161,7 +163,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.warning(); expect(console.log).not.toHaveBeenCalled(); @@ -171,7 +173,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.notice(); expect(console.log).not.toHaveBeenCalled(); @@ -181,7 +183,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.info(); expect(console.log).not.toHaveBeenCalled(); @@ -191,7 +193,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.debug(); expect(console.log).not.toHaveBeenCalled(); @@ -201,7 +203,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.log(); expect(console.log).not.toHaveBeenCalled(); @@ -211,7 +213,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.log(); expect(console.log).not.toHaveBeenCalled(); @@ -221,7 +223,7 @@ describe('LoggerTest', function () { spyOn(console, 'log'); - let log = new jsOMS.Log.Logger(false, false, false); + let log = new Logger(false, false, false); log.console(); expect(console.log).toHaveBeenCalled(); diff --git a/tests/Message/Notification/NotificationLevelTest.js b/tests/Message/Notification/NotificationLevelTest.js index f7aa1b9..0e552dd 100644 --- a/tests/Message/Notification/NotificationLevelTest.js +++ b/tests/Message/Notification/NotificationLevelTest.js @@ -1,3 +1,5 @@ +import { NotificationLevel } from '../Message/Notification/NotificationLevel.js'; + describe('NotificationLevelTest', function () { "use strict"; @@ -6,16 +8,16 @@ describe('NotificationLevelTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Notification.NotificationLevel).length).toBe(4); + expect(Object.keys(NotificationLevel).length).toBe(4); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Notification.NotificationLevel.OK).toBe('ok'); - expect(jsOMS.Message.Notification.NotificationLevel.INFO).toBe('info'); - expect(jsOMS.Message.Notification.NotificationLevel.WARNING).toBe('warning'); - expect(jsOMS.Message.Notification.NotificationLevel.ERROR).toBe('error'); - expect(jsOMS.Message.Notification.NotificationLevel.HIDDEN).toBe('hidden'); + expect(NotificationLevel.OK).toBe('ok'); + expect(NotificationLevel.INFO).toBe('info'); + expect(NotificationLevel.WARNING).toBe('warning'); + expect(NotificationLevel.ERROR).toBe('error'); + expect(NotificationLevel.HIDDEN).toBe('hidden'); }); }); }); diff --git a/tests/Message/Notification/NotificationManagerTest.js b/tests/Message/Notification/NotificationManagerTest.js index 6b5d1bd..b4ed1df 100644 --- a/tests/Message/Notification/NotificationManagerTest.js +++ b/tests/Message/Notification/NotificationManagerTest.js @@ -1,3 +1,5 @@ +import { NotificationManager } from '../Message/Notification/NotificationManager.js'; + describe('NotificationManagerTest', function () { "use strict"; @@ -6,10 +8,10 @@ describe('NotificationManagerTest', function () { it('Testing default functionality', function () { - let manager = new jsOMS.Message.Notification.NotificationManager(); + let manager = new NotificationManager(); - expect(manager.getAppNotifier()).toEqual(jasmine.any(jsOMS.Message.Notification.App.AppNotification)); - expect(manager.getBrowserNotifier()).toEqual(jasmine.any(jsOMS.Message.Notification.Browser.BrowserNotification)); + expect(manager.getAppNotifier()).toEqual(jasmine.any(App.AppNotification)); + expect(manager.getBrowserNotifier()).toEqual(jasmine.any(Browser.BrowserNotification)); }); }); }); \ No newline at end of file diff --git a/tests/Message/Notification/NotificationMessageTest.js b/tests/Message/Notification/NotificationMessageTest.js index 7ade6b8..aed2f71 100644 --- a/tests/Message/Notification/NotificationMessageTest.js +++ b/tests/Message/Notification/NotificationMessageTest.js @@ -1,3 +1,5 @@ +import { NotificationMessage } from '../Message/Notification/NotificationMessage.js'; + describe('NotificationMessageTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('NotificationMessageTest', function () { it('Testing default functionality', function () { - let msg = new jsOMS.Message.Notification.NotificationMessage('ok', 'abc', 'def'); + let msg = new NotificationMessage('ok', 'abc', 'def'); expect(msg.status).toBe('ok'); expect(msg.title).toBe('abc'); diff --git a/tests/Message/Notification/NotificationTypeTest.js b/tests/Message/Notification/NotificationTypeTest.js index dddd2af..ff73770 100644 --- a/tests/Message/Notification/NotificationTypeTest.js +++ b/tests/Message/Notification/NotificationTypeTest.js @@ -1,3 +1,5 @@ +import { NotificationType } from '../Message/Notification/NotificationType.js'; + describe('NotificationTypeTest', function () { "use strict"; @@ -6,13 +8,13 @@ describe('NotificationTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Notification.NotificationType).length).toBe(2); + expect(Object.keys(NotificationType).length).toBe(2); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Notification.NotificationType.APP_NOTIFICATION).toBe(1); - expect(jsOMS.Message.Notification.NotificationType.BROWSER_NOTIFICATION).toBe(2); + expect(NotificationType.APP_NOTIFICATION).toBe(1); + expect(NotificationType.BROWSER_NOTIFICATION).toBe(2); }); }); }); diff --git a/tests/Message/Request/BrowserTypeTest.js b/tests/Message/Request/BrowserTypeTest.js index 7ab1bcc..96585d1 100644 --- a/tests/Message/Request/BrowserTypeTest.js +++ b/tests/Message/Request/BrowserTypeTest.js @@ -1,3 +1,5 @@ +import { BrowserType } from '../Message/Request/BrowserType.js'; + describe('BrowserTypeTest', function () { "use strict"; @@ -6,19 +8,19 @@ describe('BrowserTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Request.BrowserType).length).toBe(8); + expect(Object.keys(BrowserType).length).toBe(8); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Request.BrowserType.OPERA).toBe('opera'); - expect(jsOMS.Message.Request.BrowserType.FIREFOX).toBe('firefox'); - expect(jsOMS.Message.Request.BrowserType.SAFARI).toBe('safari'); - expect(jsOMS.Message.Request.BrowserType.IE).toBe('msie'); - expect(jsOMS.Message.Request.BrowserType.EDGE).toBe('edge'); - expect(jsOMS.Message.Request.BrowserType.CHROME).toBe('chrome'); - expect(jsOMS.Message.Request.BrowserType.BLINK).toBe('blink'); - expect(jsOMS.Message.Request.BrowserType.UNKNOWN).toBe('unknown'); + expect(BrowserType.OPERA).toBe('opera'); + expect(BrowserType.FIREFOX).toBe('firefox'); + expect(BrowserType.SAFARI).toBe('safari'); + expect(BrowserType.IE).toBe('msie'); + expect(BrowserType.EDGE).toBe('edge'); + expect(BrowserType.CHROME).toBe('chrome'); + expect(BrowserType.BLINK).toBe('blink'); + expect(BrowserType.UNKNOWN).toBe('unknown'); }); }); }); diff --git a/tests/Message/Request/OSTypeTest.js b/tests/Message/Request/OSTypeTest.js index f910234..f39fab2 100644 --- a/tests/Message/Request/OSTypeTest.js +++ b/tests/Message/Request/OSTypeTest.js @@ -1,3 +1,5 @@ +import { OSType } from '../Message/Request/OSType.js'; + describe('OSTypeTest', function () { "use strict"; @@ -6,26 +8,26 @@ describe('OSTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Request.OSType).length).toBe(25); + expect(Object.keys(OSType).length).toBe(25); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Request.OSType.WINDOWS_10).toBe('windows nt 10.0'); - expect(jsOMS.Message.Request.OSType.WINDOWS_81).toBe('windows nt 6.3'); - expect(jsOMS.Message.Request.OSType.WINDOWS_8).toBe('windows nt 6.2'); - expect(jsOMS.Message.Request.OSType.WINDOWS_7).toBe('windows nt 6.1'); - expect(jsOMS.Message.Request.OSType.WINDOWS_VISTA).toBe('windows nt 6.0'); - expect(jsOMS.Message.Request.OSType.WINDOWS_SERVER).toBe('windows nt 5.2'); - expect(jsOMS.Message.Request.OSType.WINDOWS_XP).toBe('windows nt 5.1'); - expect(jsOMS.Message.Request.OSType.WINDOWS_XP_2).toBe('windows xp'); - expect(jsOMS.Message.Request.OSType.LINUX).toBe('linux'); - expect(jsOMS.Message.Request.OSType.UBUNTU).toBe('ubuntu'); - expect(jsOMS.Message.Request.OSType.IPHONE).toBe('iphone'); - expect(jsOMS.Message.Request.OSType.IPAD).toBe('ipad'); - expect(jsOMS.Message.Request.OSType.ANDROID).toBe('android'); - expect(jsOMS.Message.Request.OSType.MOBILE).toBe('webos'); - expect(jsOMS.Message.Request.OSType.UNKNOWN).toBe('UNKNOWN'); + expect(OSType.WINDOWS_10).toBe('windows nt 10.0'); + expect(OSType.WINDOWS_81).toBe('windows nt 6.3'); + expect(OSType.WINDOWS_8).toBe('windows nt 6.2'); + expect(OSType.WINDOWS_7).toBe('windows nt 6.1'); + expect(OSType.WINDOWS_VISTA).toBe('windows nt 6.0'); + expect(OSType.WINDOWS_SERVER).toBe('windows nt 5.2'); + expect(OSType.WINDOWS_XP).toBe('windows nt 5.1'); + expect(OSType.WINDOWS_XP_2).toBe('windows xp'); + expect(OSType.LINUX).toBe('linux'); + expect(OSType.UBUNTU).toBe('ubuntu'); + expect(OSType.IPHONE).toBe('iphone'); + expect(OSType.IPAD).toBe('ipad'); + expect(OSType.ANDROID).toBe('android'); + expect(OSType.MOBILE).toBe('webos'); + expect(OSType.UNKNOWN).toBe('UNKNOWN'); }); }); }); diff --git a/tests/Message/Request/RequestMethodTest.js b/tests/Message/Request/RequestMethodTest.js index 8a28150..6e8f1be 100644 --- a/tests/Message/Request/RequestMethodTest.js +++ b/tests/Message/Request/RequestMethodTest.js @@ -1,3 +1,5 @@ +import { RequestMethod } from '../Message/Request/RequestMethod.js'; + describe('RequestMethodTest', function () { "use strict"; @@ -6,16 +8,16 @@ describe('RequestMethodTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Request.RequestMethod).length).toBe(5); + expect(Object.keys(RequestMethod).length).toBe(5); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Request.RequestMethod.POST).toBe('POST'); - expect(jsOMS.Message.Request.RequestMethod.GET).toBe('GET'); - expect(jsOMS.Message.Request.RequestMethod.PUT).toBe('PUT'); - expect(jsOMS.Message.Request.RequestMethod.DELETE).toBe('DELETE'); - expect(jsOMS.Message.Request.RequestMethod.HEAD).toBe('HEAD'); + expect(RequestMethod.POST).toBe('POST'); + expect(RequestMethod.GET).toBe('GET'); + expect(RequestMethod.PUT).toBe('PUT'); + expect(RequestMethod.DELETE).toBe('DELETE'); + expect(RequestMethod.HEAD).toBe('HEAD'); }); }); }); diff --git a/tests/Message/Request/RequestTest.js b/tests/Message/Request/RequestTest.js index fa18d68..72bda5d 100644 --- a/tests/Message/Request/RequestTest.js +++ b/tests/Message/Request/RequestTest.js @@ -1,3 +1,4 @@ + describe('RequestTest', function () { "use strict"; diff --git a/tests/Message/Request/RequestTypeTest.js b/tests/Message/Request/RequestTypeTest.js index 8bbd649..38b2419 100644 --- a/tests/Message/Request/RequestTypeTest.js +++ b/tests/Message/Request/RequestTypeTest.js @@ -1,3 +1,5 @@ +import { RequestType } from '../Message/Request/RequestType.js'; + describe('RequestTypeTest', function () { "use strict"; @@ -6,15 +8,15 @@ describe('RequestTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(4); + expect(Object.keys(RequestType).length).toBe(4); }); it('Testing values of enums', function () { - expect(jsOMS.Message.Request.RequestType.JSON).toBe('json'); - expect(jsOMS.Message.Request.RequestType.RAW).toBe('raw'); - expect(jsOMS.Message.Request.RequestType.FILE).toBe('file'); - expect(jsOMS.Message.Request.RequestType.URL_ENCODE).toBe('url'); + expect(RequestType.JSON).toBe('json'); + expect(RequestType.RAW).toBe('raw'); + expect(RequestType.FILE).toBe('file'); + expect(RequestType.URL_ENCODE).toBe('url'); }); }); }); diff --git a/tests/Message/Response/ResponseTypeTest.js b/tests/Message/Response/ResponseTypeTest.js index 9dee8ae..68e2a34 100644 --- a/tests/Message/Response/ResponseTypeTest.js +++ b/tests/Message/Response/ResponseTypeTest.js @@ -1,3 +1,5 @@ +import { ResponseType } from '../Message/Response/ResponseType.js'; + describe('ResponseTypeTest', function () { "use strict"; @@ -6,17 +8,17 @@ describe('ResponseTypeTest', function () { it('Testing amount of enums', function () { - expect(Object.keys(jjsOMS.Message.Response.ResponseType).length).toBe(6); + expect(Object.keys(ResponseType).length).toBe(6); }); it('Testing values of enums', function () { - expect(jjsOMS.Message.Response.ResponseType.TEXT).toBe('text'); - expect(jjsOMS.Message.Response.ResponseType.JSON).toBe('json'); - expect(jjsOMS.Message.Response.ResponseType.DOCUMENT).toBe('document'); - expect(jjsOMS.Message.Response.ResponseType.BLOB).toBe('blob'); - expect(jjsOMS.Message.Response.ResponseType.ARRAYBUFFER).toBe('arraybuffer'); - expect(jjsOMS.Message.Response.ResponseType.DEFAULT).toBe(''); + expect(ResponseType.TEXT).toBe('text'); + expect(ResponseType.JSON).toBe('json'); + expect(ResponseType.DOCUMENT).toBe('document'); + expect(ResponseType.BLOB).toBe('blob'); + expect(ResponseType.ARRAYBUFFER).toBe('arraybuffer'); + expect(ResponseType.DEFAULT).toBe(''); }); }); }); diff --git a/tests/SpecRunner.html b/tests/SpecRunner.html index ee73102..a18af94 100644 --- a/tests/SpecRunner.html +++ b/tests/SpecRunner.html @@ -13,75 +13,76 @@ - + - - + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - + + - - - + + + - - + + - + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - + + - - - + + + diff --git a/tests/Uri/HttpTest.js b/tests/Uri/HttpTest.js index 1c2760d..0bd8cad 100644 --- a/tests/Uri/HttpTest.js +++ b/tests/Uri/HttpTest.js @@ -1,3 +1,5 @@ +import { Http } from '../../Uri/Http.js'; + describe('HttpTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('HttpTest', function () { it('Testing php parsing mode', function () { - let parsed = jsOMS.Uri.Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); + let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); expect(parsed.scheme).toBe('http'); expect(parsed.user).toBe('username'); @@ -20,7 +22,7 @@ describe('HttpTest', function () it('Testing strict parsing mode', function () { - let parsed = jsOMS.Uri.Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'strict'); + let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'strict'); expect(parsed.scheme).toBe('http'); expect(parsed.user).toBe('username'); @@ -34,7 +36,7 @@ describe('HttpTest', function () it('Testing loose parsing mode', function () { - let parsed = jsOMS.Uri.Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'loose'); + let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'loose'); expect(parsed.scheme).toBe('http'); expect(parsed.user).toBe('username'); @@ -50,7 +52,7 @@ describe('HttpTest', function () { let thrown = function () { - jsOMS.Uri.Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'invalid'); + Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'invalid'); }; expect(thrown).toThrowError(Error, 'Unexpected parsing mode.'); }); @@ -60,12 +62,12 @@ describe('HttpTest', function () { it('Testing query extraction', function () { - let parsed = jsOMS.Uri.Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); - let query = jsOMS.Uri.Http.getUriQueryParameter(parsed.query, 'test'); + let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); + let query = Http.getUriQueryParameter(parsed.query, 'test'); expect(query).toBe('123'); - query = jsOMS.Uri.Http.getUriQueryParameter(parsed.query, 'two'); + query = Http.getUriQueryParameter(parsed.query, 'two'); expect(query).toBe('ha'); }); }); diff --git a/tests/Uri/UriFactoryTest.js b/tests/Uri/UriFactoryTest.js index bd7a8d4..1020db0 100644 --- a/tests/Uri/UriFactoryTest.js +++ b/tests/Uri/UriFactoryTest.js @@ -1,3 +1,5 @@ +import { UriFactory } from '../../Uri/UriFactory.js'; + describe('UriFactoryTest', function () { "use strict"; @@ -6,7 +8,7 @@ describe('UriFactoryTest', function () { it('Testing default functionality', function () { - expect(jsOMS.Uri.UriFactory.getQuery('Invalid')).toBe(null); + expect(UriFactory.getQuery('Invalid')).toBe(null); }); }); @@ -14,17 +16,17 @@ describe('UriFactoryTest', function () { it('Testing query setting', function () { - expect(jsOMS.Uri.UriFactory.setQuery('Valid', 'query1')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe('query1'); + expect(UriFactory.setQuery('Valid', 'query1')).toBeTruthy(); + expect(UriFactory.getQuery('Valid')).toBe('query1'); - expect(jsOMS.Uri.UriFactory.setQuery('Valid', 'query2', true)).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe('query2'); + expect(UriFactory.setQuery('Valid', 'query2', true)).toBeTruthy(); + expect(UriFactory.getQuery('Valid')).toBe('query2'); - expect(jsOMS.Uri.UriFactory.setQuery('Valid', 'query3', false)).toBeFalsy(); - expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe('query2'); + expect(UriFactory.setQuery('Valid', 'query3', false)).toBeFalsy(); + expect(UriFactory.getQuery('Valid')).toBe('query2'); - expect(jsOMS.Uri.UriFactory.setQuery('/valid2', 'query4')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.getQuery('/valid2')).toBe('query4'); + expect(UriFactory.setQuery('/valid2', 'query4')).toBeTruthy(); + expect(UriFactory.getQuery('/valid2')).toBe('query4'); }); }); @@ -32,27 +34,27 @@ describe('UriFactoryTest', function () { it('Testing query clearing', function () { - jsOMS.Uri.UriFactory.setQuery('Valid', 'query1'); - jsOMS.Uri.UriFactory.setQuery('Valid', 'query2', true); - jsOMS.Uri.UriFactory.setQuery('Valid', 'query3', false); - jsOMS.Uri.UriFactory.setQuery('/valid2', 'query4'); + UriFactory.setQuery('Valid', 'query1'); + UriFactory.setQuery('Valid', 'query2', true); + UriFactory.setQuery('Valid', 'query3', false); + UriFactory.setQuery('/valid2', 'query4'); - expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.clear('Valid')).toBeFalsy(); - expect(jsOMS.Uri.UriFactory.getQuery('Valid')).toBe(null); - expect(jsOMS.Uri.UriFactory.getQuery('/valid2')).toBe('query4'); + expect(UriFactory.clear('Valid')).toBeTruthy(); + expect(UriFactory.clear('Valid')).toBeFalsy(); + expect(UriFactory.getQuery('Valid')).toBe(null); + expect(UriFactory.getQuery('/valid2')).toBe('query4'); - expect(jsOMS.Uri.UriFactory.clearAll()).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.getQuery('/valid2')).toBe(null); + expect(UriFactory.clearAll()).toBeTruthy(); + expect(UriFactory.getQuery('/valid2')).toBe(null); - expect(jsOMS.Uri.UriFactory.setQuery('/abc', 'query1')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.setQuery('/valid2', 'query2')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.setQuery('/valid3', 'query3')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.clearLike('^d+$')).toBeFalsy(); - expect(jsOMS.Uri.UriFactory.clearLike('\/[a-z]*\d')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.getQuery('/valid2')).toBe(null); - expect(jsOMS.Uri.UriFactory.getQuery('/valid3')).toBe(null); - expect(jsOMS.Uri.UriFactory.getQuery('/abc')).toBe('query1'); + expect(UriFactory.setQuery('/abc', 'query1')).toBeTruthy(); + expect(UriFactory.setQuery('/valid2', 'query2')).toBeTruthy(); + expect(UriFactory.setQuery('/valid3', 'query3')).toBeTruthy(); + expect(UriFactory.clearLike('^d+$')).toBeFalsy(); + expect(UriFactory.clearLike('\/[a-z]*\d')).toBeTruthy(); + expect(UriFactory.getQuery('/valid2')).toBe(null); + expect(UriFactory.getQuery('/valid3')).toBe(null); + expect(UriFactory.getQuery('/abc')).toBe('query1'); }); }); @@ -69,8 +71,8 @@ describe('UriFactoryTest', function () }, expected = 'www.test-uri.com?id=1&test=someString&two=PATH&hash=test&none=#none&found=ERROR PATH&v=query4';; - expect(jsOMS.Uri.UriFactory.setQuery('/valid2', 'query4')).toBeTruthy(); - expect(jsOMS.Uri.UriFactory.build(uri, vars)).toBe(expected); + expect(UriFactory.setQuery('/valid2', 'query4')).toBeTruthy(); + expect(UriFactory.build(uri, vars)).toBe(expected); }); }); }); \ No newline at end of file