tests and tweaks

barbie · Sep 30, 2010 · 0e6ea14 · 0e6ea14
1 parent b922a58
commit 0e6ea14
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 11 deletions.
diff --git a/lib/CPAN/Testers/Data/Generator.pm b/lib/CPAN/Testers/Data/Generator.pm
@@ -49,7 +49,7 @@ Thanks,
 CPAN Testers Server.
 ';
 
-my $OSNAMES = 'beos|midnightbsd|cygwin|freebsd|netbsd|openbsd|darwin|linux|cygwin|darwin|MSWin32|dragonfly|solaris|MacOS|irix|mirbsd|gnu|bsdos|aix|sco|os2|haiku';
+my $OSNAMES;
 my %OSNAMES = (
     'MacPPC'    => 'macos',
     'osf'       => 'dec_osf',
@@ -795,11 +795,13 @@ sub _oncpan {
 sub _osname {
     my ($self,$name) = @_;
     my $lname = lc $name;
-    unless($self->{OSNAMES}{$lname}) {
-        $self->{OSNAMES}{$lname} = uc($name);
-        $self->{CPANSTATS}->do_query(qq{INSERT INTO osname (osname,ostitle) VALUES ('$name','$self->{OSNAMES}{$lname}')});
-    }
-    return $name;
+    my $uname = uc $name;
+    $self->{OSNAMES}{$lname} ||= do {
+        $self->{CPANSTATS}->do_query(qq{INSERT INTO osname (osname,ostitle) VALUES ('$name','$uname')});
+        $uname;
+    };
+
+    return $self->{OSNAMES}{$lname};
 }
 
 sub _check_arch_os {
@@ -834,9 +836,11 @@ EMAIL
 
 sub _platform_to_osname {
     my $self = shift;
-    my $arch = shift;
+    my $arch = shift || return '';
+
+    $OSNAMES = join('|',keys %{$self->{OSNAMES}})   if(keys %{$self->{OSNAMES}});
 
-    return $1	if($arch =~ /$OSNAMES/i);
+    return $1	if($arch =~ /($OSNAMES)/i);
 
     for my $rx (keys %OSNAMES) {
         return $OSNAMES{$rx} if($arch =~ /$rx/i);

diff --git a/t/12generate.t b/t/12generate.t
@@ -16,7 +16,7 @@ use Test::More;
 
 my (%options,$meta);
 my $config = './t/test-config.ini';
-my $TESTS = 61;
+my $TESTS = 70;
 
 #----------------------------------------------------------------------------
 # Test Conditions
@@ -121,7 +121,31 @@ my @create_sqlite = (
                 ostitle     TEXT
             )',
 
-            "INSERT INTO osname VALUES (1,'linux','Linux')"
+            "INSERT INTO osname VALUES (1,'aix','AIX')",
+            "INSERT INTO osname VALUES (2,'bsdos','BSD/OS')",
+            "INSERT INTO osname VALUES (3,'cygwin','Windows(Cygwin)')",
+            "INSERT INTO osname VALUES (4,'darwin','MacOSX')",
+            "INSERT INTO osname VALUES (5,'dec_osf','Tru64')",
+            "INSERT INTO osname VALUES (6,'dragonfly','DragonflyBSD')",
+            "INSERT INTO osname VALUES (7,'freebsd','FreeBSD')",
+            "INSERT INTO osname VALUES (8,'gnu','GNUHurd')",
+            "INSERT INTO osname VALUES (9,'haiku','Haiku')",
+            "INSERT INTO osname VALUES (10,'hpux','HP-UX')",
+            "INSERT INTO osname VALUES (11,'irix','IRIX')",
+            "INSERT INTO osname VALUES (12,'linux','Linux')",
+            "INSERT INTO osname VALUES (13,'macos','MacOSclassic')",
+            "INSERT INTO osname VALUES (14,'midnightbsd','MidnightBSD')",
+            "INSERT INTO osname VALUES (15,'mirbsd','MirOSBSD')",
+            "INSERT INTO osname VALUES (16,'mswin32','Windows(Win32)')",
+            "INSERT INTO osname VALUES (17,'netbsd','NetBSD')",
+            "INSERT INTO osname VALUES (18,'openbsd','OpenBSD')",
+            "INSERT INTO osname VALUES (19,'os2','OS/2')",
+            "INSERT INTO osname VALUES (20,'os390','OS390/zOS')",
+            "INSERT INTO osname VALUES (21,'osf','OSF')",
+            "INSERT INTO osname VALUES (22,'sco','SCO')",
+            "INSERT INTO osname VALUES (24,'vms','VMS')",
+            "INSERT INTO osname VALUES (23,'solaris','SunOS/Solaris')",
+            "INSERT INTO osname VALUES (25,'beos','BeOS')"
 );
 
 my @create_mysql = (
@@ -210,7 +234,31 @@ my @create_mysql = (
                 PRIMARY KEY (id)
             )',
 
-            "INSERT INTO osname VALUES (1,'linux','Linux')"
+            "INSERT INTO osname VALUES (1,'aix','AIX')",
+            "INSERT INTO osname VALUES (2,'bsdos','BSD/OS')",
+            "INSERT INTO osname VALUES (3,'cygwin','Windows(Cygwin)')",
+            "INSERT INTO osname VALUES (4,'darwin','MacOSX')",
+            "INSERT INTO osname VALUES (5,'dec_osf','Tru64')",
+            "INSERT INTO osname VALUES (6,'dragonfly','DragonflyBSD')",
+            "INSERT INTO osname VALUES (7,'freebsd','FreeBSD')",
+            "INSERT INTO osname VALUES (8,'gnu','GNUHurd')",
+            "INSERT INTO osname VALUES (9,'haiku','Haiku')",
+            "INSERT INTO osname VALUES (10,'hpux','HP-UX')",
+            "INSERT INTO osname VALUES (11,'irix','IRIX')",
+            "INSERT INTO osname VALUES (12,'linux','Linux')",
+            "INSERT INTO osname VALUES (13,'macos','MacOSclassic')",
+            "INSERT INTO osname VALUES (14,'midnightbsd','MidnightBSD')",
+            "INSERT INTO osname VALUES (15,'mirbsd','MirOSBSD')",
+            "INSERT INTO osname VALUES (16,'mswin32','Windows(Win32)')",
+            "INSERT INTO osname VALUES (17,'netbsd','NetBSD')",
+            "INSERT INTO osname VALUES (18,'openbsd','OpenBSD')",
+            "INSERT INTO osname VALUES (19,'os2','OS/2')",
+            "INSERT INTO osname VALUES (20,'os390','OS390/zOS')",
+            "INSERT INTO osname VALUES (21,'osf','OSF')",
+            "INSERT INTO osname VALUES (22,'sco','SCO')",
+            "INSERT INTO osname VALUES (24,'vms','VMS')",
+            "INSERT INTO osname VALUES (23,'solaris','SunOS/Solaris')",
+            "INSERT INTO osname VALUES (25,'beos','BeOS')",
 );
 
 my @create_meta_sqlite = (
@@ -439,6 +487,28 @@ is(create_metabase(0), 0, '.. metabase created');
     my $r = $t->retrieve_report('a58945f6-3510-11df-89c9-1bb9c3681c0d');
     is($r->{guid},'a58945f6-3510-11df-89c9-1bb9c3681c0d','.. found cpanstats guid');
 
+    $options{CPANSTATS} ||= config_db('CPANSTATS');
+    my @rows = $options{CPANSTATS}->{dbh}->get_query('array','SELECT count(id) FROM osname');
+    is($rows[0]->[0],25,'.. all OS names');
+
+    is($t->_platform_to_osname('linux'),'linux','.. known OS');
+    is($t->_platform_to_osname('linuxThis'),'linux','.. known mispelling');
+    is($t->_platform_to_osname('unknown'),'','.. unknown OS');
+
+    is($t->_osname('LINUX'),'Linux','.. known OS fixed case');
+    is($t->_osname('Unknown'),'UNKNOWN','.. save unknown OS');
+    is($t->_platform_to_osname('unknown'),'unknown','.. unknown is now known OS');
+
+    my $json;
+    my $fh = IO::File->new("t/data/ad3189d0-3510-11df-89c9-1bb9c3681c0d.json") or die diag("$!");
+    while(<$fh>) { $json .= $_ }
+    $fh->close;
+
+    my $text = decode_json($json);
+    $t->{report}{metabase} = $text;
+    $t->_check_arch_os();
+    is($t->{report}{osname},'linux','.. set OS');
+    is($t->{report}{platform},'i686-linux-thread-multi-64int','.. set platform');
 }
 
 ## Test we can reparse