adapt tests to the change

API changed a little bit, and some minor expected results too
fusioninventory · Jun 1, 2012 · b3a55a2 · b3a55a2
1 parent f8c979c
commit b3a55a2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/t/inventory/generic/dmidecode/battery.t b/t/inventory/generic/dmidecode/battery.t
@@ -13,13 +13,19 @@ my %tests = (
         NAME         => 'EV06047',
         SERIAL       => undef,
         MANUFACTURER => 'LGC-LGC',
-        CHEMISTRY    => 'Lithium Ion'
+        CHEMISTRY    => 'Lithium Ion',
+        VOLTAGE      => 10800,
+        CAPACITY     => 4400,
+        DATE         => undef
     },
     'linux-2.6' => {
         NAME         => 'DELL C129563',
         MANUFACTURER => 'Samsung SDI',
         SERIAL       => undef,
-        CHEMISTRY    => undef
+        CHEMISTRY    => undef,
+        VOLTAGE      => 11100,
+        CAPACITY     => 48000,
+        DATE         => undef
     },
     'openbsd-3.7' => undef,
     'openbsd-3.8' => undef,
@@ -32,7 +38,9 @@ my %tests = (
         SERIAL       => '2000417915',
         DATE         => '09/19/2002',
         MANUFACTURER => 'TOSHIBA',
-        CHEMISTRY    => 'Lithium Ion'
+        CHEMISTRY    => 'Lithium Ion',
+        VOLTAGE      => 10800,
+        CAPACITY     => 0
     },
     'windows-hyperV' => undef
 );

diff --git a/t/inventory/generic/dmidecode/memory.t b/t/inventory/generic/dmidecode/memory.t
@@ -277,6 +277,16 @@ my %tests = (
             CAPTION          => 'DIMM 2',
             CAPACITY         => '512',
             MEMORYCORRECTION => 'Single-bit ECC'
+        },
+        {
+            NUMSLOTS         => 3,
+            SERIALNUMBER     => undef,
+            DESCRIPTION      => 'DIMM (Single-bit ECC)',
+            SPEED            => '400 MHz (2.5 ns)',
+            TYPE             => 'DDR',
+            CAPTION          => 'DIMM 3',
+            CAPACITY         => '512',
+            MEMORYCORRECTION => 'Single-bit ECC'
         }
     ],
     'rhel-4.3' => [
@@ -1619,6 +1629,6 @@ plan tests => scalar keys %tests;
 
 foreach my $test (keys %tests) {
     my $file = "resources/generic/dmidecode/$test";
-    my $memories = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Memory::_getMemories(file => $file);
-    is_deeply($memories, $tests{$test}, $test);
+    my @memories = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Memory::_getMemories(file => $file);
+    is_deeply(\@memories, $tests{$test}, $test);
 }
diff --git a/t/inventory/generic/dmidecode/ports.t b/t/inventory/generic/dmidecode/ports.t
@@ -64,7 +64,8 @@ my %tests = (
             CAPTION     => 'Other'
         }
     ],
-    'freebsd-8.1' => undef,
+    'freebsd-8.1' => [
+    ],
     'linux-2.6' => [
          {
             NAME        => 'PARALLEL',
@@ -1305,6 +1306,6 @@ plan tests => scalar keys %tests;
 
 foreach my $test (keys %tests) {
     my $file = "resources/generic/dmidecode/$test";
-    my $ports = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Ports::_getPorts(file => $file);
-    is_deeply($ports, $tests{$test}, $test);
+    my @ports = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Ports::_getPorts(file => $file);
+    is_deeply(\@ports, $tests{$test}, $test);
 }
diff --git a/t/inventory/generic/dmidecode/slots.t b/t/inventory/generic/dmidecode/slots.t
@@ -668,13 +668,14 @@ my %tests = (
             DESIGNATION => undef
         }
     ],
-    'windows-hyperV' => undef,
+    'windows-hyperV' => [
+    ]
 );
 
 plan tests => scalar keys %tests;
 
 foreach my $test (keys %tests) {
     my $file = "resources/generic/dmidecode/$test";
-    my $slots = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Slots::_getSlots(file => $file);
-    is_deeply($slots, $tests{$test}, $test);
+    my @slots = FusionInventory::Agent::Task::Inventory::Input::Generic::Dmidecode::Slots::_getSlots(file => $file);
+    is_deeply(\@slots, $tests{$test}, $test);
 }