Bug 482482: Migrate version comparator tests to xpcshell. r=bsmedberg

This commit is contained in:
Dave Townsend 2009-03-19 08:35:17 +00:00
parent 9f624a2b99
commit 7bcb659b25
3 changed files with 59 additions and 162 deletions

View File

@ -1,63 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla XPCOM.
*
* The Initial Developer of the Original Code is
* Benjamin Smedberg <benjamin@smedbergs.us>.
*
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "nsVersionComparator.h"
#include <stdio.h>
int main(int argc, char **argv)
{
if (argc != 3) {
fprintf(stderr, "Usage: %s <versionA> <versionB>\n", argv[0]);
return 1;
}
PRInt32 i = NS_CompareVersions(argv[1], argv[2]);
const char *format;
if (i < 0)
format = "%s < %s\n";
else if (i > 0)
format = "%s > %s\n";
else
format = "%s = %s\n";
fprintf(stdout, format, argv[1], argv[2]);
return 0;
}

View File

@ -1,99 +0,0 @@
#!/usr/bin/perl -w
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Mozilla XPCOM Tests.
#
# The Initial Developer of the Original Code is
# Benjamin Smedberg <benjamin@smedbergs.us>.
#
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
my $executable = shift;
@comparisons = (
"0.9",
"0.9.1",
"1.0pre1",
"1.0pre2",
"1.0",
"1.1pre",
"1.1pre1a",
"1.1pre1",
"1.1pre10a",
"1.1pre10",
"1.1",
"1.1.0.1",
"1.1.1",
"1.1.*",
"1.*",
"2.0",
"2.1",
"3.0.-1",
"3.0"
);
@equality = (
"1.1pre",
"1.1pre0",
"1.0+"
);
# Do the comparisons in both directions
sub run_testprog {
my ($executable, $args, $expected) = @_;
my $result = `$executable $args`;
$result =~ s/\r|\n//g;
if ($result ne $expected) {
print STDERR "Testing '$args' expected '$expected', got '$result'.\n";
exit 1;
}
}
for (my $i = 0; $i < scalar(@comparisons) - 1; ++$i) {
run_testprog($executable,
"$comparisons[$i] $comparisons[$i + 1]",
"$comparisons[$i] < $comparisons[$i + 1]");
run_testprog($executable,
"$comparisons[$i + 1] $comparisons[$i]",
"$comparisons[$i + 1] > $comparisons[$i]");
}
for (my $i = 0; $i < scalar(@equality) - 1; ++$i) {
run_testprog($executable,
"$equality[$i] $equality[$i + 1]",
"$equality[$i] = $equality[$i + 1]");
}
print "All comparisons OK\n";
exit 0;

View File

@ -0,0 +1,59 @@
// Versions to test listed in ascending order, none can be equal
var comparisons = [
"0.9",
"0.9.1",
"1.0pre1",
"1.0pre2",
"1.0",
"1.1pre",
"1.1pre1a",
"1.1pre1",
"1.1pre10a",
"1.1pre10",
"1.1",
"1.1.0.1",
"1.1.1",
"1.1.*",
"1.*",
"2.0",
"2.1",
"3.0.-1",
"3.0"
];
// Every version in this list means the same version number
var equality = [
"1.1pre",
"1.1pre0",
"1.0+"
];
function run_test()
{
var vc = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
.getService(Components.interfaces.nsIVersionComparator);
for (var i = 0; i < comparisons.length; i++) {
for (var j = 0; j < comparisons.length; j++) {
var result = vc.compare(comparisons[i], comparisons[j]);
if (i == j) {
if (result != 0)
do_throw(comparisons[i] + " should be the same as itself");
}
else if (i < j) {
if (!(result < 0))
do_throw(comparisons[i] + " should be less than " + comparisons[j]);
}
else if (!(result > 0)) {
do_throw(comparisons[i] + " should be greater than " + comparisons[j]);
}
}
}
for (i = 0; i < equality.length; i++) {
for (j = 0; j < equality.length; j++) {
if (vc.compare(equality[i], equality[j]) != 0)
do_throw(equality[i] + " should equal " + equality[j]);
}
}
}