From e75dd17e2ccb12338bfeaa9c5ea49e37d015a733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Tue, 15 Nov 2016 09:59:40 +0100
Subject: [PATCH] Fix tests that use #forwarded

---
 test/ejabberd_SUITE.erl | 22 +++++++++++-----------
 test/suite.erl          | 15 ++++++++++++++-
 test/suite.hrl          |  3 +++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index 121719cdf..3ac12953c 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -2083,7 +2083,7 @@ retrieve_messages_from_room_via_mam(Config, Range) ->
 			 xmlns = ?NS_MAM_1,
 			 queryid = QID,
 			 sub_els =
-			     [#forwarded{
+			     [#forwarded_decoded{
 				 delay = #delay{},
 				 sub_els = [#message{
 					       from = MyNickJID,
@@ -2411,7 +2411,7 @@ carbons_slave(Config) ->
        #message{from = MyBareJID, to = MyJID, type = chat,
 		sub_els =
 		    [#carbons_sent{
-			forwarded = #forwarded{
+			forwarded = #forwarded_decoded{
 				       sub_els =
 					   [#message{from = Peer,
 						     to = MyBareJID,
@@ -2420,7 +2420,7 @@ carbons_slave(Config) ->
        #message{from = MyBareJID, to = MyJID, type = chat,
 		sub_els =
 		    [#carbons_sent{
-			forwarded = #forwarded{
+			forwarded = #forwarded_decoded{
 				       sub_els =
 					   [#message{from = Peer,
 						     to = Peer,
@@ -2429,7 +2429,7 @@ carbons_slave(Config) ->
        #message{from = MyBareJID, to = MyJID, type = chat,
 		sub_els =
 		    [#carbons_received{
-			forwarded = #forwarded{
+			forwarded = #forwarded_decoded{
 				       sub_els =
 					   [#message{from = Peer,
 						     to = MyBareJID,
@@ -2438,7 +2438,7 @@ carbons_slave(Config) ->
        #message{from = MyBareJID, to = MyJID, type = chat,
 		sub_els =
 		    [#carbons_received{
-			forwarded = #forwarded{
+			forwarded = #forwarded_decoded{
 				       sub_els =
 					   [#message{from = Peer,
 						     to = Peer,
@@ -2560,7 +2560,7 @@ mam_query_all(Config, NS) ->
                            [#mam_result{
                                queryid = QID,
                                sub_els =
-                                   [#forwarded{
+				   [#forwarded_decoded{
                                        delay = #delay{},
                                        sub_els =
                                            [#message{
@@ -2599,7 +2599,7 @@ mam_query_with(Config, JID, NS) ->
                        sub_els =
                            [#mam_result{
                                sub_els =
-                                   [#forwarded{
+				   [#forwarded_decoded{
                                        delay = #delay{},
                                        sub_els =
                                            [#message{
@@ -2640,7 +2640,7 @@ mam_query_rsm(Config, NS) ->
                            [#mam_result{
 			       xmlns = NS,
                                sub_els =
-                                   [#forwarded{
+				   [#forwarded_decoded{
                                        delay = #delay{},
                                        sub_els =
                                            [#message{
@@ -2677,7 +2677,7 @@ mam_query_rsm(Config, NS) ->
                            [#mam_result{
 			       xmlns = NS,
                                sub_els =
-                                   [#forwarded{
+				   [#forwarded_decoded{
                                        delay = #delay{},
                                        sub_els =
                                            [#message{
@@ -2717,7 +2717,7 @@ mam_query_rsm(Config, NS) ->
                            [#mam_result{
 			       xmlns = NS,
                                sub_els =
-                                   [#forwarded{
+				   [#forwarded_decoded{
                                        delay = #delay{},
                                        sub_els =
                                            [#message{
@@ -2773,7 +2773,7 @@ mam_query_rsm(Config, NS) ->
 			   [#mam_result{
 			       xmlns = NS,
 			       sub_els =
-				   [#forwarded{
+				   [#forwarded_decoded{
 				       delay = #delay{},
 				       sub_els =
 					   [#message{
diff --git a/test/suite.erl b/test/suite.erl
index 52c030df1..3c46e8f6b 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -481,9 +481,22 @@ format_element(El) ->
 	false -> io_lib:format(" ~s~n", El)
     end.
 
+substitute_forwarded(#mam_result{sub_els = Sub} = El) ->
+    El#mam_result{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]};
+substitute_forwarded(#carbons_sent{forwarded = Sub} = El) ->
+    El#carbons_sent{forwarded = [substitute_forwarded(SEl) || SEl <- Sub]};
+substitute_forwarded(#message{sub_els = Sub} = El) ->
+    El#message{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]};
+substitute_forwarded(#forwarded{delay = Delay, xml_els = Sub}) ->
+    #forwarded_decoded{delay = Delay, sub_els = [xmpp:decode(SEl) || SEl <- Sub]};
+substitute_forwarded(El) ->
+    El.
+
+
+
 decode(El, NS, Opts) ->
     try
-	Pkt = xmpp:decode(El, NS, Opts),
+	Pkt = substitute_forwarded(xmpp:decode(El, NS, Opts)),
 	ct:pal("RECV:~n~s~n~s",
 	       [format_element(El), xmpp:pp(Pkt)]),
 	Pkt
diff --git a/test/suite.hrl b/test/suite.hrl
index 00239f8cf..d9a9c5ab0 100644
--- a/test/suite.hrl
+++ b/test/suite.hrl
@@ -5,6 +5,9 @@
 -include("mod_proxy65.hrl").
 -include("xmpp_codec.hrl").
 
+-record(forwarded_decoded, {delay :: #delay{},
+			    sub_els = [] :: [fxml:xmlel()]}).
+
 -define(STREAM_TRAILER, <<"</stream:stream>">>).
 
 -define(PUBSUB(Node), <<(?NS_PUBSUB)/binary, "#", Node>>).