dojo_src 1.4.102 → 1.5.0

data/dojo/dojox/date/hebrew/numerals.js

@@ -62,30 +62,31 @@ dojo.provide("dojox.date.hebrew.numerals");
 	};
 
 	dojox.date.hebrew.numerals.getYearHebrewLetters = function(/*Number */ year){
-		// summary: This function return year written in Hebrew numbers-letters, 
+		// summary: converts the year from an integer to Hebrew numerals.
 		//
 		// example:
 		// |		var date1 = new dojox.date.hebrew.Date();
 		// |
 		// |		document.writeln(dojox.date.hebrew.numerals.getYearHebrewLetters(date1.getFullYear());	
 		
-		var y = year % 1000;
-		if(!y){ throw new Error("Hebrew year "+year+" is not in range 5001-5999");} // FIXME: wrong test
-		return transformChars(convertNumberToStr(y)); // String
+		var rem = year % 1000;
+		//FIXME: tests include dates outside this range and seem to pass.
+		//	    	if((year - rem) / 1000 != 5){ throw new Error("Hebrew year "+year+" is not in range 5001-5999");}
+		return transformChars(convertNumberToStr(rem)); // String
 	};
 	
 	dojox.date.hebrew.numerals.parseYearHebrewLetters  = function(/*String hebrew year*/ year){
-		// summary: This function return year in format number from  the year written in Hebrew numbers-letters
+		// summary: converts the year written in Hebrew numerals to an integer
 		//                   
 		// example:
 		// |		var date = new dojox.date.hebrew.Date();
-		// |        	date.setFullYear(dojox.date.hebrew.numerals.parseYearHebrewLetters('תשס"ח'));
+		// |        	date.setFullYear(dojox.date.hebrew.numerals.parseYearHebrewLetters('\u05ea\u05e9\u05e1\u05f4\u05d7'));
 
 		return parseStrToNumber(year) + 5000; // int
 	};
 	
 	dojox.date.hebrew.numerals.getDayHebrewLetters =  function(day, /*boolean?*/ nogrsh){
-		// summary: This function return date written in Hebrew numbers-letter,  can be in format א or א' (with geresh)
+		// summary: converts an integer to a String representing the number in Hebrew numerals.   Can be formatted with or without geresh ׳
 		//
 		// example:
 		// |		var date1 = new dojox.date.hebrew.Date();
@@ -96,17 +97,17 @@ dojo.provide("dojox.date.hebrew.numerals");
 	};
 	
 	dojox.date.hebrew.numerals.parseDayHebrewLetters =  function(/*String hebrew*/ day){
-		// summary: This function return date in format number from  the date written in Hebrew numbers-letter
+		// summary: converts the string containing a Hebrew numeral to an integer
 		//
 		// example:
 		// |		var date1 = new dojox.date.hebrew.Date();
 		// |
-		// |		date1.setDate(dojox.date.hebrew.numerals.parseDayHebrewLetters('א'));
+		// |		date1.setDate(dojox.date.hebrew.numerals.parseDayHebrewLetters('\u05d0')); // ALEPH
 		return parseStrToNumber(day); // int
 	};
 
 	dojox.date.hebrew.numerals.getMonthHebrewLetters =  function(/*int*/month){
-		// summary: This function return month written in Hebrew numerals
+		// summary: converts an integer representing a  month to a String written in Hebrew numerals
 		//
 		// example:
 		// |		var date1 = new dojox.date.hebrew.Date();
@@ -117,11 +118,14 @@ dojo.provide("dojox.date.hebrew.numerals");
 	};	
 
 	dojox.date.hebrew.numerals.parseMonthHebrewLetters = function(/*String*/monthStr){
-		// summary: This function return month in format number from  the month written in Hebrew  word  or numbers-letters
-		//                   the return number is index in month name array, to use it for setMont, do correction for leap year
+		// summary: converts a Hebrew numeral string representing
+		//	a month to an integer.  The returned value
+		//	is indexed in the month name array.  To use it for
+		//	setMonth, do correction for leap year
+		//
 		// example:
 		// |		var date = new dojox.date.hebrew.Date();
-		// |            var number = dojox.date.hebrew.numerals.parseMonthHebrewLetters("תמוז");
+		// |            var number = dojox.date.hebrew.numerals.parseMonthHebrewLetters("\u05ea\u05de\u05d5\u05d6"); // Tammuz
 		// |		date.setMonth(number);
 			
 		//month number from 0 to 12

data/dojo/dojox/date/islamic.js

@@ -1,5 +1,4 @@
 dojo.provide("dojox.date.islamic");
-dojo.experimental("dojox.date.islamic");
 
 dojo.require("dojox.date.islamic.Date");
 dojo.require("dojo.date"); // for compare

data/dojo/dojox/date/islamic/Date.js

@@ -1,5 +1,4 @@
 dojo.provide("dojox.date.islamic.Date");
-dojo.experimental("dojox.date.islamic.Date");
 
 dojo.require("dojo.date");
 dojo.requireLocalization("dojo.cldr", "islamic");
@@ -56,7 +55,7 @@ dojo.declare("dojox.date.islamic.Date", null, {
 			}else if(arg0 == ""){
 				// date should be invalid.  Dijit relies on this behavior.
 				this._date = new Date(""); //TODO: should this be NaN?  _date is not a Date object
-			}else{  // this is hebrew.Date object
+			}else{  // this is Islamic.Date object
 				this._year = arg0._year;
 				this._month =  arg0._month;  
 				this._date = arg0._date;
@@ -186,7 +185,7 @@ dojo.declare("dojox.date.islamic.Date", null, {
 		this._year = +year;
 	},
 
-	setMonth:function(/*number*/month){
+	setMonth: function(/*number*/month) {
 		// summary: This function set Month
 		//
 		// example:
@@ -194,7 +193,11 @@ dojo.declare("dojox.date.islamic.Date", null, {
 		// |		date1.setMonth(2);
 
 		this._year += Math.floor(month / 12);
-		this._month = Math.floor(month % 12);
+		if(month > 0){
+			this._month = Math.floor(month % 12);
+		}else{
+			this._month = Math.floor(((month % 12) + 12) % 12);
+		}
 	},
 
 	setHours:function(){
@@ -314,7 +317,7 @@ dojo.declare("dojox.date.islamic.Date", null, {
 		x.setMinutes(this._minutes);
 		x.setSeconds(this._seconds);
 		x.setMilliseconds(this._milliseconds);
-		return(this._month+" "+ this._date + " " + this._year + " " + x.toTimeString());
+		return this._month+" "+ this._date + " " + this._year + " " + x.toTimeString();
 	},
 		
 		
@@ -361,20 +364,15 @@ dojo.declare("dojox.date.islamic.Date", null, {
 					+ Math.floor((year - 1) / 400) + Math.floor((((367 * month) - 362) / 12) 
 					+ ((month <= 2) ? 0 : (dojo.date.isLeapYear(new Date(year,month,1)) ? -1 : -2)) + 1);
 					
-		var day = (wjd - tjd2);
-
-		var gdate = new Date(year, month-1, day);
+		var day = (wjd - tjd2) + 1;
 
-		gdate.setHours(this._hours);
-		gdate.setMilliseconds(this._milliseconds);
-		gdate.setMinutes(this._minutes);
-		gdate.setSeconds(this._seconds); 
+		var gdate = new Date(year, (month - 1), day, this._hours, this._minutes, this._seconds, this._milliseconds);
 
 		return gdate;
 	},
 
 	//TODO: would it make more sense to make this a constructor option? or a static?
-	// ported from the Java class com.ibm.icu.util.HebrewCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
+	// ported from the Java class com.ibm.icu.util.IslamicCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
 	fromGregorian:function(/*Date*/gdate){
 		// summary: This function returns the equivalent Islamic Date value for the Gregorian Date
 		// example:
@@ -393,8 +391,8 @@ dojo.declare("dojox.date.islamic.Date", null, {
 					+ (((gMonth+1) <= 2) ? 0 : (dojo.date.isLeapYear(date) ? -1 : -2)) + gDay) 
 					+(Math.floor(date.getSeconds() + 60 * (date.getMinutes() + 60 * date.getHours()) + 0.5) / 86400.0);
 		julianDay = Math.floor(julianDay) + 0.5;
-		
-		var days = julianDay - 1948440;
+
+		var days = julianDay - this._ISLAMIC_EPOCH;
 		var hYear  = Math.floor( (30 * days + 10646) / 10631.0 );
 		var hMonth = Math.ceil((days - 29 - this._yearStart(hYear)) / 29.5 );
 		hMonth = Math.min(hMonth, 11);
@@ -418,26 +416,26 @@ dojo.declare("dojox.date.islamic.Date", null, {
 		return this.toGregorian().valueOf();
 	},
 
-	// ported from the Java class com.ibm.icu.util.HebrewCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
+	// ported from the Java class com.ibm.icu.util.IslamicCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
 	_yearStart:function(/*Number*/year){
 		//summary: return start of Islamic year
 		return (year-1)*354 + Math.floor((3+11*year)/30.0);
 	},
 
-	// ported from the Java class com.ibm.icu.util.HebrewCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
+	// ported from the Java class com.ibm.icu.util.IslamicCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
 	_monthStart:function(/*Number*/year, /*Number*/month){
 		//summary: return the start of Islamic Month
 		return Math.ceil(29.5*month) +
 			(year-1)*354 + Math.floor((3+11*year)/30.0);
 	},
 
-	// ported from the Java class com.ibm.icu.util.HebrewCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
+	// ported from the Java class com.ibm.icu.util.IslamicCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
 	_civilLeapYear:function(/*Number*/year){
 		//summary: return Boolean value if Islamic leap year
 		return (14 + 11 * year) % 30 < 11;
 	},
 
-	// ported from the Java class com.ibm.icu.util.HebrewCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
+	// ported from the Java class com.ibm.icu.util.IslamicCalendar from ICU4J v3.6.1 at http://www.icu-project.org/
 	getDaysInIslamicMonth:function(/*Number*/month, /*Number*/ year){
 		//summary: returns the number of days in the given Islamic Month
 		var length = 0;

data/dojo/dojox/date/islamic/locale.js

@@ -1,10 +1,10 @@
 dojo.provide("dojox.date.islamic.locale");
-dojo.experimental("dojox.date.islamic.locale");
 
 dojo.require("dojox.date.islamic.Date");
 dojo.require("dojo.regexp");
 dojo.require("dojo.string");
 dojo.require("dojo.i18n");
+dojo.require("dojo.date");
 
 dojo.requireLocalization("dojo.cldr", "islamic");
 
@@ -48,7 +48,7 @@ dojo.requireLocalization("dojo.cldr", "islamic");
 					break;
 				case 'a':
 					var timePeriod = (dateObject.getHours() < 12) ? 'am' : 'pm';
-					s = bundle[timePeriod];
+					s = bundle['dayPeriods-format-wide-' + timePeriod];
 					break;
 				case 'h':
 				case 'H':
@@ -80,6 +80,25 @@ dojo.requireLocalization("dojo.cldr", "islamic");
 				case 'S':
 					s = Math.round(dateObject.getMilliseconds() * Math.pow(10, l-3)); pad = true;
 					break;
+				case 'z':
+					// We only have one timezone to offer; the one from the browser
+					s = dojo.date.getTimezoneName(dateObject.toGregorian());
+					if(s){ break; }
+					l = 4;
+					// fallthrough... use GMT if tz not available
+				case 'Z':
+					var offset = dateObject.toGregorian().getTimezoneOffset();
+					var tz = [
+						(offset <= 0 ? "+" : "-"),
+						dojo.string.pad(Math.floor(Math.abs(offset) / 60), 2),
+						dojo.string.pad(Math.abs(offset) % 60, 2)
+					];
+					if(l == 4){
+						tz.splice(0, 0, "GMT");
+						tz.splice(3, 0, ":");
+					}
+					s = tz.join("");
+					break;
 				default:
 					throw new Error("dojox.date.islamic.locale.formatPattern: invalid pattern char: "+pattern);
 			}
@@ -88,9 +107,9 @@ dojo.requireLocalization("dojo.cldr", "islamic");
 		});
 	}	
 	
-dojox.date.islamic.locale.format = function(/*islamic.Date*/dateObject, /*object?*/options){
-	// based on and similar to dojo.date.locale.format
-	//summary:
+// based on and similar to dojo.date.locale.format
+dojox.date.islamic.locale.format = function(/*islamic.Date*/dateObject, /*Object?*/options){
+	// summary:
 	//		Format a Date object as a String, using  settings.
 	options = options || {};
 
@@ -152,17 +171,19 @@ dojox.date.islamic.locale._parseInfo = function(/*oblect?*/options){
 
 
 
-dojox.date.islamic.locale.parse= function(/*String*/value, /*object?*/options){
+dojox.date.islamic.locale.parse= function(/*String*/value, /*Object?*/options){
 	// based on and similar to dojo.date.locale.parse
 	// summary: This function parse string date value according to options	
-	value =  value.replace(/[\u200E\u200F\u202A-\u202E]/g, ""); //remove special chars
 	
-	if(!options){options={};}
+	value =  value.replace(/[\u200E\u200F\u202A\u202E]/g, ""); //remove bidi non-printing chars
+
+	if(!options){ options={}; }
 	var info = dojox.date.islamic.locale._parseInfo(options);
-	
+
 	var tokens = info.tokens, bundle = info.bundle;
-	var re = new RegExp("^" + info.regexp + "$");
-	
+	var regexp = info.regexp.replace(/[\u200E\u200F\u202A\u202E]/g, ""); //remove bidi non-printing chars from the pattern
+	var re = new RegExp("^" + regexp + "$");
+
 	var match = re.exec(value);
 
 	var locale = dojo.i18n.normalizeLocale(options.locale); 
@@ -212,8 +233,8 @@ dojox.date.islamic.locale.parse= function(/*String*/value, /*object?*/options){
 					result[2] =  Number(v);
 				break;
 			case 'a': //am/pm
-				var am = options.am || bundle.am;
-				var pm = options.pm || bundle.pm;
+				var am = options.am || bundle['dayPeriods-format-wide-am'],
+					pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 				if(!options.strict){
 					var period = /\./g;
 					v = v.replace(period,'').toLowerCase();
@@ -310,7 +331,7 @@ function _buildDateTimeRE  (tokens, bundle, options, pattern){
 					s = '\\d+';
 					break;
 				case 'M':
-					s = (l>2) ?  '\\S+' : p2+'[1-9]|1[0-2]';
+					s = (l>2) ?  '\\S+ ?\\S+' : p2+'[1-9]|1[0-2]';
 					break;
 				case 'd':
 					s = '[12]\\d|'+p2+'[1-9]|3[01]';
@@ -338,8 +359,8 @@ function _buildDateTimeRE  (tokens, bundle, options, pattern){
 					s = '\\d{'+l+'}';
 					break;
 				case 'a':
-					var am = options.am || bundle.am || 'AM';
-					var pm = options.pm || bundle.pm || 'PM';
+					var am = options.am || bundle['dayPeriods-format-wide-am'],
+						pm = options.pm || bundle['dayPeriods-format-wide-pm'];
 					if(options.strict){
 						s = am + '|' + pm;
 					}else{

data/dojo/dojox/date/posix.js

@@ -104,7 +104,7 @@ dojox.date.posix.strftime = function(/*Date*/dateObject, /*String*/format, /*Str
 
 			case "p": // either `am' or `pm' according to the given time value,
 				      // or the corresponding strings for the current locale
-				return bundle[dateObject.getHours() < 12 ? "am" : "pm"];
+				return bundle['dayPeriods-format-wide-' + (dateObject.getHours() < 12 ? "am" : "pm")];
 				
 			case "r": // time in a.m. and p.m. notation
 				return $("I") + ":" + $("M") + ":" + $("S") + " " + $("p");

data/dojo/dojox/date/tests/hebrew/Date.js

@@ -13,7 +13,7 @@ tests.register("dojox.date.tests.hebrew.Date",
 
 			name: "dojox.date.tests.posix",
 			setUp: function(){
-				var partLocaleList = ["he"];
+				var partLocaleList = ["he", "en"];
 
 				dojo.forEach(partLocaleList, function(locale){
 					dojo.requireLocalization("dojo.cldr", "gregorian", locale);
@@ -361,7 +361,7 @@ tests.register("dojox.date.tests.hebrew.Date",
 				var dates = [	
 							[5768, 5, 1],
 							[5768, 1, 29],
-							[5769, 5, 16],
+							[5769, 6, 16], // "absolute" index of month, non-leap year
 							[5769, 11, 2],
 							[5770, 0, 2]
 						];

data/dojo/dojox/date/tests/islamic/Date.js

@@ -1,8 +1,13 @@
 dojo.provide("dojox.date.tests.islamic.Date");
 dojo.require("dojox.date.islamic.Date");
+dojo.require("dojox.date.islamic.locale");
+dojo.require("dojox.date.islamic");
 dojo.require("dojo.date");
 
-tests.register("dojox.date.tests.islamic.Date", 
+dojo.requireLocalization("dojo.cldr", "gregorian");
+dojo.requireLocalization("dojo.cldr", "islamic");
+
+tests.register("dojox.date.tests.islamic.Date",
 	[
 		{
 			// Test formatting and parsing of dates in various locales pre-built in dojo.cldr
@@ -10,16 +15,16 @@ tests.register("dojox.date.tests.islamic.Date",
 			// load resources here for specific locales:
 
 			name: "date.locale",
-			setUp: function(){
-				var partLocaleList = ["en-us"];
+			setUp: function() {
+				var partLocaleList = ["ar","en"];
 
-				dojo.forEach(partLocaleList, function(locale){
+				dojo.forEach(partLocaleList, function(locale) {
 					dojo.requireLocalization("dojo.cldr", "islamic", locale);
 				});
 			},
-			runTest: function(t){
+			runTest: function(t) {
 			},
-			tearDown: function(){
+			tearDown: function() {
 				//Clean up bundles that should not exist if
 				//the test is re-run.
 				delete dojo.cldr.nls.islamic;
@@ -27,22 +32,200 @@ tests.register("dojox.date.tests.islamic.Date",
 		},
 		{
 			name: "toGregorian",
-			runTest: function(t){
-				var dateIslamic = new dojox.date.islamic.Date(1429,11,20); // Dec 19, 2008 -- is this right??
+			runTest: function(t) {
+				var dateIslamic = new dojox.date.islamic.Date(1431, 3, 6); // March 22 2010
 				var dateGregorian = dateIslamic.toGregorian();
-				t.is(0, dojo.date.compare(new Date(2008, 11, 19), dateGregorian, "date"));
-				// add exhaustive tests here
+				t.is(0, dojo.date.compare(new Date(2010, 2, 22), dateGregorian, "date"));
 			}
-		}/*,
+		},
 		{
 			name: "fromGregorian",
-			runTest: function(t){
-				var dateIslamic = new dojox.date.IslamicDate();
-				var dateGregorian = new Date(2008,10,12);
+			runTest: function(t) {
+				var dateIslamic = new dojox.date.islamic.Date();
+				var dateGregorian = new Date(2010, 2, 22);
 				dateIslamic.fromGregorian(dateGregorian);
-				t.is(0, dojo.date.compare(new Date(...), dateIslamic, "date"));
-				// add more tests here
+				t.is(0, dojox.date.islamic.compare(new dojox.date.islamic.Date(1431, 3, 6), dateIslamic, "date"));
+			}
+		},
+		{
+			name: "getDay",
+			runTest: function(t) {
+				var dateTable = [
+					[1431, 0, 11, 1],
+					[1431, 1, 3, 2],
+					[1431, 2, 10, 3],
+					[1431, 3, 23, 4],
+					[1431, 6, 21, 6],
+					[1431, 6, 22, 0],
+					[1431, 7, 15, 2]
+				];
+				dojo.forEach(dateTable, function(d, i) {
+					var date = new dojox.date.islamic.Date(d[0], d[1], d[2]);
+					t.is(d[3], date.getDay());
+				});
+
+			}
+		},
+		{
+			name: "getDaysInIslamicMonth",
+			runTest: function(t) {
+
+				var dateTable = [
+					[1430, 1, 29], 
+					[1420, 1, 29], 
+					[1422, 5, 29], 
+					[1431, 5, 29], 
+					[1430, 2, 30],
+					[1431, 2, 30]
+				];
+
+				dojo.forEach(dateTable, function(d, i) {
+					var date = new dojox.date.islamic.Date(d[0], d[1], 1);
+					t.is(d[2], dojox.date.islamic.getDaysInMonth(date));
+				});
+			}
+		},
+		{
+			name: "add_difference",
+			runTest: function(t) {
+				var start = [
+						[1420, 1, 1422, 1],
+						[1430, 2, 1435, 2],
+						[1433, 0, 1434, 0],
+						[1422, 2, 1420, 2],
+						[1429, 3, 1427, 3],
+						[1431, 4, 1431, 6],
+						[1429, 7, 1429, 5],
+						[1431, 3, 1431, 5],
+						[1431, 3, 1431, 0],
+						[1431, 1, 1431, 2],
+						[1431, 9, 1431, 8]
+					];
+				var add = [24, 60, 12, -24, -24, 2, -2, 2, -3, 1, -1];
+
+				var dateHijriStart, dateHijriEnd, res, dateHijriRes;
+				dojo.forEach(start, function(s, i) {
+					dateHijriStart = new dojox.date.islamic.Date(s[0], s[1], 1);
+					dateHijriRes = dojox.date.islamic.add(dateHijriStart, "month", add[i]);
+
+					t.is(0, dateHijriRes.getMonth() - s[3]);
+					t.is(0, dateHijriRes.getFullYear() - s[2]);
+				});
+
+				//month difference
+				dojo.forEach(start, function(s, i) {
+					dateHijriRes = new dojox.date.islamic.Date(s[2], s[3], 1);
+					dateHijriStart = new dojox.date.islamic.Date(s[0], s[1], 1);
+					t.is(add[i], dojox.date.islamic.difference(dateHijriRes, dateHijriStart, "month"));
+				});
+			}
+		},
+		{
+			name: "consistency_of_add_and_difference",
+			runTest: function(t) {
+				var dateIslamic = new dojox.date.islamic.Date(1431, 4, 6);
+
+
+				var amouts = [2, 5, 6, 7, 8, 12, 18, 20, 24, 50, -3, -4, -5, -6, -7, -8, -9, -10, -50, 200, -200];
+				var dateIslamicAdd;
+
+				dojo.forEach(amouts, function(amount, i) {
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "month", amount);
+					t.is(dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "month"), amount);
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "year", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "year"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "week", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "week"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "weekday", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "weekday"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "day", amount)
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "day"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "hour", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "hour"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "minute", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "minute"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "second", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "second"));
+
+					dateIslamicAdd = dojox.date.islamic.add(dateIslamic, "millisecond", amount);
+					t.is(amount, dojox.date.islamic.difference(dateIslamicAdd, dateIslamic, "millisecond"));
+				});
+
+				var dateIslamicDiff = new dojox.date.islamic.Date(1431, 4, 7);
+				t.is(1, dojox.date.islamic.difference(dateIslamicDiff, dateIslamic));
+			}
+		},
+		{
+			name: "getMonth_setMonth",
+			runTest: function(t) {
+				var dateIslamic = new dojox.date.islamic.Date(1420, 1, 1);
+				for (var year = 1420; year < 1430; year++) {
+					dateIslamic.setFullYear(year);
+					t.is(year, dateIslamic.getFullYear());
+					dateIslamic.setMonth(11);
+					t.is(11, dateIslamic.getMonth());
+					dateIslamic.setMonth(6);
+					t.is(6, dateIslamic.getMonth());
+
+				}
+			}
+		},
+		{
+			name: "parse_and_format",
+			runTest: function(t) {
+
+				//test Islamic and English locale
+
+				var dates = [
+							[1430, 5, 1],
+							[1428, 1, 28],
+							[1431, 5, 16],
+							[1431, 11, 2],
+							[1433, 0, 2]
+						];
+
+				var dateIslamic, dateIslamic1;
+				dojo.forEach(dates, function(date, i) {
+					dateIslamic = new dojox.date.islamic.Date(date[0], date[1], date[2]);
+
+					var options = [{ formatLength: 'full', locale: 'ar' }, { formatLength: 'long', locale: 'ar' }, { formatLength: 'medium', locale: 'ar' }, { formatLength: 'short', locale: 'ar' },
+						{ formatLength: 'full', locale: 'en' }, { formatLength: 'long', locale: 'en' }, { formatLength: 'medium', locale: 'en' }, { formatLength: 'short', locale: 'en'}];
+					dojo.forEach(options, function(opt, i) {
+						str = dojox.date.islamic.locale.format(dateIslamic, opt);
+						var option = "{" + opt + ", locale:'ar'}";
+						dateIslamic1 = dojox.date.islamic.locale.parse(str, opt);
+						t.is(0, dojo.date.compare(dateIslamic.toGregorian(), dateIslamic1.toGregorian(), 'date'));
+					});
+
+					var pattern = ['d M yy', 'dd/MM/yy h:m:s', 'dd#MM#yy HH$mm$ss', 'dd MMMM yyyy'];
+					dojo.forEach(pattern, function(pat, i) {
+						options = { datePattern: pat, selector: 'date', locale: 'ar' };
+						str = dojox.date.islamic.locale.format(dateIslamic, options);
+						dateIslamic1 = dojox.date.islamic.locale.parse(str, options);
+						t.is(0, dojo.date.compare(dateIslamic.toGregorian(), dateIslamic1.toGregorian(), 'date'));
+					});
+				});
+
+				dateIslamic = new dojox.date.islamic.Date(1431, 6, 3, 15, 3, 59);
+				pattern = 'HH$mm$ss';
+				options = { timePattern: pattern, selector: 'time' };
+				str = dojox.date.islamic.locale.format(dateIslamic, options);
+				dateIslamic1 = dojox.date.islamic.locale.parse(str, options);
+				var gregDate = dojo.date.locale.parse(str, options);
+				t.is(0, dojo.date.compare(gregDate, dateIslamic1.toGregorian(), 'time'));
+
+				pattern = "h:m:s";
+				options = { timePattern: pattern, selector: 'time' };
+				str = dojox.date.islamic.locale.format(dateIslamic, options);
+				t.is(str, "3:3:59");
 			}
-		}*/
+		}	
 	]
 );