Changeset 5541

Timestamp:

05/28/08 14:26:41 (3 months ago)

Author:

morris

Message:

Update tests

Files:

• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (1 diff)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (1 diff)
• libwired/trunk/test/tests/wi-p7-spec-tests.c (modified) (2 diffs)

libwired/trunk/libwired/p7/wi-p7-spec.c

@@ -1953 +1953 @@
-
-
+wi_uinteger_t wi_p7_spec_type_size(wi_p7_spec_type_t *type) {
+        return type->size;
+}
+
+
+
-#pragma mark -
-

libwired/trunk/libwired/p7/wi-p7-spec.h

@@ -77 +77 @@
-WI_EXPORT wi_string_t *                                 wi_p7_spec_type_name(wi_p7_spec_type_t *);
-WI_EXPORT wi_uinteger_t                                 wi_p7_spec_type_id(wi_p7_spec_type_t *);
+WI_EXPORT wi_uinteger_t                                 wi_p7_spec_type_size(wi_p7_spec_type_t *);
-
-

libwired/trunk/test/tests/wi-p7-spec-tests.c

@@ -41 +41 @@
-        WI_TEST_ASSERT_NOT_NULL(p7_spec, "%m");
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-}
@@ -100 +99 @@
-        WI_TEST_ASSERT_EQUAL_INSTANCES(wi_p7_spec_version(p7_spec), WI_STR("1.0"), "");
-        
-p7_spec, WI_STR("test"
-p7_spec, 1000
-EQUALS(wi_p7_spec_message_id(p7_spec, WI_STR("foo")), (wi_uinteger_t ) WI_P7_SPEC_MESSAGE_ID_NULL
-name
+wi_p7_spec_message_with_name(p7_spec, WI_STR("test")
+wi_p7_spec_message_with_id(p7_spec, 1000)
+NULL(wi_p7_spec_message_with_name(p7_spec, WI_STR("foo"))
+with_id
-        
-p7_spec, WI_STR("test.bool"
-p7_spec, 1000
-EQUALS(wi_p7_spec_field_id(p7_spec, WI_STR("foo")), (wi_uinteger_t ) WI_P7_SPEC_FIELD_ID_NULL
-name
+wi_p7_spec_field_with_name(p7_spec, WI_STR("test.bool")
+wi_p7_spec_field_with_id(p7_spec, 1000)
+NULL(wi_p7_spec_field_with_name(p7_spec, WI_STR("foo"))
+with_id
-        
-field_type(p7_spec, 1000
-field_type(p7_spec, 1001
-field_type(p7_spec, 1002
-field_type(p7_spec, 1003
-field_type(p7_spec, 1004
-field_type(p7_spec, 1005
-field_type(p7_spec, 1006
-field_type(p7_spec, 1007
-field_type(p7_spec, 1008
-field_type(p7_spec, 1009
-field_type(p7_spec, 1010
-field_type(p7_spec, 1011
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1000))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1001))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1002))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1003))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1004))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1005))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1006))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1007))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1008))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1009))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1010))
+type_id(wi_p7_spec_field_type(wi_p7_spec_field_with_id(p7_spec, 1011))
-
-_INSTANCES(wi_p7_spec_enum_name(p7_spec, 1001, 1), WI_STR("test.enum.1")
-NULL(wi_p7_spec_enum_name(p7_spec, 1001, 2000
-EQUALS(wi_p7_spec_enum_value(p7_spec, 1001, WI_STR("test.enum.1")), 1U
-EQUALS(wi_p7_spec_enum_value(p7_spec, 1001, WI_STR("foo")), (wi_p7_enum_t) WI_P7_SPEC_ENUM_NULL
+S(wi_hash_data_for_key(wi_p7_spec_field_enums_by_name(wi_p7_spec_field_with_name(p7_spec, WI_STR("test.enum"))), WI_STR("test.enum.1")), (void *) 1
+EQUAL_INSTANCES(wi_hash_data_for_key(wi_p7_spec_field_enums_by_value(wi_p7_spec_field_with_name(p7_spec, WI_STR("test.enum"))), (void *) 2), WI_STR("test.enum.2"
+NULL(wi_hash_data_for_key(wi_p7_spec_field_enums_by_name(wi_p7_spec_field_with_name(p7_spec, WI_STR("test.enum"))), WI_STR("test.enum.1000"))
+NULL(wi_hash_data_for_key(wi_p7_spec_field_enums_by_value(wi_p7_spec_field_with_name(p7_spec, WI_STR("test.enum"))), (void *) 1000)
-#endif
-}