diff options
| author | Einar Egilsson | 2009-10-07 11:24:44 +0000 |
|---|---|---|
| committer | Einar Egilsson | 2009-10-07 11:24:44 +0000 |
| commit | a703799580a208beac24c827fcd54b799f46a3d7 (patch) | |
| tree | 5dc5b71933534189abee7bd4c40f26fbaa0c125d /chrome/content/unittest/testcases.js | |
| parent | 96966ca83f96ed1babcd2bd23aa68feb63fbb7a7 (diff) | |
Finally working normally again after massive refactoring.
Disabling single redirects works but needs more GUI work.
Added Redirector log file since the Error Console keeps deleting our messages.
git-svn-id: http://einaregilsson.googlecode.com/svn/mozilla/redirector/trunk@253 119bf307-c92d-0410-89bd-8f53e6181181
Diffstat (limited to 'chrome/content/unittest/testcases.js')
| -rw-r--r-- | chrome/content/unittest/testcases.js | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/chrome/content/unittest/testcases.js b/chrome/content/unittest/testcases.js index ea6e26b..ac9539f 100644 --- a/chrome/content/unittest/testcases.js +++ b/chrome/content/unittest/testcases.js @@ -1,7 +1,7 @@ //// $Id$
var tests = {
"Wildcard matches" : {
- run : function(data) {
+ run : function(data,log) {
var pattern = data[0],
url = data[1],
expected = data[2];
@@ -13,8 +13,9 @@ var tests = { }
redirectUrl = redirectUrl.substr(0, redirectUrl.length-1);
}
- var result = redirector.wildcardMatch(pattern, url, redirectUrl, false);
- return result == expected;
+ var redirect = new Redirect(null, pattern, null, redirectUrl, Redirect.WILDCARD, null);
+ var result = redirect.getMatch(url);
+ return { passed: result.isMatch && (result.redirectTo == expected), message : "Expected '" + expected + "', actual was '" + result.redirectTo + "'"};
},
describe : function(data) { return data[0] + ' == ' + data[1] + ', matches=' + data[2]; },
@@ -35,5 +36,44 @@ var tests = { ['*://*oo*bar*', 'http://foo.is/bar/baz', 'http,f,.is/,/baz'],
['*://**oo*bar*', 'http://foo.is/bar/baz', 'http,,f,.is/,/baz'],
]
+ },
+
+ "Regex matches" : {
+ run : function(data,log) {
+ var pattern = data[0],
+ url = data[1],
+ expected = data[2];
+ var parts = expected.split(',');
+ var redirectUrl = '';
+ if (!(parts.length == 1 && parts[0] == '')) {
+ for (var i in parts) {
+ redirectUrl += '$' + (parseFloat(i)+1) + ',';
+ }
+ redirectUrl = redirectUrl.substr(0, redirectUrl.length-1);
+ }
+ var redirect = new Redirect(null, pattern, null, redirectUrl, Redirect.REGEX, null);
+ var result = redirect.getMatch(url);
+ return { passed: result.isMatch && result.redirectTo == expected, message : "Expected '" + expected + "', actual was '" + result.redirectTo + "'"};
+ },
+
+ describe : function(data) { return data[0] + ' == ' + data[1] + ', matches=' + data[2]; },
+ tests : [
+ ['http://foo(.*)', 'http://foobar.is', 'bar.is'],
+ ['http://foo(.*)', 'http://foo', ''],
+ ['(.*)://foo.is', 'http://foo.is', 'http'],
+ ['(.*)http://foo\\.is', 'http://foo.is', ''],
+ ['http(.*)foo(.*)', 'http://foobar.is', '://,bar.is'],
+ ['http(.*)foo(.*)', 'http://foo', '://,'],
+ ['(.*)://f(.*)\\.is', 'http://foo.is', 'http,oo'],
+ ['(.*)http://f(.*)\\.is', 'http://foo.is', ',oo'],
+ ['(.*)foo(.*)', 'http://foo', 'http://,'],
+ ['(.*)foo(.*)', 'foobar.is', ',bar.is'],
+ ['(.*)foo(.*)', 'http://foobar.is', 'http://,bar.is'],
+ ['http://foo\.is', 'http://foo.is', ''],
+ ['(.*)', 'http://foo.is', 'http://foo.is'],
+ ['(.*)://(.*)oo(.*)bar(.*)', 'http://foo.is/bar/baz', 'http,f,.is/,/baz'],
+ ['(.*)://(.*?)(.*)oo(.*)bar(.*)', 'http://foo.is/bar/baz', 'http,,f,.is/,/baz'],
+ ]
}
+
};
|