[Calendar] code cleanup
authorPiotr Szydelko <p.szydelko@samsung.com>
Fri, 20 Sep 2013 14:05:24 +0000 (16:05 +0200)
committerPiotr Szydelko <p.szydelko@samsung.com>
Tue, 24 Sep 2013 15:06:58 +0000 (17:06 +0200)
Change-Id: Ia99006a16a35b6ede6f9b76b76bfd54684363249

32 files changed:
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_endDate_TypeMismatch.html
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_endDate_invalid_obj.html
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_errorCallback_invalid_cb.html
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_missarg.html
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_startDate_TypeMismatch.html
tct-calendar-tizen-tests/calendar/CalendarEvent_expandRecurrence_startDate_invalid_obj.html
tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_missarg.html
tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_missarg_TASK.html
tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_with_errorCallback.html
tct-calendar-tizen-tests/calendar/CalendarRecurrenceRule_constructor.html
tct-calendar-tizen-tests/calendar/CalendarRecurrenceRule_daysOfTheWeek_attribute.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_daysOfTheWeek.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_exceptions.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_frequency.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_interval.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_occurrenceCount.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_setPositions.html
tct-calendar-tizen-tests/calendar/Calendar_CalendarRecurrenceRule_attri_untilDate.html
tct-calendar-tizen-tests/calendar/Calendar_addBatch_errorCallback_TypeMismatch.html
tct-calendar-tizen-tests/calendar/Calendar_addBatch_missarg.html
tct-calendar-tizen-tests/calendar/Calendar_addBatch_successCallback_TypeMismatch.html
tct-calendar-tizen-tests/calendar/Calendar_find_event_usage.html
tct-calendar-tizen-tests/calendar/Calendar_find_task_usage.html
tct-calendar-tizen-tests/calendar/Calendar_remove.html
tct-calendar-tizen-tests/calendar/Calendar_remove_Event.html
tct-calendar-tizen-tests/calendar/Calendar_updateBatch_TypeMismatch.html
tct-calendar-tizen-tests/calendar/Calendar_updateBatch_items_TypeMismatch.html
tct-calendar-tizen-tests/calendar/Calendar_updateBatch_missarg.html
tct-calendar-tizen-tests/calendar/Calendar_updateBatch_successCallback_TypeMismatch.html
tct-calendar-tizen-tests/calendar/Calendar_updateBatch_taskType_with_optional_null.html
tct-calendar-tizen-tests/calendar/Calendar_update_item_TypeMismatch.html
tct-calendar-tizen-tests/calendar/support/calendar_common.js

index dd5238e9e5c795a6be18d92aaca3b83b8ca6d1b4..f0e9414b6710e57612a0aef21014660da7ce73a6 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     conversionTable = getTypeConversionExceptions("object", false);
index e25a51e9d96dca655eb9a859dc6ccac6cb58e938..69bff74c882a5ac6de1d374c4dbdf9d40823fdc1 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     endDate = {
index 6c6053a0a4c5891b53512968a4dce63c5e8b0975..fc2cda4c6d71873606b0a53bbeee7a5f511d73b2 100644 (file)
@@ -56,7 +56,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     assert_throws({
index 84996cda0ef4073b6c0c18a8f377c224ed85d5ea..fc2285e2aeb644295ddac3f275cc1a30cd4b5b79 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     assert_throws({
index a389879d693d0ba82d546d6dad14e0453ff83118..6a375f0e6501aa557bb0c9fb542cbcf7a720af1e 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     conversionTable = getTypeConversionExceptions("object", false);
index 054b3e6d6c1a957493c8bd5878a6262fd87cb826..2a16113acf7b31179d5600426c864dc5fc9b50a6 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     function expandSuccessCB(events) {
-        assert_true(false,"expandRecurrence() success callback");
+        assert_unreached("expandRecurrence() success callback");
     }
 
     startDate = {
index 74a291f06680f5795ba8a14323c3d4e73c37ff51..688e703c5e12c19c57a810823f0f03473faf80f6 100644 (file)
@@ -45,11 +45,11 @@ this_test.step(function () {
     self = this;
 
     onGetCalendarsSuccessCB = this.step_func(function (response) {
-        assert_true(false,"onGetCalendarsSuccessCB");
+        assert_unreached("onGetCalendarsSuccessCB");
     });
 
     onGetCalendarsErrorCB = this.step_func(function (error) {
-        assert_true(false, "Error: " + error.message);
+        assert_unreached("Error: " + error.message);
     });
 
     assert_throws({
index 46f5f2fb699de9e581942e5611ad5e994e9ba68b..34264a8c46484b50b0b30f5145ae3df40cb73b10 100644 (file)
@@ -45,11 +45,11 @@ this_test.step(function () {
     var onGetCalendarsSuccessCB, onGetCalendarsErrorCB;
 
     onGetCalendarsSuccessCB = this.step_func(function (response) {
-        assert_true(false,"onGetCalendarsSuccessCB");
+        assert_unreached("onGetCalendarsSuccessCB");
     });
 
     onGetCalendarsErrorCB = this.step_func(function (error) {
-        assert_true(false, "Error: " + error.message);
+        assert_unreached("Error: " + error.message);
     });
 
     assert_throws({
index ebd17fe1c844a376d473037eaf403ecf2aedd73d..ace178405f3a1359a902e0f9553cc180825f57b8 100644 (file)
@@ -53,7 +53,7 @@ this_test.step(function () {
     });
 
     onGetCalendarsErrorCB = self.step_func(function (response) {
-        assert_true(false, "getCalendars error callback");
+        assert_unreached("getCalendars error callback");
     });
 
     tizen.calendar.getCalendars("EVENT", onGetCalendarsSuccessCB, onGetCalendarsErrorCB);
index 43a4a810106c576bf696275b67a1596880f7dc78..c5843ffba0b01a53a025463accbdde515acfde9f 100644 (file)
@@ -48,22 +48,22 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA CONSTRM CONSTRA
         test(function () {
-            var exp1, RecurrenceRule_init, RecurrenceRule;
+            var exp1, recurrenceRule_init, recurrenceRule;
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = { interval: 2,
+            recurrenceRule_init = { interval: 2,
                                     occurrenceCount: 10,
                                     daysOfTheWeek: ["MO", "TU"],
                                     setPositions: [-1, -2],
                                     exceptions:[exp1] };
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY", RecurrenceRule_init);
-            assert_true(RecurrenceRule.frequency in RecurrenceRuleFrequency, "frequency check");
-            assert_equals(RecurrenceRule.frequency, "DAILY", "frequency attribute should be set to DAILY");
-            assert_equals(RecurrenceRule.interval, 2, "interval");
-            assert_equals(RecurrenceRule.untilDate, null, "untilDate check");
-            assert_equals(RecurrenceRule.occurrenceCount, 10, "occurenceCount check");
-            assert_inEnum(RecurrenceRule.daysOfTheWeek, ByDayValue, "daysOfTheWeek check");
-            assert_equalsArrays(RecurrenceRule.setPositions, [-1, -2], "setPositions check");
-            assert_true(RecurrenceRule.exceptions[0].equalsTo(exp1), "dates should be equal");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY", recurrenceRule_init);
+            assert_true(recurrenceRule.frequency in RecurrenceRuleFrequency, "frequency check");
+            assert_equals(recurrenceRule.frequency, "DAILY", "frequency attribute should be set to DAILY");
+            assert_equals(recurrenceRule.interval, 2, "interval");
+            assert_equals(recurrenceRule.untilDate, null, "untilDate check");
+            assert_equals(recurrenceRule.occurrenceCount, 10, "occurenceCount check");
+            assert_isArrayOfDays(recurrenceRule.daysOfTheWeek, "daysOfTheWeek check");
+            assert_array_equals(recurrenceRule.setPositions, [-1, -2], "setPositions check");
+            assert_true(recurrenceRule.exceptions[0].equalsTo(exp1), "dates should be equal");
         }, "CalendarRecurrenceRule_constructor");
 
 </script>
index 711b3b0479dfa4f1091daba3d612d6308b9d716a..09603e46994f2bdb2c010e57ec34d29ed8816286 100644 (file)
@@ -52,14 +52,14 @@ test(function () {
         "calendarRecurrenceRule.daysOfTheWeek should be updated.");
     assert_array_equals(calendarRecurrenceRule.daysOfTheWeek, ["MO", "TU"],
         "calendarRecurrenceRule.daysOfTheWeek should be updated.");
-    assert_inEnum(calendarRecurrenceRule.daysOfTheWeek, ByDayValue);
+    assert_isArrayOfDays(calendarRecurrenceRule.daysOfTheWeek, "daysOfTheWeek");
 
     calendarRecurrenceRule.daysOfTheWeek = ["SA", "SU"];
     assert_equals(calendarRecurrenceRule.daysOfTheWeek.length, 2,
         "calendarRecurrenceRule.daysOfTheWeek should be updated.");
     assert_array_equals(calendarRecurrenceRule.daysOfTheWeek, ["SA", "SU"],
         "calendarRecurrenceRule.daysOfTheWeek should be updated.");
-    assert_inEnum(calendarRecurrenceRule.daysOfTheWeek, ByDayValue);
+    assert_isArrayOfDays(calendarRecurrenceRule.daysOfTheWeek, "calendarRecurrenceRule.daysOfTheWeek");
 
     calendarRecurrenceRule.daysOfTheWeek = null;
     assert_not_equals(calendarRecurrenceRule.daysOfTheWeek, null,
index 9ffc3a962be559e01e9520ea5b730fc1a0982e27..9100197cd7e9935a4138cc62f6351726996895c8 100644 (file)
@@ -48,17 +48,17 @@ Authors:
 //==== TEST_CRITERIA
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
-        test(function (){
+            exp1, recurrenceRule_init, recurrenceRule;
+        test(function () {
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_inEnum(RecurrenceRule.daysOfTheWeek, ByDayValue,"CalendarRecurrenceRule attribute daysOfTheWeek check");
-        },description);
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY", recurrenceRule_init);
+            assert_isArrayOfDays(recurrenceRule.daysOfTheWeek, "daysOfTheWeek check");
+        }, description);
 
 </script>
 </body>
index 985d8766f51ff87777bd8ddc658706ade90cb732..a6fbba713b01c90504e2cd7cfa82a23cd113d7f1 100644 (file)
@@ -48,17 +48,17 @@ Authors:
 //==== TEST_CRITERIA
 
 var description = "CalendarRecurrenceRule attribute frequency check",
-    exp1, RecurrenceRule_init, RecurrenceRule;
+    exp1, recurrenceRule_init, recurrenceRule;
 test(function (){
     exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-    RecurrenceRule_init = {interval: 2,
+    recurrenceRule_init = {interval: 2,
         occurrenceCount: 10,
         daysOfTheWeek: ["MO","TU"],
         setPositions: [-1,-2],
         exceptions:[exp1]};
-    
-    RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-    assert_true(RecurrenceRule.exceptions[0].equalsTo(exp1), "dates should be equal");
+
+    recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY", recurrenceRule_init);
+    assert_true(recurrenceRule.exceptions[0].equalsTo(exp1), "dates should be equal");
 },description);
 
 </script>
index d66ad72452b72a9428294a1f7a87a1a119bd9e08..a49b83b609d60a270bb6124881902a2b5186542b 100644 (file)
@@ -48,16 +48,16 @@ Authors:
 //==== TEST_CRITERIA
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
+            exp1, recurrenceRule_init, recurrenceRule;
         test(function (){
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_true(RecurrenceRule.frequency in RecurrenceRuleFrequency, "CalendarRecurrenceRule attribute frequency check");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY", recurrenceRule_init);
+            assert_true(recurrenceRule.frequency in RecurrenceRuleFrequency, "CalendarRecurrenceRule attribute frequency check");
         },description);
 
 </script>
index 5e786dfef859e29da9c88a9c933104d47f3c66ac..92fa8404f477bc9d806d2a634abcd7a078955a04 100644 (file)
@@ -48,16 +48,16 @@ Authors:
 //==== TEST_CRITERIA AT
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
+            exp1, recurrenceRule_init, recurrenceRule;
         test(function (){
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_equals(RecurrenceRule.interval, 2,"CalendarRecurrenceRule attribute interval check");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",recurrenceRule_init);
+            assert_equals(recurrenceRule.interval, 2,"CalendarRecurrenceRule attribute interval check");
         },description);
 
 </script>
index a3d1683e6ad8a8104ac7f1834fa17e6015db8808..1f3ec1446b907b6c9e8d3d4025371e0fe09f6a18 100644 (file)
@@ -48,16 +48,16 @@ Authors:
 //==== TEST_CRITERIA AT
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
+            exp1, recurrenceRule_init, recurrenceRule;
         test(function (){
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_equals(RecurrenceRule.occurrenceCount, 10, "CalendarRecurrenceRule attribute occurenceCount check");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",recurrenceRule_init);
+            assert_equals(recurrenceRule.occurrenceCount, 10, "CalendarRecurrenceRule attribute occurenceCount check");
         },description);
 
 </script>
index 8f30d3c707ec46f87f39bf3047619f4719e6b6da..1a3614669f127dff7739ff2669d9a620ad583b9f 100644 (file)
@@ -48,16 +48,16 @@ Authors:
 //==== TEST_CRITERIA
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
+            exp1, recurrenceRule_init, recurrenceRule;
         test(function (){
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_array_equals(RecurrenceRule.setPositions, [-1, -2],"CalendarRecurrenceRule attribute setPositions check");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",recurrenceRule_init);
+            assert_array_equals(recurrenceRule.setPositions, [-1, -2],"CalendarRecurrenceRule attribute setPositions check");
         },description);
 
 </script>
index a2802d85a5f8c4b853df6e498b15e6a56dc46881..33e7072d6ccbe14b4c54bc97245f02fecb856369 100644 (file)
@@ -48,16 +48,16 @@ Authors:
 //==== TEST_CRITERIA
 
         var description = "CalendarRecurrenceRule attribute frequency check",
-            exp1, RecurrenceRule_init, RecurrenceRule;
+            exp1, recurrenceRule_init, recurrenceRule;
         test(function (){
             exp1 = new tizen.TZDate(2011, 11, 30, 12, 40, 0, 0);
-            RecurrenceRule_init = {interval: 2,
+            recurrenceRule_init = {interval: 2,
                                        occurrenceCount: 10,
                                        daysOfTheWeek: ["MO","TU"],
                                        setPositions: [-1,-2],
                                        exceptions:[exp1]};
-            RecurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",RecurrenceRule_init);
-            assert_equals(RecurrenceRule.untilDate, null, "CalendarRecurrenceRule attribute untilDate check");
+            recurrenceRule = new tizen.CalendarRecurrenceRule("DAILY",recurrenceRule_init);
+            assert_equals(recurrenceRule.untilDate, null, "CalendarRecurrenceRule attribute untilDate check");
         },description);
 
 </script>
index 4d603f20b1b85cccc5df82db6966b3c6e53220bc..86aaad6ea996f2657c1d307c9d6afcb5f780b3c3 100644 (file)
@@ -37,7 +37,7 @@ Authors:
 //==== SPEC Tizen Web API:Social:Calendar:Calendar:addBatch M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MC
-var t = async_test(document.title, {timeout: 10000}), i, conversionTable, exceptionName, successCallback, errorCallback, event, calendar;
+var t = async_test(document.title, {timeout: 10000}), i, conversionTable, exceptionName, successCallback, errorCallback, calendarEvent, calendar;
 setup({timeout: 10000});
 
 t.step(function () {
@@ -47,7 +47,7 @@ t.step(function () {
     });
 
     calendar = tizen.calendar.getDefaultCalendar("EVENT");
-    event = createTestEvent();
+    calendarEvent = createTestEvent();
 
     conversionTable = getTypeConversionExceptions("functionObject", true);
 
@@ -58,7 +58,7 @@ t.step(function () {
         assert_throws({
             name: exceptionName
         }, function () {
-            calendar.addBatch([event], successCallback, errorCallback);
+            calendar.addBatch([calendarEvent], successCallback, errorCallback);
         }, exceptionName + " should be thrown - given incorrect errorCallback - " + errorCallback);
     }
 
index a612bc10ddb0b8332be67354336d43715db8d5a1..c4cf35f0bbfc0d15d0015b8128c9145db21e01fe 100644 (file)
@@ -40,7 +40,7 @@ Authors:
 //==== TEST_CRITERIA MMA MC
 
 test(function () {
-    var eventCalendar = tizen.calendar.getDefaultCalendar("EVENT");
+    var eventCalendar = tizen.calendar.getDefaultCalendar("EVENT"), events = [];
 
     assert_throws({
         "name": TYPE_MISMATCH_ERR
index 495b79e32590c60a79eadba5ee21387c4991c968..62423decc28dae6f65c73cde691f516bf0b837b2 100644 (file)
@@ -37,7 +37,7 @@ Authors:
 //==== SPEC Tizen Web API:Social:Calendar:Calendar:addBatch M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MC
-var t = async_test(document.title, {timeout: 10000}), i, conversionTable, exceptionName, successCallback, errorCallback, event, calendar;
+var t = async_test(document.title, {timeout: 10000}), i, conversionTable, exceptionName, successCallback, errorCallback, calendarEvent, calendar;
 setup({timeout: 10000});
 
 t.step(function () {
@@ -47,7 +47,7 @@ t.step(function () {
     });
 
     calendar = tizen.calendar.getDefaultCalendar("EVENT");
-    event = createTestEvent();
+    calendarEvent = createTestEvent();
 
     conversionTable = getTypeConversionExceptions("functionObject", true);
 
@@ -58,7 +58,7 @@ t.step(function () {
         assert_throws({
             name: exceptionName
         }, function () {
-            calendar.addBatch([event], successCallback, errorCallback);
+            calendar.addBatch([calendarEvent], successCallback, errorCallback);
         }, exceptionName + " should be thrown - given incorrect successCallback - " + successCallback);
     }
 
index 8cb6ae99e3b7511d6a6432881cc07faaf3211be4..4c57ad25f80e5a75c660a076c0f540ae81bcfdab 100644 (file)
@@ -56,7 +56,7 @@ this_test.step(function () {
     });
 
     onFindErrorCB = self.step_func(function () {
-        assert_true(false, "Find failed.");
+        assert_unreached("Find failed.");
     });
 
     filter = new tizen.AttributeFilter("summary", "CONTAINS", "Tizen");
index 664335702e9185f0258c6307a971ba208cd4dfde..74df9e1c75eef87e291500dfd32c2c76e8251cd8 100644 (file)
@@ -55,7 +55,7 @@ this_test.step(function () {
     });
 
     onFindErrorCB = self.step_func(function () {
-        assert_true(false, "Find failed.");
+        assert_unreached("Find failed.");
     });
 
     filter = new tizen.AttributeFilter("summary", "CONTAINS", "Tizen");
index 9f48d1a4bd198dd074608aad5e3ba3bc8af9f2db..735b2bf8af75ae5e2f5e39a0b97ba09ee2da1ce5 100644 (file)
@@ -45,7 +45,7 @@ t.step(function () {
 
 
     taskSearchSuccessCallback = t.step_func(function (events) {
-               assert_equals(returnedValue, undefined, "Incorect returned value from remove()");
+       assert_equals(returnedValue, undefined, "Incorect returned value from remove()");
         assert_equals(events.length, 0, "Task should not be found.");
         t.done();
     });
index 9d300d4361bb84ab4e43952d2726df11ec74e9e5..ee00c1a39e0c46cbecd0ceb05d05169f7b6d7777 100644 (file)
@@ -38,8 +38,8 @@ Authors:
 //==== SPEC Tizen Web API:Social:Calendar:Calendar:remove M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MMINA MAST
-var t = async_test("Calendar_remove_Event", {timeout: 5000}), event,
-    eventCalendar, eventSearchSuccessCallback, eventSearchErrorCallback, filter;
+var t = async_test("Calendar_remove_Event", {timeout: 5000}), calendarEvent,
+    calendar, eventSearchSuccessCallback, eventSearchErrorCallback, filter;
 
 t.step(function () {
 
@@ -51,13 +51,13 @@ t.step(function () {
         assert_unreached("find() error callaback invoked: " + error.name + ": " + error.message);
     });
 
-    eventCalendar = tizen.calendar.getDefaultCalendar("EVENT");
-    event = createTestEvent();
-    eventCalendar.add(event);
-    filter = new tizen.AttributeFilter("id", "EXACTLY", event.id);
+    calendar = tizen.calendar.getDefaultCalendar("EVENT");
+    calendarEvent = createTestEvent();
+    calendar.add(calendarEvent);
+    filter = new tizen.AttributeFilter("id", "EXACTLY", calendarEvent.id);
 
-    eventCalendar.remove(event.id);
-    eventCalendar.find(eventSearchSuccessCallback, eventSearchErrorCallback, filter);
+    calendar.remove(calendarEvent.id);
+    calendar.find(eventSearchSuccessCallback, eventSearchErrorCallback, filter);
 });
 
 </script>
index 7093533657a551dd2d86943c62295cc027bf9c0b..328b3131ab3b91663b4bf51c0ed7e335abca0e93 100644 (file)
@@ -42,7 +42,7 @@ Authors:
 //==== TEST_CRITERIA MC MMA
 var t = async_test("Calendar_updateBatch_TYpeMismatch");
 t.step(function () {
-    var onUpdateBatchSuccessCB, taskCalendar  = tizen.calendar.getDefaultCalendar("TASK");
+    var onUpdateBatchSuccessCB, taskCalendar  = tizen.calendar.getDefaultCalendar("TASK"), tasks = [];
 
     onUpdateBatchSuccessCB = t.step_func(function () {
         assert_unreached("updateBatch success callback invoked");
index 05e260103917a54f58e5867adac40f6b2f2a832a..571d0977d8791f906735b2164155dd9c19075a70 100644 (file)
@@ -35,7 +35,7 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MC
 var t = async_test("Calendar_updateBatch_items_TypeMismatch"),
-    conversionTable, calendar, i, exceptionName;
+    conversionTable, calendar, i, exceptionName, events;
 t.step(function () {
     calendar = tizen.calendar.getDefaultCalendar("EVENT");
     conversionTable = getTypeConversionExceptions("object", true);
index a17f1228cae0cca1ff2cdcaa25156851471f3984..a6a4bbafa55f319020c582e696f8f8053b70f5c2 100644 (file)
@@ -40,7 +40,7 @@ Authors:
 var t = async_test("Calendar_updateBatch_missarg");
 
 t.step(function () {
-    var onUpdateBatchSuccessCB,
+    var onUpdateBatchSuccessCB, events = [],
         eventCalendar = tizen.calendar.getDefaultCalendar("EVENT");
 
     onUpdateBatchSuccessCB = t.step_func(function () {
index 4b797a0c6f14f8e6a94271ba6d3c185bc34c8045..60ade3a1ac78ef960469404a382ba2feb94513d5 100644 (file)
@@ -47,7 +47,7 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MC
 var t = async_test("Calendar_updateBatch_successCallback_TypeMismatch"), calendar, successCB,
-exceptionName, i, conversionTable;
+    exceptionName, i, conversionTable, events = [];
 t.step(function (){
     calendar = tizen.calendar.getDefaultCalendar("EVENT");
     conversionTable = getTypeConversionExceptions("object", true);
index 4b4d5010cd82c7c48b54fe9097b4b5fdb0fe967b..a457a892f9477ddbeb85b1e1b42c8a22b38c60a5 100644 (file)
@@ -49,7 +49,7 @@ t.step(function () {
     taskCalendar = tizen.calendar.getDefaultCalendar("TASK");
     succCount = 3;
     onUpdateBatchErrorCB = t.step_func(function (response) {
-        assert_true(false, "Error: " + response.message);
+        assert_unreached("Error: " + response.message);
     });
 
     onUpdateBatchSuccessCB = t.step_func(function () {
index c64683c214be992dbdd8f30bd3042d88c00fbeea..e8abc159710cefdb6ab22d4b74c824cfec7c696e 100644 (file)
@@ -35,17 +35,17 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html
 //==== TEST_CRITERIA MC
 var t = async_test("Calendar_update_item_TypeMismatch"),
-    conversionTable, calendar, i, exceptionName;
+    badEvent, conversionTable, calendar, i, exceptionName;
 t.step(function (){
     calendar = tizen.calendar.getDefaultCalendar("EVENT");
     conversionTable = getTypeConversionExceptions("object", true);
     for (i = 0; i < conversionTable.length; i++) {
-        event = conversionTable[i][0];
+        badEvent = conversionTable[i][0];
         exceptionName = conversionTable[i][1];
 
         assert_throws({name : exceptionName},
             function () {
-                calendar.update(event);
+                calendar.update(badEvent);
         }, exceptionName + " should be thrown - given incorrect items.");
     }
     cleanup(calendar);
index fd6867f9a308efeef5c14387faaa5f62671ad6eb..cdda81dd19837dd316999d7d9de1968bb9d10fde 100644 (file)
@@ -33,7 +33,6 @@ var CalendarType = { "EVENT":2, "TASK":1 };
 var CalendarTextFormat = { "ICALENDAR_20":0, "VCALENDAR_10":1 };
 var AlarmMethod = { "SOUND":0, "DISPLAY":1 };
 var RecurrenceRuleFrequency = { "DAILY":0, "WEEKLY":1, "MONTHLY":2, "YEARLY":3 };
-var ByDayValue = { "MO":0, "TU":1, "WE":2, "TH":3, "FR":4, "SA":5, "SU":6 };
 var EventAvailability = { "BUSY":0, "FREE":1 };
 var AttendeeType = { "INDIVIDUAL":0, "GROUP":1, "RESOURCE":2, "ROOM":3, "UNKNOWN":4 };
 var AttendeeStatus = { "PENDING":0, "ACCEPTED":1, "DECLINED":2, "TENTATIVE":3, "DELEGATED":4, "COMPLETED":5, "IN_PROCESS":6 };
@@ -41,23 +40,15 @@ var AttendeeRole = { "REQ_PARTICIPANT":0, "OPT_PARTICIPANT":1, "NON_PARTICIPANT"
 var CalendarItemPriority = { "HIGH":0, "MEDIUM":1, "LOW":2 };
 var CalendarItemVisibility = { "PUBLIC":0, "PRIVATE":1, "CONFIDENTIAL":2 };
 var CalendarItemStatus = { "TENTATIVE":0, "CONFIRMED":1, "CANCELLED":2, "NEEDS_ACTION":3, "IN_PROCESS":4, "COMPLETED":5 };
+var DAYS = ["MO", "TU", "WE", "TH", "FR", "SA", "SU"];
+
 var TYPE_MISMATCH_ERR = 'TypeMismatchError';
 var INVALID_VALUES_ERR = 'InvalidValuesError';
 var NOT_SUPPORTED_ERR = 'NotSupportedError';
 var NOT_FOUND_ERR = 'NotFoundError';
-var calendar = null;
-var task = null;
-var events = null;
-var tasks = null;
-var listenerArray = [];
-
 
-errorCB = function (err) {
-                console.log("Error occurs: " + err.name);
-                assert_true(false, err.name);
-        };
 
-events_to_ids = function(events) {
+function events_to_ids(events) {
     var ids = [];
     for (var i=0; i<events.length; i++) {
         ids.push(events[i].id);
@@ -65,7 +56,7 @@ events_to_ids = function(events) {
     return ids;
 }
 
-cleanup = function(calendar) {
+function cleanup(calendar) {
        var ids = [];
        calendar.find(function (found_events) {
                var ids = events_to_ids(found_events);
@@ -78,64 +69,57 @@ cleanup = function(calendar) {
        });
 }
 
-assert_equalsArrays = function(array1, array2, msg) {
+function assert_equalsArrays(array1, array2, compare, msg) {
     assert_equals(array1.length, array2.length, msg);
     for (var i=0; i<array1.length; i++) {
-        assert_equals(array1[i], array2[i], msg);
+        compare(array1[i], array2[i], msg);
     }
 }
-assert_inEnum = function(actual, expected, msg) {
-       for (var i=0; i< actual.length; i++) {
-               var actual_item = actual[i];
-               assert_true(actual_item in expected, msg);
-       }       
+function assert_isArrayOfDays(value, msg) {
+    assert_true(Array.isArray(value), msg)
+    for (var i = 0; i < value.length; i++) {
+        assert_in_array(value[i], DAYS, msg + " (item " + i + ")");
+    }
 }
 
-assert_equalsSimpleCoordinates = function(c_actual, c_expected, msg) {
+function assert_equalsSimpleCoordinates(c_actual, c_expected, msg) {
     if (c_actual == null && c_expected == null) {
-        assert_true(true,msg);
         return;
     }
     if (c_actual == null || c_expected == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_equals(c_actual, c_expected, msg);
     }
     assert_equals(c_actual.latitude, c_expected.latitude, msg +": same latitude");
     assert_equals(c_actual.longitude, c_expected.longitude, msg +": same longitude");
 }
-assert_equalsDurations = function(d_actual, d_expected, msg) {
+
+function assert_equalsDurations(d_actual, d_expected, msg) {
     if (d_actual == null && d_expected == null) {
-        assert_true(true, msg);
         return;
     }
     if (d_actual == null || d_expected == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_equals(d_actual, d_expected, msg);
     }
     assert_equals(d_actual.length, d_expected.length, msg);
     assert_equals(d_actual.unit, d_expected.unit, msg);
 }
 
-assert_equalsDates = function(actual_date, expected_date, msg) {
+function assert_equalsDates(actual_date, expected_date, msg) {
     if (actual_date == null && expected_date == null) {
-        assert_true(true, msg);
         return;
     }
     if (actual_date == null || expected_date == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_true(actual_date, expected_date, msg);
     }
     assert_equals(actual_date.toString(), expected_date.toString(), msg);
 }
 
-assert_equalsAlarms = function(actual_alarm, expected_alarm, msg) {
+function assert_equalsAlarms(actual_alarm, expected_alarm, msg) {
     if (actual_alarm == null && expected_alarm == null) {
-        assert_true(true, msg);
         return;
     }
     if (actual_alarm == null || expected_alarm == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_equals(actual_alarm, expected_alarm, msg);
     }
     assert_equalsDates(actual_alarm.absoluteDate, expected_alarm.absoluteDate, msg);
     assert_equalsDurations(actual_alarm.before, expected_alarm.before, msg);
@@ -143,31 +127,27 @@ assert_equalsAlarms = function(actual_alarm, expected_alarm, msg) {
     assert_equals(actual_alarm.description, expected_alarm.description, msg);
 }
 
-assert_equalsRRules = function(actual_rrule, expected_rrule, msg) {
+function assert_equalsRRules(actual_rrule, expected_rrule, msg) {
     if (actual_rrule == null && expected_rrule == null) {
-        assert_true(true, msg);
         return;
     }
     if (actual_rrule == null || expected_rrule == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_equals(actual_rrule, expected_rrule, msg + ": one is null but not the other");
     }
     assert_equals(actual_rrule.frequency, expected_rrule.frequency, msg);
     assert_equalsDates(actual_rrule.untilDate, expected_rrule.untilDate, msg);
     assert_equals(actual_rrule.occurrenceCount, expected_rrule.occurrenceCount, msg);
-    assert_equalsArrays(actual_rrule.daysOfTheWeek, expected_rrule.daysOfTheWeek, msg);
-    assert_equalsArrays(actual_rrule.setPositions, expected_rrule.setPositions, msg);
+    assert_array_equals(actual_rrule.daysOfTheWeek, expected_rrule.daysOfTheWeek, msg);
+    assert_array_equals(actual_rrule.setPositions, expected_rrule.setPositions, msg);
     assert_equalsArrays(actual_rrule.exceptions, expected_rrule.exceptions, assert_equalsDates, msg);
 }
-   
-assert_equalsAttendees = function(actual_att, expected_att, msg) {
+
+function assert_equalsAttendees(actual_att, expected_att, msg) {
     if (actual_att == null && expected_att == null) {
-        assert_true(true, msg);
         return;
     }
     if (actual_att == null || expected_att == null) {
-        assert_true(false, msg + ": one is null but not the other");
-        return;
+        assert_equals(actual_att, expected_att, msg);
     }
    // assert_equals(actual_att.uri, expected_att.uri, msg);
     assert_equals(actual_att.name, expected_att.name, msg + " name");
@@ -177,14 +157,14 @@ assert_equalsAttendees = function(actual_att, expected_att, msg) {
     assert_equals(actual_att.group, expected_att.group, msg+ " group");
     assert_equals(actual_att.delegatorURI, expected_att.delegatorURI, msg+ " delegatorURI");
     assert_equals(actual_att.delegateURI, expected_att.delegateURI, msg+ " delegateURI");
-} 
+}
 
-assert_equalsEvents = function(ev_actual, ev_expected) {
+function assert_equalsEvents(ev_actual, ev_expected) {
     assert_equalsDates(ev_actual.startDate, ev_expected.startDate, "same startDate");
     assert_equalsDates(ev_actual.endDate, ev_expected.endDate, "same endDate");
     assert_equals(ev_actual.summary, ev_expected.summary, "same summary");
     assert_equals(ev_actual.description, ev_expected.description, "same description");
-    assert_equalsArrays(ev_actual.categories, ev_expected.categories, "same categories");
+    assert_array_equals(ev_actual.categories, ev_expected.categories, "same categories");
     assert_equals(ev_actual.isAllDay, ev_expected.isAllDay, "same isAllDay");
     assert_equalsDurations(ev_actual.duration, ev_expected.duration, "same duration");
     assert_equals(ev_actual.location, ev_expected.location, "same location");
@@ -198,8 +178,6 @@ assert_equalsEvents = function(ev_actual, ev_expected) {
     assert_equalsArrays(ev_actual.attendees, ev_expected.attendees, assert_equalsAttendees, "same attendees");
 }
 
-
-
 function createTestEvent() {
     return new tizen.CalendarEvent({description:'Tizen test event description',
              summary:'Tizen test event summary',
@@ -241,7 +219,8 @@ function createTestTasks() {
                     location:'Seoul'});
     return [task1, task2];
 }
-ensureContactRefIsValid = function (contactRef) {
+
+function ensureContactRefIsValid(contactRef) {
     var addressBook, testContact, getAddressBook;
 
     try {