diff --git a/.gitignore b/.gitignore index 1d4fdcc..6700ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ app/ui/js/output.js testing/out **/*.css + +*.cfg diff --git a/Gruntfile.js b/Gruntfile.js index da649b2..e5d3c12 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -142,7 +142,7 @@ module.exports = function (grunt) { }, test : { files : ['**/*.ts'], - tasks : ['ts:testing', 'shell:testing', 'clean:build'], + tasks : ['ts:build', 'ts:testing', 'shell:testing', 'clean:build'], options : { interrupt : true, atBegin : true @@ -178,7 +178,7 @@ module.exports = function (grunt) { }); grunt.registerTask('build', ['watch:build']); - grunt.registerTask('testing', ['watch:testing']); + grunt.registerTask('test', ['watch:test']); grunt.registerTask( 'release', [ diff --git a/app/helpers/VersionHelper.ts b/app/helpers/VersionHelper.ts index 9940a0c..71bcbf3 100644 --- a/app/helpers/VersionHelper.ts +++ b/app/helpers/VersionHelper.ts @@ -5,7 +5,7 @@ class VersionHelper { //region Fields private static _target : string = 'http://yimello.adriencadet.com/version'; - private static _version : string = '0.3.1'; + private static _version : string = '0.3.2'; //endregion Fields diff --git a/app/ui/assets/scss/_utils.scss b/app/ui/assets/scss/_utils.scss index 4a2b913..8910f97 100644 --- a/app/ui/assets/scss/_utils.scss +++ b/app/ui/assets/scss/_utils.scss @@ -22,7 +22,7 @@ border-radius: $value; } -@mixin transition($property, $duration, $easing : linear, $delay : 0) { +@mixin transition($property, $duration, $easing : linear, $delay : 0s) { -webkit-transition : $property $duration $easing $delay; -moz-transition : $property $duration $easing $delay; -ms-transition : $property $duration $easing $delay; diff --git a/testing/src/mocks/DAO.ts b/testing/src/mocks/DAO.ts index 8fa6a3d..149becc 100644 --- a/testing/src/mocks/DAO.ts +++ b/testing/src/mocks/DAO.ts @@ -51,7 +51,7 @@ module Mocks { find( table : string, - selector : Pair, + selector : KeyValuePair, callback : Action, converter? : Func) : void { @@ -70,7 +70,7 @@ module Mocks { update( table : string, - selector : Pair, + selector : KeyValuePair, data : IDictionary, callback? : Action) : void { @@ -82,7 +82,7 @@ module Mocks { } } - delete(table : string, selector : Pair, callback? : Action) : void { + delete(table : string, selector : KeyValuePair, callback? : Action) : void { this._deleteTimes++; this._deleteArgs = [table, selector, callback]; if (TSObject.exists(callback)) { @@ -487,7 +487,7 @@ module Mocks { private _removeTagRelationsOutcome : boolean; private _sortTagsByLabelAscForBookmarkOutcome : IList; private _sortBookmarksByTitleAscForTagOutcome : IList; - private _sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome : IList>>; + private _sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome : IList>>; private _addMultipleTagRelationsTimes : number; private _updateBookmarkRelationsTimes : number; @@ -565,7 +565,7 @@ module Mocks { callback(this._sortBookmarksByTitleAscForTagOutcome); } - sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action>>>) : void { + sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action>>>) : void { this._sortBookmarksByTitleAscWithBoundTagsByLabelAscTimes++; this._sortBookmarksByTitleAscWithBoundTagsByLabelAscArgs = [callback]; callback(this._sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome); @@ -602,7 +602,7 @@ module Mocks { return this; } - setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(value : IList>>) : Mocks.DAO.TagBookmarkDAO { + setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(value : IList>>) : Mocks.DAO.TagBookmarkDAO { this._sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome = value; return this; } diff --git a/testing/src/models/business/impl/TagBookmarkBusinessTest.ts b/testing/src/models/business/impl/TagBookmarkBusinessTest.ts index d78f8b4..d5acc3b 100644 --- a/testing/src/models/business/impl/TagBookmarkBusinessTest.ts +++ b/testing/src/models/business/impl/TagBookmarkBusinessTest.ts @@ -161,7 +161,7 @@ class TagBookmarkBusinessTest extends UnitTestClass { TagBookmarkBusinessSearchAsyncTest(obs : IOscarObserver) : void { // Arrange - var list : IList>>; + var list : IList>>; var t1 : Tag, t2 : Tag; var b1 : Bookmark, b2 : Bookmark; var tags1 : IList, tags2 : IList; @@ -171,13 +171,13 @@ class TagBookmarkBusinessTest extends UnitTestClass { t1 = new Tag().setLabel('foobarbar'); t2 = new Tag().setLabel('barbar'); - list = new ArrayList>>(); + list = new ArrayList>>(); tags1 = new ArrayList(); tags1.add(t1); tags2 = new ArrayList(); tags2.add(t2); - list.add(new Pair>(b1, tags1)); - list.add(new Pair>(b2, tags2)); + list.add(new KeyValuePair>(b1, tags1)); + list.add(new KeyValuePair>(b2, tags2)); this._tagBookmarkDAO.setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(list); diff --git a/testing/src/models/business/impl/TagBusinessTest.ts b/testing/src/models/business/impl/TagBusinessTest.ts index d53bb00..bf8864b 100644 --- a/testing/src/models/business/impl/TagBusinessTest.ts +++ b/testing/src/models/business/impl/TagBusinessTest.ts @@ -275,9 +275,9 @@ class TagBusinessTest extends UnitTestClass { Assert.isNotNull(outcome); Assert.areEqual(3, outcome.getLength()); - Assert.isNotNull(outcome.findFirst(e => e.getId() === 'foo')); - Assert.isNotNull(outcome.findFirst(e => e.getId() === 'bar')); - Assert.isNotNull(outcome.findFirst(e => e.getId() === 'foobar')); + Assert.isNotNull(outcome.find(e => e.getId() === 'foo')); + Assert.isNotNull(outcome.find(e => e.getId() === 'bar')); + Assert.isNotNull(outcome.find(e => e.getId() === 'foobar')); obs.success(); } diff --git a/testing/src/models/dao/impl/BookmarkDAOTest.ts b/testing/src/models/dao/impl/BookmarkDAOTest.ts index 7a3dc04..29daac8 100644 --- a/testing/src/models/dao/impl/BookmarkDAOTest.ts +++ b/testing/src/models/dao/impl/BookmarkDAOTest.ts @@ -129,10 +129,10 @@ class BookmarkDAOTest extends UnitTestClass { Assert.areEqual(1, this._aro.updateTimes()); Assert.areEqual(DAOTables.Bookmarks, this._aro.updateArgs()[0]); - Assert.areEqual('id', this._aro.updateArgs()[1].getFirst()); - Assert.areEqual('bar', this._aro.updateArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.updateArgs()[1].getKey()); + Assert.areEqual('bar', this._aro.updateArgs()[1].getValue()); - Assert.areEqual(4, this._aro.updateArgs()[2].getLength()); + Assert.areEqual(4, this._aro.updateArgs()[2].getSize()); Assert.areEqual('google.fr', this._aro.updateArgs()[2].get('url')); Assert.areEqual('foo', this._aro.updateArgs()[2].get('title')); Assert.areEqual('Amazing', this._aro.updateArgs()[2].get('description')); @@ -165,8 +165,8 @@ class BookmarkDAOTest extends UnitTestClass { Assert.areEqual(1, this._aro.deleteTimes()); Assert.areEqual(DAOTables.Bookmarks, this._aro.deleteArgs()[0]); - Assert.areEqual('id', this._aro.deleteArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.deleteArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.deleteArgs()[1].getValue()); Assert.isTrue(outcome); @@ -213,8 +213,8 @@ class BookmarkDAOTest extends UnitTestClass { // Assert Assert.areEqual(1, this._aro.findTimes()); Assert.areEqual(DAOTables.Bookmarks, this._aro.findArgs()[0]); - Assert.areEqual('id', this._aro.findArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.findArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.findArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.findArgs()[1].getValue()); Assert.areEqual(Bookmark.fromObject, this._aro.findArgs()[3]); Assert.areEqual(b, outcome); diff --git a/testing/src/models/dao/impl/TagBookmarkDAOTest.ts b/testing/src/models/dao/impl/TagBookmarkDAOTest.ts index 0205c3c..191cc5f 100644 --- a/testing/src/models/dao/impl/TagBookmarkDAOTest.ts +++ b/testing/src/models/dao/impl/TagBookmarkDAOTest.ts @@ -122,8 +122,8 @@ class TagBookmarkDAOTest extends UnitTestClass { // Check delete request Assert.areEqual(1, this._aro.deleteTimes()); Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]); - Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond()); + Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.deleteArgs()[1].getValue()); // Check insert requests Assert.areEqual(2, this._aro.insertTimes()); @@ -152,8 +152,8 @@ class TagBookmarkDAOTest extends UnitTestClass { // Check delete request Assert.areEqual(1, this._aro.deleteTimes()); Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]); - Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond()); + Assert.areEqual('bookmark_id', this._aro.deleteArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.deleteArgs()[1].getValue()); obs.success(); } @@ -179,8 +179,8 @@ class TagBookmarkDAOTest extends UnitTestClass { // Check delete request Assert.areEqual(1, this._aro.deleteTimes()); Assert.areEqual(DAOTables.TagBookmark, this._aro.deleteArgs()[0]); - Assert.areEqual('tag_id', this._aro.deleteArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond()); + Assert.areEqual('tag_id', this._aro.deleteArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.deleteArgs()[1].getValue()); obs.success(); } @@ -372,27 +372,27 @@ class TagBookmarkDAOTest extends UnitTestClass { Assert.isNotNull(outcome); Assert.areEqual(2, outcome.getLength()); - Assert.areEqual('1', outcome.getAt(0).getFirst().getId()); - Assert.areEqual('foo', outcome.getAt(0).getFirst().getTitle()); - Assert.areEqual('google.fr', outcome.getAt(0).getFirst().getURL()); - Assert.areEqual('Amazing!', outcome.getAt(0).getFirst().getDescription()); - Assert.areEqual(56, outcome.getAt(0).getFirst().getViews()); - - Assert.areEqual(2, outcome.getAt(0).getSecond().getLength()); - Assert.areEqual('34', outcome.getAt(0).getSecond().getAt(0).getId()); - Assert.areEqual('bar', outcome.getAt(0).getSecond().getAt(0).getLabel()); - Assert.areEqual('45', outcome.getAt(0).getSecond().getAt(1).getId()); - Assert.areEqual('barbar', outcome.getAt(0).getSecond().getAt(1).getLabel()); - - Assert.areEqual('2', outcome.getAt(1).getFirst().getId()); - Assert.areEqual('foobar', outcome.getAt(1).getFirst().getTitle()); - Assert.areEqual('google.uk', outcome.getAt(1).getFirst().getURL()); - Assert.areEqual('Formidable!', outcome.getAt(1).getFirst().getDescription()); - Assert.areEqual(789, outcome.getAt(1).getFirst().getViews()); - - Assert.areEqual(1, outcome.getAt(1).getSecond().getLength()); - Assert.areEqual('35', outcome.getAt(1).getSecond().getAt(0).getId()); - Assert.areEqual('foobarbar', outcome.getAt(1).getSecond().getAt(0).getLabel()); + Assert.areEqual('1', outcome.getAt(0).getKey().getId()); + Assert.areEqual('foo', outcome.getAt(0).getKey().getTitle()); + Assert.areEqual('google.fr', outcome.getAt(0).getKey().getURL()); + Assert.areEqual('Amazing!', outcome.getAt(0).getKey().getDescription()); + Assert.areEqual(56, outcome.getAt(0).getKey().getViews()); + + Assert.areEqual(2, outcome.getAt(0).getValue().getLength()); + Assert.areEqual('34', outcome.getAt(0).getValue().getAt(0).getId()); + Assert.areEqual('bar', outcome.getAt(0).getValue().getAt(0).getLabel()); + Assert.areEqual('45', outcome.getAt(0).getValue().getAt(1).getId()); + Assert.areEqual('barbar', outcome.getAt(0).getValue().getAt(1).getLabel()); + + Assert.areEqual('2', outcome.getAt(1).getKey().getId()); + Assert.areEqual('foobar', outcome.getAt(1).getKey().getTitle()); + Assert.areEqual('google.uk', outcome.getAt(1).getKey().getURL()); + Assert.areEqual('Formidable!', outcome.getAt(1).getKey().getDescription()); + Assert.areEqual(789, outcome.getAt(1).getKey().getViews()); + + Assert.areEqual(1, outcome.getAt(1).getValue().getLength()); + Assert.areEqual('35', outcome.getAt(1).getValue().getAt(0).getId()); + Assert.areEqual('foobarbar', outcome.getAt(1).getValue().getAt(0).getLabel()); obs.success(); } diff --git a/testing/src/models/dao/impl/TagDAOTest.ts b/testing/src/models/dao/impl/TagDAOTest.ts index 1d736e4..97ec3c9 100644 --- a/testing/src/models/dao/impl/TagDAOTest.ts +++ b/testing/src/models/dao/impl/TagDAOTest.ts @@ -108,10 +108,10 @@ class TagDAOTest extends UnitTestClass { Assert.areEqual(1, this._aro.updateTimes()); Assert.areEqual(DAOTables.Tags, this._aro.updateArgs()[0]); - Assert.areEqual('id', this._aro.updateArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.updateArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.updateArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.updateArgs()[1].getValue()); - Assert.areEqual(1, this._aro.updateArgs()[2].getLength()); + Assert.areEqual(1, this._aro.updateArgs()[2].getSize()); Assert.areEqual('bar', this._aro.updateArgs()[2].get('label')); Assert.isNotNull(outcome); @@ -140,8 +140,8 @@ class TagDAOTest extends UnitTestClass { Assert.areEqual(1, this._aro.deleteTimes()); Assert.areEqual(DAOTables.Tags, this._aro.deleteArgs()[0]); - Assert.areEqual('id', this._aro.deleteArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.deleteArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.deleteArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.deleteArgs()[1].getValue()); Assert.isTrue(outcome); @@ -187,8 +187,8 @@ class TagDAOTest extends UnitTestClass { // Assert Assert.areEqual(1, this._aro.findTimes()); Assert.areEqual(DAOTables.Tags, this._aro.findArgs()[0]); - Assert.areEqual('id', this._aro.findArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.findArgs()[1].getSecond()); + Assert.areEqual('id', this._aro.findArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.findArgs()[1].getValue()); Assert.areEqual(Tag.fromObject, this._aro.findArgs()[3]); Assert.areEqual(t, outcome); @@ -211,8 +211,8 @@ class TagDAOTest extends UnitTestClass { // Assert Assert.areEqual(1, this._aro.findTimes()); Assert.areEqual(DAOTables.Tags, this._aro.findArgs()[0]); - Assert.areEqual('label', this._aro.findArgs()[1].getFirst()); - Assert.areEqual('foo', this._aro.findArgs()[1].getSecond()); + Assert.areEqual('label', this._aro.findArgs()[1].getKey()); + Assert.areEqual('foo', this._aro.findArgs()[1].getValue()); Assert.areEqual(Tag.fromObject, this._aro.findArgs()[3]); Assert.areEqual(t, outcome); diff --git a/testing/src/references.ts b/testing/src/references.ts index a26739c..cc98394 100644 --- a/testing/src/references.ts +++ b/testing/src/references.ts @@ -22,10 +22,6 @@ /// /// /// -/// -/// -/// -/// /// /// //grunt-end \ No newline at end of file diff --git a/testing/src/system/GuidTest.ts b/testing/src/system/GuidTest.ts deleted file mode 100644 index 2fccd85..0000000 --- a/testing/src/system/GuidTest.ts +++ /dev/null @@ -1,35 +0,0 @@ -/// - -class GuidTest extends UnitTestClass { - setUp() : void { - - } - - tearDown() : void { - - } - - GuidTestNewGuidTest() : void { - // Arrange - var outcome : string; - var charSet : string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - - // Act - outcome = Guid.newGuid(); - - // Assert - for (var i = 0; i < 32; i++) { - if (i === 8 || i === 13 || i === 18 || i === 23) { - Assert.areEqual('-', outcome.charAt(i)); - } else { - var b : boolean = false; - for (var j = 0; j < charSet.length && !b; j++) { - if (outcome.charAt(i) === charSet.charAt(j)) { - b = true; - } - } - Assert.isTrue(b); - } - } - } -} diff --git a/testing/src/system/collections/ArrayListTest.ts b/testing/src/system/collections/ArrayListTest.ts deleted file mode 100644 index c1db34e..0000000 --- a/testing/src/system/collections/ArrayListTest.ts +++ /dev/null @@ -1,288 +0,0 @@ -/// - -class ArrayListTest extends UnitTestClass { - private _list : ArrayList; - - setUp() : void { - this._list = new ArrayList(); - } - - tearDown() : void { - this._list = null; - } - - ArrayListAddTest() : void { - // Arrange - var i : number = 7; - var a : Array; - - // Act - this._list.add(i); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(1, a.length); - Assert.areEqual(i, a[0]); - } - - ArrayListCloneTest() : void { - // Arrange - var a : Array, b : Array; - var clonedList : IList; - - this._list.add(5); - this._list.add(12); - - // Act - clonedList = this._list.clone(); - - // Assert - a = this._list.toArray(); - b = clonedList.toArray(); - Assert.isNotNull(a); - Assert.isNotNull(b); - Assert.areEqual(2, a.length); - Assert.areEqual(2, b.length); - Assert.areEqual(a[0], b[0]); - Assert.areEqual(a[1], b[1]); - } - - ArrayListFindFirstTest() : void { - // Arrange - var i : number; - - this._list.add(5); - this._list.add(4); - this._list.add(6); - - // Act - i = this._list.findFirst(x => x < 5); - - // Assert - Assert.areEqual(4, i); - } - - ArrayListFindFirstNullTest() : void { - // Arrange - var i : number; - - this._list.add(5); - this._list.add(4); - this._list.add(6); - - // Act - i = this._list.findFirst(x => x < 4); - - // Assert - Assert.isTrue(i == null); - } - - ArrayListForEachTest() : void { - // Arrange - var acc : number = 0; - - this._list.add(3); - this._list.add(4); - this._list.add(5); - - // Act - this._list.forEach( - (x) => { - if (x < 5) { - acc++; - } - } - ); - - // Assert - Assert.areEqual(2, acc); - } - - ArrayListGetAtTest() : void { - // Arrange - var i : number; - - this._list.add(3); - this._list.add(4); - - // Act - i = this._list.getAt(1); - - // Assert - Assert.areEqual(4, i); - } - - ArrayListGetLengthTest() : void { - // Arrange - var l : number; - - this._list.add(3); - this._list.add(4); - - // Act - l = this._list.getLength(); - - // Assert - Assert.areEqual(2, l); - } - - ArrayListGetLengthEmptyListTest() : void { - // Arrange - var l : number; - - // Act - l = this._list.getLength(); - - // Assert - Assert.areEqual(0, l); - } - - ArrayListInsertAtTest() : void { - // Arrange - var a : Array; - - this._list.add(3); - this._list.add(5); - - // Act - this._list.insertAt(1, 4); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(3, a.length); - Assert.areEqual(3, a[0]); - Assert.areEqual(4, a[1]); - Assert.areEqual(5, a[2]); - } - - ArrayListInsertAtAppendTest() : void { - // Arrange - var a : Array; - - this._list.add(3); - this._list.add(4); - - // Act - this._list.insertAt(2, 5); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(3, a.length); - Assert.areEqual(3, a[0]); - Assert.areEqual(4, a[1]); - Assert.areEqual(5, a[2]); - } - - ArrayListInsertAtAppendEmptyListTest() : void { - // Arrange - var a : Array; - - // Act - this._list.insertAt(0, 5); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(1, a.length); - Assert.areEqual(5, a[0]); - } - - ArrayListInsertAtNegativeIndexTest() : void { - // Arrange - - // Act - Assert.throws( - () => { - this._list.insertAt(-5, 2); - } - ); - - // Assert - } - - ArrayListInsertAtBadIndexTest() : void { - // Arrange - - // Act - Assert.throws( - () => { - this._list.insertAt(5, 2); - } - ); - - // Assert - } - - ArrayListMapTest() : void { - // Arrange - var a : Array; - - this._list.add(1); - this._list.add(2); - this._list.add(3); - - // Act - this._list.map(x => x * x); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(3, a.length); - Assert.areEqual(1, a[0]); - Assert.areEqual(4, a[1]); - Assert.areEqual(9, a[2]); - } - - ArrayListRemoveTest() : void { - // Arrange - var a : Array; - - this._list.add(1); - this._list.add(2); - this._list.add(3); - - // Act - this._list.remove(2); - - // Assert - a = this._list.toArray(); - Assert.isNotNull(a); - Assert.areEqual(2, a.length); - Assert.areEqual(1, a[0]); - Assert.areEqual(3, a[1]); - } - - ArrayListRemoveUnvalidValueTest() : void { - // Arrange - var a : Array; - - this._list.add(1); - this._list.add(2); - this._list.add(3); - - // Act - Assert.throws(() => this._list.remove(5)); - } - - ArrayListToArrayTest() : void { - // Arrange - var a : Array; - - this._list.add(1); - this._list.add(2); - this._list.add(3); - - // Act - a = this._list.toArray(); - - // Assert - Assert.isNotNull(a); - Assert.areEqual(3, a.length); - Assert.areEqual(1, a[0]); - Assert.areEqual(2, a[1]); - Assert.areEqual(3, a[2]); - } -} diff --git a/testing/src/system/collections/DictionaryTest.ts b/testing/src/system/collections/DictionaryTest.ts deleted file mode 100644 index cb3c2c6..0000000 --- a/testing/src/system/collections/DictionaryTest.ts +++ /dev/null @@ -1,164 +0,0 @@ -/// - -class DictionaryTest extends UnitTestClass { - private _dict : Dictionary; - - setUp() : void { - this._dict = new Dictionary(); - } - - tearDown() : void { - this._dict = null; - } - - DictionaryAddTest() : void { - // Arrange - var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person; - - p1 = new Mocks.Utils.Person('Bruce', 'Willis'); - p2 = new Mocks.Utils.Person('Mickey', 'Rourke'); - - // Act - this._dict.add(p1.lastName, p1); - this._dict.add(p2.lastName, p2); - - // Assert - Assert.areEqual(2, this._dict.getLength()); - Assert.isTrue(p1.equals(this._dict.get(p1.lastName))); - Assert.isTrue(p2.equals(this._dict.get(p2.lastName))); - } - - DictionaryCloneTest() : void { - // Arrange - var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person; - var outcome : IDictionary; - - p1 = new Mocks.Utils.Person('Bruce', 'Willis'); - p2 = new Mocks.Utils.Person('Mickey', 'Rourke'); - this._dict.add(p1.lastName, p1); - this._dict.add(p2.lastName, p2); - - // Act - outcome = this._dict.clone(); - - // Assert - Assert.isNotNull(outcome); - Assert.areEqual(this._dict.getLength(), outcome.getLength()); - Assert.areEqual(this._dict.get(p1.lastName), outcome.get(p1.lastName)); - Assert.areEqual(this._dict.get(p2.lastName), outcome.get(p2.lastName)); - } - - DictionaryContainsKeyTest() : void { - // Arrange - var p : Mocks.Utils.Person; - var b : boolean; - - p = new Mocks.Utils.Person('Al', 'Pacino'); - this._dict.add(p.lastName, p); - - // Act - b = this._dict.containsKey('Pacino'); - - // Assert - Assert.isTrue(b); - } - - DictionaryContainsKeyMissingKeyTest() : void { - // Arrange - var p : Mocks.Utils.Person; - var b : boolean; - - p = new Mocks.Utils.Person('Al', 'Pacino'); - this._dict.add(p.lastName, p); - - // Act - b = this._dict.containsKey('foo'); - - // Assert - Assert.isFalse(b); - } - - DictionaryForEachTest() : void { - // Arrange - var acc : StringBuffer; - var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person, p3 : Mocks.Utils.Person, p4 : Mocks.Utils.Person; - - p1 = new Mocks.Utils.Person('John', 'Lennon'); - p2 = new Mocks.Utils.Person('Paul', 'McCartney'); - p3 = new Mocks.Utils.Person('Ringo', 'Starr'); - p4 = new Mocks.Utils.Person('George', 'Harrison'); - this._dict.add(p1.lastName, p1); - this._dict.add(p2.lastName, p2); - this._dict.add(p3.lastName, p3); - this._dict.add(p4.lastName, p4); - - acc = new StringBuffer(); - - // Act - this._dict.forEach((k, v) => acc.append(v.firstName)); - - // Assert - Assert.isTrue(StringHelper.compare('JohnPaulRingoGeorge', acc.toString())); - } - - DictionaryGetTest() : void { - // Arrange - var p : Mocks.Utils.Person, outcome : Mocks.Utils.Person; - - p = new Mocks.Utils.Person('Samuel L.', 'Jackson'); - this._dict.add(p.lastName, p); - - // Act - outcome = this._dict.get(p.lastName); - - // Assert - Assert.isTrue(p.equals(outcome)); - } - - DictionaryGetFailTest() : void { - // Arrange - var p : Mocks.Utils.Person, outcome : Mocks.Utils.Person; - - p = new Mocks.Utils.Person('Samuel L.', 'Jackson'); - this._dict.add(p.lastName, p); - - // Act & Assert - Assert.throws( - () => { - outcome = this._dict.get('foo'); - } - ); - } - - DictionaryGetLengthTest() : void { - // Arrange - var p1 : Mocks.Utils.Person, p2 : Mocks.Utils.Person, p3 : Mocks.Utils.Person, p4 : Mocks.Utils.Person; - var n : number; - - p1 = new Mocks.Utils.Person('John', 'Lennon'); - p2 = new Mocks.Utils.Person('Paul', 'McCartney'); - p3 = new Mocks.Utils.Person('Ringo', 'Starr'); - p4 = new Mocks.Utils.Person('George', 'Harrison'); - this._dict.add(p1.lastName, p1); - this._dict.add(p2.lastName, p2); - this._dict.add(p3.lastName, p3); - this._dict.add(p4.lastName, p4); - - // Act - n = this._dict.getLength(); - - // Assert - Assert.areEqual(4, n); - } - - DictionaryGetLengthEmptyListTest() : void { - // Arrange - var n : number; - - // Act - n = this._dict.getLength(); - - // Assert - Assert.areEqual(0, n); - } -} diff --git a/testing/src/system/collections/QueueTest.ts b/testing/src/system/collections/QueueTest.ts deleted file mode 100644 index c785989..0000000 --- a/testing/src/system/collections/QueueTest.ts +++ /dev/null @@ -1,53 +0,0 @@ -/// - -class QueueTest extends UnitTestClass { - private _queue : Queue; - - setUp() : void { - this._queue = new Queue(); - } - - tearDown() : void { - this._queue = null; - } - - QueuePushTest() : void { - // Arrange - - // Act - this._queue.push(10); - this._queue.push(45); - - // Assert - Assert.areEqual(2, this._queue.getLength()); - } - - QueueTopTest() : void { - // Arrange - var i : number; - - this._queue.push(56); - this._queue.push(45); - - // Act - i = this._queue.top(); - - // Assert - Assert.areEqual(56, i); - } - - QueuePopTest() : void { - // Arrange - var i : number; - - this._queue.push(56); - this._queue.push(45); - - // Act - i = this._queue.pop(); - - // Assert - Assert.areEqual(56, i); - Assert.areEqual(1, this._queue.getLength()); - } -} diff --git a/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts b/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts index ff608c9..4322f36 100644 --- a/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts +++ b/testing/src/system/storage/ActiveRecord/ActiveRecordObjectTest.ts @@ -106,7 +106,7 @@ class ActiveRecordObjectTest extends UnitTestClass { // Act this._aro.find( 'foo', - new Pair('id', 15), + new KeyValuePair('id', 15), (outcome) => { // Assert Assert.areEqual('SELECT * FROM foo WHERE LOWER(id) = LOWER(?)', this._transaction.getStatement()); @@ -133,7 +133,7 @@ class ActiveRecordObjectTest extends UnitTestClass { // Act this._aro.find( 'foo', - new Pair('id', 15), + new KeyValuePair('id', 15), (outcome) => { // Assert Assert.areEqual('SELECT * FROM foo WHERE LOWER(id) = LOWER(?)', this._transaction.getStatement()); @@ -163,7 +163,9 @@ class ActiveRecordObjectTest extends UnitTestClass { // Assert Assert.isTrue(success); Assert.areEqual('INSERT INTO bar VALUES (?, ?, ?)', this._transaction.getStatement()); - Assert.areEqual(data.toArray(), this._transaction.getArguments()); + Assert.areEqual(data.getAt(0), this._transaction.getArguments()[0]); + Assert.areEqual(data.getAt(1), this._transaction.getArguments()[1]); + Assert.areEqual(data.getAt(2), this._transaction.getArguments()[2]); obs.success(); } @@ -181,7 +183,7 @@ class ActiveRecordObjectTest extends UnitTestClass { // Act this._aro.update( 'people', - new Pair('id', 15), + new KeyValuePair('id', 15), data, (success) => { // Assert @@ -207,7 +209,7 @@ class ActiveRecordObjectTest extends UnitTestClass { // Act this._aro.delete( 'foobar', - new Pair('id', 15), + new KeyValuePair('id', 15), (success) => { // Assert Assert.isTrue(success);