From 8d63d48fe4ac39e8730c1bb937f6f49ce2ebc643 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Jun 2018 20:58:58 +0200 Subject: [PATCH] More tests and rename enums --- Message/Request/Request.js | 4 +-- Message/Request/RequestData.js | 20 ------------ ...sultType.enum.js => ResponseResultType.js} | 0 .../{ResponseType.enum.js => ResponseType.js} | 0 .../Mouse/{ClickType.enum.js => ClickType.js} | 0 .../Mouse/{EventType.enum.js => EventType.js} | 0 tests/Message/Request/BrowserTypeTest.enum | 12 ------- tests/Message/Request/BrowserTypeTest.js | 24 ++++++++++++++ tests/Message/Request/OSTypeTest.enum | 12 ------- tests/Message/Request/OSTypeTest.js | 31 +++++++++++++++++++ tests/Message/Request/RequestDataTest.enum | 12 ------- tests/Message/Request/RequestMethodTest.enum | 12 ------- tests/Message/Request/RequestMethodTest.js | 21 +++++++++++++ tests/Message/Request/RequestTypeTest.enum | 12 ------- tests/Message/Request/RequestTypeTest.js | 18 +++++++++++ tests/SpecRunner.html | 7 +++++ 16 files changed, 103 insertions(+), 82 deletions(-) delete mode 100644 Message/Request/RequestData.js rename Message/Response/{ResponseResultType.enum.js => ResponseResultType.js} (100%) rename Message/Response/{ResponseType.enum.js => ResponseType.js} (100%) rename UI/Input/Mouse/{ClickType.enum.js => ClickType.js} (100%) rename UI/Input/Mouse/{EventType.enum.js => EventType.js} (100%) delete mode 100644 tests/Message/Request/BrowserTypeTest.enum create mode 100644 tests/Message/Request/BrowserTypeTest.js delete mode 100644 tests/Message/Request/OSTypeTest.enum create mode 100644 tests/Message/Request/OSTypeTest.js delete mode 100644 tests/Message/Request/RequestDataTest.enum delete mode 100644 tests/Message/Request/RequestMethodTest.enum create mode 100644 tests/Message/Request/RequestMethodTest.js delete mode 100644 tests/Message/Request/RequestTypeTest.enum create mode 100644 tests/Message/Request/RequestTypeTest.js diff --git a/Message/Request/Request.js b/Message/Request/Request.js index 3fc9e2b..d3f3128 100644 --- a/Message/Request/Request.js +++ b/Message/Request/Request.js @@ -19,9 +19,9 @@ * * @since 1.0.0 */ - constructor (uri, method, type) + constructor (uri = null, method, type) { - this.uri = typeof uri !== 'undefined' ? uri : null; + this.uri = uri; this.method = typeof method !== 'undefined' ? method : jsOMS.Message.Request.RequestMethod.GET; this.requestHeader = []; this.result = {}; diff --git a/Message/Request/RequestData.js b/Message/Request/RequestData.js deleted file mode 100644 index 2bcef56..0000000 --- a/Message/Request/RequestData.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Request data enum. - * - * @copyright Dennis Eichhorn - * @license OMS License 1.0 - * @version 1.0.0 - * @since 1.0.0 - */ -(function (jsOMS) -{ - "use strict"; - - /** @namespace jsOMS.Message.Request */ - jsOMS.Autoloader.defineNamespace('jsOMS.Message.Request'); - - jsOMS.Message.Request.RequestLinkRequestData = Object.freeze({ - NORMAL: 'normal', - OBJECT: 'object' - }); -}(window.jsOMS = window.jsOMS || {})); diff --git a/Message/Response/ResponseResultType.enum.js b/Message/Response/ResponseResultType.js similarity index 100% rename from Message/Response/ResponseResultType.enum.js rename to Message/Response/ResponseResultType.js diff --git a/Message/Response/ResponseType.enum.js b/Message/Response/ResponseType.js similarity index 100% rename from Message/Response/ResponseType.enum.js rename to Message/Response/ResponseType.js diff --git a/UI/Input/Mouse/ClickType.enum.js b/UI/Input/Mouse/ClickType.js similarity index 100% rename from UI/Input/Mouse/ClickType.enum.js rename to UI/Input/Mouse/ClickType.js diff --git a/UI/Input/Mouse/EventType.enum.js b/UI/Input/Mouse/EventType.js similarity index 100% rename from UI/Input/Mouse/EventType.enum.js rename to UI/Input/Mouse/EventType.js diff --git a/tests/Message/Request/BrowserTypeTest.enum b/tests/Message/Request/BrowserTypeTest.enum deleted file mode 100644 index 7f42637..0000000 --- a/tests/Message/Request/BrowserTypeTest.enum +++ /dev/null @@ -1,12 +0,0 @@ -describe('BrowserTypeTest', function () -{ - "use strict"; - - beforeEach(function () - { - }); - - afterEach(function () - { - }); -} diff --git a/tests/Message/Request/BrowserTypeTest.js b/tests/Message/Request/BrowserTypeTest.js new file mode 100644 index 0000000..7ab1bcc --- /dev/null +++ b/tests/Message/Request/BrowserTypeTest.js @@ -0,0 +1,24 @@ +describe('BrowserTypeTest', function () +{ + "use strict"; + + describe('testEnum', function () + { + it('Testing amount of enums', function () + { + expect(Object.keys(jsOMS.Message.Request.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'); + }); + }); +}); diff --git a/tests/Message/Request/OSTypeTest.enum b/tests/Message/Request/OSTypeTest.enum deleted file mode 100644 index 3db6c08..0000000 --- a/tests/Message/Request/OSTypeTest.enum +++ /dev/null @@ -1,12 +0,0 @@ -describe('OSTypeTest', function () -{ - "use strict"; - - beforeEach(function () - { - }); - - afterEach(function () - { - }); -} diff --git a/tests/Message/Request/OSTypeTest.js b/tests/Message/Request/OSTypeTest.js new file mode 100644 index 0000000..f910234 --- /dev/null +++ b/tests/Message/Request/OSTypeTest.js @@ -0,0 +1,31 @@ +describe('OSTypeTest', function () +{ + "use strict"; + + describe('testEnum', function () + { + it('Testing amount of enums', function () + { + expect(Object.keys(jsOMS.Message.Request.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'); + }); + }); +}); diff --git a/tests/Message/Request/RequestDataTest.enum b/tests/Message/Request/RequestDataTest.enum deleted file mode 100644 index e3f5808..0000000 --- a/tests/Message/Request/RequestDataTest.enum +++ /dev/null @@ -1,12 +0,0 @@ -describe('RequestDataTest', function () -{ - "use strict"; - - beforeEach(function () - { - }); - - afterEach(function () - { - }); -} diff --git a/tests/Message/Request/RequestMethodTest.enum b/tests/Message/Request/RequestMethodTest.enum deleted file mode 100644 index c603708..0000000 --- a/tests/Message/Request/RequestMethodTest.enum +++ /dev/null @@ -1,12 +0,0 @@ -describe('RequestMethodTest', function () -{ - "use strict"; - - beforeEach(function () - { - }); - - afterEach(function () - { - }); -} diff --git a/tests/Message/Request/RequestMethodTest.js b/tests/Message/Request/RequestMethodTest.js new file mode 100644 index 0000000..8a28150 --- /dev/null +++ b/tests/Message/Request/RequestMethodTest.js @@ -0,0 +1,21 @@ +describe('RequestMethodTest', function () +{ + "use strict"; + + describe('testEnum', function () + { + it('Testing amount of enums', function () + { + expect(Object.keys(jsOMS.Message.Request.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'); + }); + }); +}); diff --git a/tests/Message/Request/RequestTypeTest.enum b/tests/Message/Request/RequestTypeTest.enum deleted file mode 100644 index a9fed5c..0000000 --- a/tests/Message/Request/RequestTypeTest.enum +++ /dev/null @@ -1,12 +0,0 @@ -describe('RequestTypeTest', function () -{ - "use strict"; - - beforeEach(function () - { - }); - - afterEach(function () - { - }); -} diff --git a/tests/Message/Request/RequestTypeTest.js b/tests/Message/Request/RequestTypeTest.js new file mode 100644 index 0000000..e01f80a --- /dev/null +++ b/tests/Message/Request/RequestTypeTest.js @@ -0,0 +1,18 @@ +describe('RequestTypeTest', function () +{ + "use strict"; + + describe('testEnum', function () + { + it('Testing amount of enums', function () + { + expect(Object.keys(jsOMS.Message.Request.RequestType).length).toBe(2); + }); + + it('Testing values of enums', function () + { + expect(jsOMS.Message.Request.RequestType.JSON).toBe('json'); + expect(jsOMS.Message.Request.RequestType.RAW).toBe('raw'); + }); + }); +}); diff --git a/tests/SpecRunner.html b/tests/SpecRunner.html index b6abbc4..1e1ea3c 100644 --- a/tests/SpecRunner.html +++ b/tests/SpecRunner.html @@ -22,6 +22,8 @@ + + @@ -65,6 +67,11 @@ + + + + +