Fix formatting and also some migration fixes for megaco

1 files changed, 97 insertions, 145 deletions

diff --git a/lib/megaco/test/megaco_codec_v1_test.erl b/lib/megaco/test/megaco_codec_v1_test.erl
index 74c70b72ee..7068d005da 100644
--- a/lib/megaco/test/megaco_codec_v1_test.erl
+++ b/lib/megaco/test/megaco_codec_v1_test.erl
@@ -39,20 +39,14 @@
 -export([t/0, t/1]).
 
 -export([all/0,groups/0,init_per_group/2,end_per_group/2, 
-
-	 
-
 	 
 	 pretty_test_msgs/1, 
-
 	 
 	 compact_test_msgs/1,
-
 	 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
 	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
@@ -63,32 +57,21 @@
 	 flex_compact_dm_timers4/1, 
 	 flex_compact_dm_timers5/1, 
 	 flex_compact_dm_timers6/1, 
-
-	 
-	 
 	 
 	 bin_test_msgs/1,
-
 	 
 	 ber_test_msgs/1, 
-
 	 
 	 ber_bin_test_msgs/1, 
-
 	
 	 per_test_msgs/1,
-
 	
 	 per_bin_test_msgs/1,
-
-	
 	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
 	 
-
-	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -131,7 +114,6 @@
 	 compact_otp6017_msg01/1, 
 	 compact_otp6017_msg02/1, 
 	 compact_otp6017_msg03/1, 
-
 	 
          flex_compact_otp7431_msg01a/1,
          flex_compact_otp7431_msg01b/1,
@@ -141,7 +123,6 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
 	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
@@ -184,7 +165,6 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
 	 
-	 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -478,159 +458,131 @@ end_per_testcase(Case, Config) ->
 %% Top test case
 
 all() -> 
-[{group, text}, {group, binary}, {group, erl_dist},
- {group, tickets}].
+    [{group, text}, {group, binary}, {group, erl_dist},
+     {group, tickets}].
 
 groups() -> 
     [{text, [],
-  [{group, pretty}, {group, flex_pretty},
-   {group, compact}, {group, flex_compact}]},
- {binary, [],
-  [{group, bin}, {group, ber}, {group, ber_bin},
-   {group, per}, {group, per_bin}]},
- {erl_dist, [], [{group, erl_dist_m}]},
- {pretty, [], [pretty_test_msgs]},
- {compact, [], [compact_test_msgs]},
- {flex_pretty, [], flex_pretty_cases()},
- {flex_compact, [], flex_compact_cases()},
- {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
- {ber_bin, [], [ber_bin_test_msgs]},
- {per, [], [per_test_msgs]},
- {per_bin, [], [per_bin_test_msgs]},
- {erl_dist_m, [], [erl_dist_m_test_msgs]},
- {tickets, [],
-  [{group, compact_tickets}, {group, pretty_tickets},
-   {group, flex_compact_tickets},
-   {group, flex_pretty_tickets}]},
- {compact_tickets, [],
-  [compact_otp4011_msg1, compact_otp4011_msg2,
-   compact_otp4011_msg3, compact_otp4013_msg1,
-   compact_otp4085_msg1, compact_otp4085_msg2,
-   compact_otp4280_msg1, compact_otp4299_msg1,
-   compact_otp4299_msg2, compact_otp4359_msg1,
-   compact_otp4920_msg0, compact_otp4920_msg1,
-   compact_otp4920_msg2, compact_otp4920_msg3,
-   compact_otp4920_msg4, compact_otp4920_msg5,
-   compact_otp4920_msg6, compact_otp4920_msg7,
-   compact_otp4920_msg8, compact_otp4920_msg9,
-   compact_otp4920_msg10, compact_otp4920_msg11,
-   compact_otp4920_msg12, compact_otp4920_msg20,
-   compact_otp4920_msg21, compact_otp4920_msg22,
-   compact_otp4920_msg23, compact_otp4920_msg24,
-   compact_otp4920_msg25, compact_otp5186_msg01,
-   compact_otp5186_msg02, compact_otp5186_msg03,
-   compact_otp5186_msg04, compact_otp5186_msg05,
-   compact_otp5186_msg06, compact_otp5793_msg01,
-   compact_otp5993_msg01, compact_otp5993_msg02,
-   compact_otp5993_msg03, compact_otp6017_msg01,
-   compact_otp6017_msg02, compact_otp6017_msg03]},
- {flex_compact_tickets, [],
-  flex_compact_tickets_cases()},
- {pretty_tickets, [],
-  [pretty_otp4632_msg1, pretty_otp4632_msg2,
-   pretty_otp4632_msg3, pretty_otp4632_msg4,
-   pretty_otp4710_msg1, pretty_otp4710_msg2,
-   pretty_otp4945_msg1, pretty_otp4945_msg2,
-   pretty_otp4945_msg3, pretty_otp4945_msg4,
-   pretty_otp4945_msg5, pretty_otp4945_msg6,
-   pretty_otp4949_msg1, pretty_otp4949_msg2,
-   pretty_otp4949_msg3, pretty_otp5042_msg1,
-   pretty_otp5068_msg1, pretty_otp5085_msg1,
-   pretty_otp5085_msg2, pretty_otp5085_msg3,
-   pretty_otp5085_msg4, pretty_otp5085_msg5,
-   pretty_otp5085_msg6, pretty_otp5085_msg7,
-   pretty_otp5600_msg1, pretty_otp5600_msg2,
-   pretty_otp5601_msg1, pretty_otp5793_msg01,
-   pretty_otp5882_msg01, pretty_otp6490_msg01,
-   pretty_otp6490_msg02, pretty_otp6490_msg03,
-   pretty_otp6490_msg04, pretty_otp6490_msg05,
-   pretty_otp6490_msg06, pretty_otp7671_msg01,
-   pretty_otp7671_msg02, pretty_otp7671_msg03,
-   pretty_otp7671_msg04, pretty_otp7671_msg05]},
- {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+      [{group, pretty}, {group, flex_pretty},
+       {group, compact}, {group, flex_compact}]},
+     {binary, [],
+      [{group, bin}, {group, ber}, {group, ber_bin},
+       {group, per}, {group, per_bin}]},
+     {erl_dist, [], [{group, erl_dist_m}]},
+     {pretty, [], [pretty_test_msgs]},
+     {compact, [], [compact_test_msgs]},
+     {flex_pretty, [], flex_pretty_cases()},
+     {flex_compact, [], flex_compact_cases()},
+     {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+     {ber_bin, [], [ber_bin_test_msgs]},
+     {per, [], [per_test_msgs]},
+     {per_bin, [], [per_bin_test_msgs]},
+     {erl_dist_m, [], [erl_dist_m_test_msgs]},
+     {tickets, [],
+      [{group, compact_tickets}, {group, pretty_tickets},
+       {group, flex_compact_tickets},
+       {group, flex_pretty_tickets}]},
+     {compact_tickets, [],
+      [compact_otp4011_msg1, compact_otp4011_msg2,
+       compact_otp4011_msg3, compact_otp4013_msg1,
+       compact_otp4085_msg1, compact_otp4085_msg2,
+       compact_otp4280_msg1, compact_otp4299_msg1,
+       compact_otp4299_msg2, compact_otp4359_msg1,
+       compact_otp4920_msg0, compact_otp4920_msg1,
+       compact_otp4920_msg2, compact_otp4920_msg3,
+       compact_otp4920_msg4, compact_otp4920_msg5,
+       compact_otp4920_msg6, compact_otp4920_msg7,
+       compact_otp4920_msg8, compact_otp4920_msg9,
+       compact_otp4920_msg10, compact_otp4920_msg11,
+       compact_otp4920_msg12, compact_otp4920_msg20,
+       compact_otp4920_msg21, compact_otp4920_msg22,
+       compact_otp4920_msg23, compact_otp4920_msg24,
+       compact_otp4920_msg25, compact_otp5186_msg01,
+       compact_otp5186_msg02, compact_otp5186_msg03,
+       compact_otp5186_msg04, compact_otp5186_msg05,
+       compact_otp5186_msg06, compact_otp5793_msg01,
+       compact_otp5993_msg01, compact_otp5993_msg02,
+       compact_otp5993_msg03, compact_otp6017_msg01,
+       compact_otp6017_msg02, compact_otp6017_msg03]},
+     {flex_compact_tickets, [],
+      flex_compact_tickets_cases()},
+     {pretty_tickets, [],
+      [pretty_otp4632_msg1, pretty_otp4632_msg2,
+       pretty_otp4632_msg3, pretty_otp4632_msg4,
+       pretty_otp4710_msg1, pretty_otp4710_msg2,
+       pretty_otp4945_msg1, pretty_otp4945_msg2,
+       pretty_otp4945_msg3, pretty_otp4945_msg4,
+       pretty_otp4945_msg5, pretty_otp4945_msg6,
+       pretty_otp4949_msg1, pretty_otp4949_msg2,
+       pretty_otp4949_msg3, pretty_otp5042_msg1,
+       pretty_otp5068_msg1, pretty_otp5085_msg1,
+       pretty_otp5085_msg2, pretty_otp5085_msg3,
+       pretty_otp5085_msg4, pretty_otp5085_msg5,
+       pretty_otp5085_msg6, pretty_otp5085_msg7,
+       pretty_otp5600_msg1, pretty_otp5600_msg2,
+       pretty_otp5601_msg1, pretty_otp5793_msg01,
+       pretty_otp5882_msg01, pretty_otp6490_msg01,
+       pretty_otp6490_msg02, pretty_otp6490_msg03,
+       pretty_otp6490_msg04, pretty_otp6490_msg05,
+       pretty_otp6490_msg06, pretty_otp7671_msg01,
+       pretty_otp7671_msg02, pretty_otp7671_msg03,
+       pretty_otp7671_msg04, pretty_otp7671_msg05]},
+     {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
 
 init_per_group(flex_pretty_tickets, Config) -> 
-	flex_pretty_init(Config);
+    flex_pretty_init(Config);
 init_per_group(flex_compact_tickets, Config) -> 
-	flex_compact_init(Config);
+    flex_compact_init(Config);
 init_per_group(flex_compact, Config) -> 
-	flex_compact_init(Config);
+    flex_compact_init(Config);
 init_per_group(flex_pretty, Config) -> 
-	flex_pretty_init(Config);
+    flex_pretty_init(Config);
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(flex_pretty_tickets, Config) -> 
-	flex_pretty_finish(Config);
+    flex_pretty_finish(Config);
 end_per_group(flex_compact_tickets, Config) -> 
-	flex_compact_finish(Config);
+    flex_compact_finish(Config);
 end_per_group(flex_compact, Config) -> 
-	flex_compact_finish(Config);
+    flex_compact_finish(Config);
 end_per_group(flex_pretty, Config) -> 
-	flex_pretty_finish(Config);
+    flex_pretty_finish(Config);
 end_per_group(_GroupName, Config) ->
-	Config.
-
-
-
-
-
-
-
-
-
+    Config.
 
 flex_pretty_cases() -> 
-[flex_pretty_test_msgs].
-
-
+    [flex_pretty_test_msgs].
 
 flex_compact_cases() -> 
-[flex_compact_test_msgs, flex_compact_dm_timers1,
- flex_compact_dm_timers2, flex_compact_dm_timers3,
- flex_compact_dm_timers4, flex_compact_dm_timers5,
- flex_compact_dm_timers6].
-
-
-
-
-
-
-
-
-
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6].
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
 
-
-
-
-
-
 flex_compact_tickets_cases() -> 
-[flex_compact_otp7431_msg01a,
- flex_compact_otp7431_msg01b, flex_compact_otp7431_msg02,
- flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
- flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
- flex_compact_otp7431_msg07].
-
-
-
+    [flex_compact_otp7431_msg01a,
+     flex_compact_otp7431_msg01b, flex_compact_otp7431_msg02,
+     flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
+     flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
+     flex_compact_otp7431_msg07].
 
 flex_pretty_tickets_cases() -> 
-[flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
- flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
- flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
- flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
- flex_pretty_otp5600_msg1, flex_pretty_otp5600_msg2,
- flex_pretty_otp5601_msg1, flex_pretty_otp5793_msg01,
- flex_pretty_otp7431_msg01, flex_pretty_otp7431_msg02,
- flex_pretty_otp7431_msg03, flex_pretty_otp7431_msg04,
- flex_pretty_otp7431_msg05, flex_pretty_otp7431_msg06,
- flex_pretty_otp7431_msg07].
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5600_msg1, flex_pretty_otp5600_msg2,
+     flex_pretty_otp5601_msg1, flex_pretty_otp5793_msg01,
+     flex_pretty_otp7431_msg01, flex_pretty_otp7431_msg02,
+     flex_pretty_otp7431_msg03, flex_pretty_otp7431_msg04,
+     flex_pretty_otp7431_msg05, flex_pretty_otp7431_msg06,
+     flex_pretty_otp7431_msg07].
 
 %% ----