Use values from testset hash.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/t/IPSet.t b/t/IPSet.t
index c85d44b49d184be6441b02e9ce4f224750205783..2904b10818c48ecf84cace2adaa1dbf891e5634a 100644 (file)
--- a/t/IPSet.t
+++ b/t/IPSet.t
@@ -27,31 +27,28 @@ my %testset = (
 # Name of the renamed set.
 my $setname_renamed = "TEST_RENAMED";
 
-# Assign setname for easy access.
-my $setname = $testset{'name'};
-
 # Init the IPSet module and create a session.
 my $session = &IPSet::init();
 
 # Create new IPSet.
-my $create_set = &IPSet::create_set($session, $setname, $testset{'type'}, $testset{'hashsize'}, $testset{'maxelem'});
-ok($create_set, "Sucessfully created set: $setname");
+my $create_set = &IPSet::create_set($session, $testset{'name'}, $testset{'type'}, $testset{'hashsize'}, $testset{'maxelem'});
+ok($create_set, "Sucessfully created set: $testset{'name'}");
 
 # Check if the testset exists.
-my $exists = &IPSet::setname_exists($session, $setname);
+my $exists = &IPSet::setname_exists($session, $testset{'name'});
 ok($exists, "The testset exists.");
 
 # Rename the testset.
-my $renamed = &IPSet::rename_set($session, $setname, $setname_renamed);
+my $renamed = &IPSet::rename_set($session, $testset{'name'}, $setname_renamed);
 ok($renamed, "Rename successfull.");
 
 # Check if the renamed set exists.
 $exists = &IPSet::setname_exists($session, $setname_renamed);
 ok($exists, "Renamed testset exists.");
 
-# Create a second set for swap testing.
-&IPSet::create_set($session, $setname, "hash:ip", "1024", "10");
-my $swap = &IPSet::swap_set($session, $setname, $setname_renamed);
+# Create a second set (identical to the testset) for swap testing.
+&IPSet::create_set($session, $testset{'name'}, $testset{'type'}, $testset{'hashsize'}, $testset{'maxelem'});
+my $swap = &IPSet::swap_set($session, $testset{'name'}, $setname_renamed);
 ok($swap, "Successfully swapped sets.");
 
 # Delete the renamed testset.
@@ -59,7 +56,7 @@ my $delete = &IPSet::delete_set($session, $setname_renamed);
 ok($delete, "Successfully deleted set.");
 
 # Try to grab the data from the testset.
-my $data = &IPSet::get_set_data($session, $setname);
+my $data = &IPSet::get_set_data($session, $testset{'name'});
 ok($data, "Successfully grabbed set data.");
 
 # Various tests to check the grabbed data.
@@ -71,4 +68,4 @@ ok($data->{entries} == 0, "$testset{'name'} should not have any elements now.");
 ok($data->{references} == 0, "$testset{'name'} should not be referenced!");
 
 # CLEANUP: Delete the remaining set.
-&IPSet::delete_set($session, $setname);
+&IPSet::delete_set($session, $testset{'name'});