Move copyright definition to ejabberd.hrl

test/proxy65_tests.erl

@@ -24,12 +24,20 @@
 %%%===================================================================
 single_cases() ->
     {proxy65_single, [sequence],
-     [single_test(feature_enabled)]}.
+     [single_test(feature_enabled),
+      single_test(service_vcard)]}.
 
 feature_enabled(Config) ->
     true = is_feature_advertised(Config, ?NS_BYTESTREAMS, proxy_jid(Config)),
     disconnect(Config).
 
+service_vcard(Config) ->
+    JID = proxy_jid(Config),
+    ct:comment("Retreiving vCard from ~s", [jid:to_string(JID)]),
+    #iq{type = result, sub_els = [#vcard_temp{}]} =
+	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
+    disconnect(Config).
+
 %%%===================================================================
 %%% Master-slave tests
 %%%===================================================================

test/pubsub_tests.erl

@@ -25,6 +25,7 @@
 single_cases() ->
     {pubsub_single, [sequence],
      [single_test(test_features),
+      single_test(test_vcard),
       single_test(test_create),
       single_test(test_configure),
       single_test(test_delete),
@@ -67,6 +68,13 @@ test_features(Config) ->
     true = sets:is_subset(NeededFeatures, AllFeatures),
     disconnect(Config).
 
+test_vcard(Config) ->
+    JID = pubsub_jid(Config),
+    ct:comment("Retreiving vCard from ~s", [jid:to_string(JID)]),
+    #iq{type = result, sub_els = [#vcard_temp{}]} =
+	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
+    disconnect(Config).
+
 test_create(Config) ->
     Node = ?config(pubsub_node, Config),
     Node = create_node(Config, Node),

test/vcard_tests.erl

@@ -11,7 +11,7 @@
 %% API
 -compile(export_all).
 -import(suite, [send_recv/2, disconnect/1, is_feature_advertised/2,
-		is_feature_advertised/3,
+		is_feature_advertised/3, server_jid/1,
 		my_jid/1, wait_for_slave/1, wait_for_master/1,
 		recv_presence/1, recv/1]).
 
@@ -26,7 +26,8 @@
 single_cases() ->
     {vcard_single, [sequence],
      [single_test(feature_enabled),
-      single_test(get_set)]}.
+      single_test(get_set),
+      single_test(service_vcard)]}.
 
 feature_enabled(Config) ->
     BareMyJID = jid:remove_resource(my_jid(Config)),
@@ -72,6 +73,13 @@ get_set(Config) ->
         send_recv(Config, #iq{type = get, sub_els = [#vcard_temp{}]}),
     disconnect(Config).
 
+service_vcard(Config) ->
+    JID = server_jid(Config),
+    ct:comment("Retreiving vCard from ~s", [jid:to_string(JID)]),
+    #iq{type = result, sub_els = [#vcard_temp{}]} =
+	send_recv(Config, #iq{type = get, to = JID, sub_els = [#vcard_temp{}]}),
+    disconnect(Config).
+
 %%%===================================================================
 %%% Master-slave tests
 %%%===================================================================