X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=t%2F05-store.t;h=0cac16fc7e506d2b513505cb7b116434e13559c9;hp=6e315a3e7315c98ab646028a872c2830f9f75da2;hb=ab3c8b6b75a3c7fb9ddc5a0c474fb1aa7269bc83;hpb=95e5435b8d2f26dcdb28ac586b4167288dfe3438

diff --git a/t/05-store.t b/t/05-store.t
index 6e315a3..0cac16f 100755
--- a/t/05-store.t
+++ b/t/05-store.t
@@ -4,15 +4,17 @@ use warnings;
 
 my $debug = shift @ARGV;
 
-use Test::More tests => 34;
+use Test::More tests => 32;
 use Data::Dump qw/dump/;
 use Cwd qw/abs_path/;
 use lib 'lib';
 
+#use Devel::LeakTrace::Fast;
+
 BEGIN {
 	use_ok('CWMP::Store');
-	use_ok('CWMP::Store::DBMDeep');
 	use_ok('CWMP::Store::YAML');
+	use_ok('CWMP::Store::JSON');
 }
 
 ok(my $abs_path = abs_path($0), "abs_path");
@@ -42,29 +44,37 @@ sub test_store {
 		},
 	};
 
-	cmp_ok( $store->ID_to_uid( 42, $state ), 'eq', 123456, 'ID_to_uid' );
+	cmp_ok( $store->state_to_uid( $state ), 'eq', 123456, 'state_to_uid' );
 
-	ok( $store->update_state( ID => 42, $state ), 'update_state new' );
+	ok( $store->update_state( $state ), 'update_state new' );
 
-	ok( my $store_state = $store->get_state( ID => '42'), 'get_state ID' );
+	ok( my $store_state = $store->get_state( 123456 ), 'get_state' );
 
-	is_deeply( $store_state, $state, 'state ID' );
+	isa_ok( $state, 'HASH' );
+	isa_ok( $store_state, 'HASH' );
 
-	ok( $store_state = $store->get_state( uid =>  123456 ), 'get_state uid' );
+	if ( $debug ) {
 
-	is_deeply( $store_state, $state, 'state ID same as uid' );
+		diag "store_state = ",dump( $store_state );
+	
+	}
 
-	ok( $store->update_state( ID => 42, { baz => 12345 } ), 'update_state existing' );
+	is_deeply( $state, $store_state, 'state ID same as uid' );
 
-	$state->{baz} = 12345;
+	$state = {
+		DeviceID => {
+			SerialNumber => 123456,
+		},
+		baz => 12345 
+	};
 
-	is_deeply( $store->get_state( ID => 42 ), $state, 'get_state ID' );
+	ok( $store->set_state( 123456, $state ), 'set_state' );
 
-	is_deeply( $store->get_state( uid => 123456 ), $state, 'get_state uid' );
+	is_deeply( $store->get_state( 123456 ), $state, 'get_state' );
 
 	is_deeply( [ $store->all_uids ], [ 123456 ], 'all_uids' );
 
-	ok( $store->update_state( ID => 11, { DeviceID => { SerialNumber => 99999 } } ), 'new device' );
+	ok( $store->update_state( { DeviceID => { SerialNumber => 99999 } } ), 'new device' );
 
 	is_deeply( [ $store->all_uids ], [ 123456, 99999 ], 'all_uids' );
 
@@ -72,6 +82,6 @@ sub test_store {
 
 # now test all stores
 
-test_store('DBMDeep');
 test_store('YAML');
+test_store('JSON');