Skip to content

Commit

Permalink
Fixed compatibility issues with ludivine
Browse files Browse the repository at this point in the history
  • Loading branch information
@acadet
acadet committed Nov 6, 2014
1 parent 5768b6d commit e4cf843
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 609 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ app/ui/js/output.js
testing/out
**/*.css


*.cfg
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
[
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/VersionHelper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/ui/assets/scss/_utils.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions testing/src/mocks/DAO.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module Mocks {

find<T>(
table : string,
selector : Pair<string, any>,
selector : KeyValuePair<string, any>,
callback : Action<T>,
converter? : Func<any, T>) : void {

Expand All @@ -70,7 +70,7 @@ module Mocks {

update(
table : string,
selector : Pair<string, any>,
selector : KeyValuePair<string, any>,
data : IDictionary<string, any>,
callback? : Action<boolean>) : void {

Expand All @@ -82,7 +82,7 @@ module Mocks {
}
}

delete(table : string, selector : Pair<string, any>, callback? : Action<boolean>) : void {
delete(table : string, selector : KeyValuePair<string, any>, callback? : Action<boolean>) : void {
this._deleteTimes++;
this._deleteArgs = [table, selector, callback];
if (TSObject.exists(callback)) {
Expand Down Expand Up @@ -487,7 +487,7 @@ module Mocks {
private _removeTagRelationsOutcome : boolean;
private _sortTagsByLabelAscForBookmarkOutcome : IList<Tag>;
private _sortBookmarksByTitleAscForTagOutcome : IList<Bookmark>;
private _sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome : IList<Pair<Bookmark, IList<Tag>>>;
private _sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome : IList<KeyValuePair<Bookmark, IList<Tag>>>;

private _addMultipleTagRelationsTimes : number;
private _updateBookmarkRelationsTimes : number;
Expand Down Expand Up @@ -565,7 +565,7 @@ module Mocks {
callback(this._sortBookmarksByTitleAscForTagOutcome);
}

sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<Pair<Bookmark, IList<Tag>>>>) : void {
sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<KeyValuePair<Bookmark, IList<Tag>>>>) : void {
this._sortBookmarksByTitleAscWithBoundTagsByLabelAscTimes++;
this._sortBookmarksByTitleAscWithBoundTagsByLabelAscArgs = [callback];
callback(this._sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome);
Expand Down Expand Up @@ -602,7 +602,7 @@ module Mocks {
return this;
}

setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(value : IList<Pair<Bookmark, IList<Tag>>>) : Mocks.DAO.TagBookmarkDAO {
setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(value : IList<KeyValuePair<Bookmark, IList<Tag>>>) : Mocks.DAO.TagBookmarkDAO {
this._sortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome = value;
return this;
}
Expand Down
8 changes: 4 additions & 4 deletions testing/src/models/business/impl/TagBookmarkBusinessTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class TagBookmarkBusinessTest extends UnitTestClass {

TagBookmarkBusinessSearchAsyncTest(obs : IOscarObserver) : void {
// Arrange
var list : IList<Pair<Bookmark, IList<Tag>>>;
var list : IList<KeyValuePair<Bookmark, IList<Tag>>>;
var t1 : Tag, t2 : Tag;
var b1 : Bookmark, b2 : Bookmark;
var tags1 : IList<Tag>, tags2 : IList<Tag>;
Expand All @@ -171,13 +171,13 @@ class TagBookmarkBusinessTest extends UnitTestClass {
t1 = new Tag().setLabel('foobarbar');
t2 = new Tag().setLabel('barbar');

list = new ArrayList<Pair<Bookmark, IList<Tag>>>();
list = new ArrayList<KeyValuePair<Bookmark, IList<Tag>>>();
tags1 = new ArrayList<Tag>();
tags1.add(t1);
tags2 = new ArrayList<Tag>();
tags2.add(t2);
list.add(new Pair<Bookmark, IList<Tag>>(b1, tags1));
list.add(new Pair<Bookmark, IList<Tag>>(b2, tags2));
list.add(new KeyValuePair<Bookmark, IList<Tag>>(b1, tags1));
list.add(new KeyValuePair<Bookmark, IList<Tag>>(b2, tags2));

this._tagBookmarkDAO.setSortBookmarksByTitleAscWithBoundTagsByLabelAscOutcome(list);

Expand Down
6 changes: 3 additions & 3 deletions testing/src/models/business/impl/TagBusinessTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
14 changes: 7 additions & 7 deletions testing/src/models/dao/impl/BookmarkDAOTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
54 changes: 27 additions & 27 deletions testing/src/models/dao/impl/TagBookmarkDAOTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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();
}
Expand All @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down
18 changes: 9 additions & 9 deletions testing/src/models/dao/impl/TagDAOTest.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand Down
4 changes: 0 additions & 4 deletions testing/src/references.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
/// <reference path="models/dao/impl/TagDAOTest.ts" />
/// <reference path="models/dao/utils/DataAccessObjectTest.ts" />
/// <reference path="models/utils/AROFactoryTest.ts" />
/// <reference path="system/GuidTest.ts" />
/// <reference path="system/collections/ArrayListTest.ts" />
/// <reference path="system/collections/DictionaryTest.ts" />
/// <reference path="system/collections/QueueTest.ts" />
/// <reference path="system/storage/ActiveRecord/ActiveRecordHelperTest.ts" />
/// <reference path="system/storage/ActiveRecord/ActiveRecordObjectTest.ts" />
//grunt-end
35 changes: 0 additions & 35 deletions testing/src/system/GuidTest.ts
View file

This file was deleted.

Loading

0 comments on commit e4cf843

Please sign in to comment.