[asterisk-commits] dlee: branch dlee/stasis-cache-split r394185 - /team/dlee/stasis-cache-split/...

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Jul 12 10:42:40 2013
New Revision: 394185

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394185
Log:
Fixed devicestate test for cache split

Modified:
    team/dlee/stasis-cache-split/tests/test_devicestate.c

Modified: team/dlee/stasis-cache-split/tests/test_devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/tests/test_devicestate.c?view=diff&rev=394185&r1=394184&r2=394185
==============================================================================
--- team/dlee/stasis-cache-split/tests/test_devicestate.c (original)
+++ team/dlee/stasis-cache-split/tests/test_devicestate.c Fri Jul 12 10:42:40 2013
@@ -394,7 +394,7 @@
 {
 	RAII_VAR(struct ao2_container *, cache_dump, NULL, ao2_cleanup);
 	/* remove all device states created during this test */
-	cache_dump = stasis_cache_dump(ast_device_state_topic_cached(), NULL);
+	cache_dump = stasis_cache_dump(ast_device_state_cache(), NULL);
 	if (!cache_dump) {
 		return;
 	}
@@ -451,7 +451,7 @@
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == consumer->state);
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == consumer->aggregate_state);
 
-	msg = stasis_cache_get(ast_device_state_topic_cached(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
+	msg = stasis_cache_get(ast_device_state_cache(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
 	device_state = stasis_message_data(msg);
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == device_state->state);
 	ao2_cleanup(msg);
@@ -466,7 +466,7 @@
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == consumer->state);
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == consumer->aggregate_state);
 
-	msg = stasis_cache_get(ast_device_state_topic_cached(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
+	msg = stasis_cache_get(ast_device_state_cache(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
 	device_state = stasis_message_data(msg);
 	ast_test_validate(test, AST_DEVICE_NOT_INUSE == device_state->state);
 	ao2_cleanup(msg);
@@ -479,7 +479,7 @@
 	ast_test_validate(test, AST_DEVICE_INUSE == consumer->state);
 	ast_test_validate(test, AST_DEVICE_INUSE == consumer->aggregate_state);
 
-	msg = stasis_cache_get(ast_device_state_topic_cached(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
+	msg = stasis_cache_get(ast_device_state_cache(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
 	device_state = stasis_message_data(msg);
 	ast_test_validate(test, AST_DEVICE_INUSE == device_state->state);
 	ao2_cleanup(msg);
@@ -492,7 +492,7 @@
 	ast_test_validate(test, AST_DEVICE_RINGING == consumer->state);
 	ast_test_validate(test, AST_DEVICE_RINGINUSE == consumer->aggregate_state);
 
-	msg = stasis_cache_get(ast_device_state_topic_cached(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
+	msg = stasis_cache_get(ast_device_state_cache(), ast_device_state_message_type(), UNIT_TEST_DEVICE_IDENTIFIER);
 	device_state = stasis_message_data(msg);
 	ast_test_validate(test, AST_DEVICE_RINGINUSE == device_state->state);
 	ao2_cleanup(msg);