Merge pull request #1011 from clearpathrobotics/fix_migration_rule

Fix migration rule

test/test_rosbag/bag_migration_tests/CMakeLists.txt

@@ -33,10 +33,14 @@ set(messages_msg_gen2
 set(messages_msg_gen3
   Renamed3.msg)
 
-set(messages_msg_current
+set(messages_msg_gen4
   Constants.msg
   Renamed4.msg)
 
+set(messages_msg_current
+  Constants.msg
+  Renamed5.msg)
+
 add_message_files(
   DIRECTORY ${MSG_DIRECTORY}
   FILES ${messages_common} ${messages_${MSG_DIRECTORY}})
@@ -48,24 +52,30 @@ catkin_download_test_data(download_data_test_constants_gen2.bag http://download.
 catkin_download_test_data(download_data_test_converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag FILENAME test/converged_gen1.bag MD5 8e3524157d31b5761ac951fe16e03e12 )
 catkin_download_test_data(download_data_test_converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag FILENAME test/converged_gen2.bag MD5 0ad4041d2e3bab8262c12020ec3e048e )
 catkin_download_test_data(download_data_test_converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag FILENAME test/converged_gen3.bag MD5 90dd16cea5c51fca65be617654fb6b76 )
+catkin_download_test_data(download_data_test_converged_gen4.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag FILENAME test/converged_gen4.bag MD5 c88ac1f4a9a5eebd667ec55224988e40 )
 catkin_download_test_data(download_data_test_convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag FILENAME test/convergent_gen1.bag MD5 a840aec95e50f3c828841b688dfab5a2 )
 catkin_download_test_data(download_data_test_convergent_gen2.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag FILENAME test/convergent_gen2.bag MD5 fd84c135ba1548985b870d0d5f4113e9 )
 catkin_download_test_data(download_data_test_migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag FILENAME test/migrated_addsub_gen1.bag MD5 462e98cef72b5df56ce3feea9ddfc4d2 )
 catkin_download_test_data(download_data_test_migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag FILENAME test/migrated_explicit_gen1.bag MD5 0b77e45aec3ddb19a9f9771c945e2615 )
 catkin_download_test_data(download_data_test_migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag FILENAME test/migrated_explicit_gen2.bag MD5 b237680d6aae1b20355af097cf0f072b )
 catkin_download_test_data(download_data_test_migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag FILENAME test/migrated_explicit_gen3.bag MD5 8b883286e23779bbfc30b0e5588a4d64 )
+catkin_download_test_data(download_data_test_migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag FILENAME test/migrated_explicit_gen4.bag MD5 96a92282f16c30bac237870f144bf9f0 )
 catkin_download_test_data(download_data_test_migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag FILENAME test/migrated_implicit_gen1.bag MD5 229d6cbd7dcec5e87fb2cf597b837243 )
 catkin_download_test_data(download_data_test_migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag FILENAME test/migrated_implicit_gen2.bag MD5 df60111e5f8034ba6259c4d76d07339b )
 catkin_download_test_data(download_data_test_migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag FILENAME test/migrated_implicit_gen3.bag MD5 d86f131070822f1673f7644bc28bfccd )
+catkin_download_test_data(download_data_test_migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag FILENAME test/migrated_implicit_gen4.bag MD5 1d2cdb322996a8f1f4ee6359bded8700 )
 catkin_download_test_data(download_data_test_migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag FILENAME test/migrated_mixed_gen1.bag MD5 2d0be37de2df6940b7bd93561dde7b51 )
 catkin_download_test_data(download_data_test_migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag FILENAME test/migrated_mixed_gen2.bag MD5 e000b2de3e4c417b0c9fbba9d2e92dc4 )
 catkin_download_test_data(download_data_test_migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag FILENAME test/migrated_mixed_gen3.bag MD5 6e1cbb529b7a45386589d00bf3908bdf )
+catkin_download_test_data(download_data_test_migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag FILENAME test/migrated_mixed_gen4.bag MD5 fdbe1928646408c51ec9dc975dd5e678 )
 catkin_download_test_data(download_data_test_partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag FILENAME test/partially_migrated_gen1.bag MD5 dcfcf1e1c1f7ddc5ab723e171273a385 )
 catkin_download_test_data(download_data_test_partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag FILENAME test/partially_migrated_gen2.bag MD5 7b2d752559a7e3c724d8b2a032daf3c1 )
 catkin_download_test_data(download_data_test_partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag FILENAME test/partially_migrated_gen3.bag MD5 01161f84591bf956df7dff0a5e3fd2db )
+catkin_download_test_data(download_data_test_partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag FILENAME test/partially_migrated_gen4.bag MD5 38650a5e81b58500144646f8f781eb6b )
 catkin_download_test_data(download_data_test_renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag FILENAME test/renamed_gen1.bag MD5 243d6109f3bfd2ad1af1337a776970e5 )
 catkin_download_test_data(download_data_test_renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag FILENAME test/renamed_gen2.bag MD5 229c79262e42b71f36e316ab1d1ad943 )
 catkin_download_test_data(download_data_test_renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag FILENAME test/renamed_gen3.bag MD5 c9c3d03807de367b533f5e0384b4d134 )
+catkin_download_test_data(download_data_test_renamed_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag FILENAME test/renamed_gen4.bag MD5 94454a67e7fb7187b61d46bc42f00b18 )
 catkin_download_test_data(download_data_test_subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag FILENAME test/subunmigrated_gen1.bag MD5 c78b85016aa34669e36d1eb5a7b5f2c7 )
 catkin_download_test_data(download_data_test_unmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag FILENAME test/unmigrated_gen1.bag MD5 87d8d3a1c9679609533803709d21cea2 )
 

test/test_rosbag/bag_migration_tests/MessageHistory.txt

@@ -8,8 +8,8 @@ previous generation forward.
 
 To use a particular generation script, move msgs_N to msgs, and then
 run script/generate_data_N.py.  The bash script "generate_data" does
-this for all generations.  The helper scripts, "gen1, gen2, gen3, and
-current" switch the message context to that particular 
+this for all generations.  The helper scripts, "gen1, gen2, gen3, gen4,
+and current" switch the message context to that particular
 
 
 GENERATION 1:
@@ -50,7 +50,7 @@ GENERATION 3
  Hierarchical.msg      - explicit
  SuperHierarchical.msg - implicit
 
-CURRENT:
+GENERATION 4:
  UnMigrated.msg        - explicit  (No corresponding rule)
  Subunmigrated.msg
  PartiallyMigrated.msg - explicit  (No corresponding rule)
@@ -62,4 +62,16 @@ CURRENT:
  Hierarchical.msg      - implicit
  SuperHierarchical.msg
 
-
+CURRENT:
+ UnMigrated.msg        - explicit  (No corresponding rule)
+ Subunmigrated.msg
+ PartiallyMigrated.msg - explicit  (No corresponding rule)
+ MigratedExplicit.msg  - explicit
+ MigratedImplicit.msg  - implicit
+ MigratedMixed.msg     - implicit
+ Converged.msg         - implicit
+ Renamed5.msg          - rename from Renamed4.msg
+ Hierarchical.msg      - implicit
+ SuperHierarchical.msg
+
+

test/test_rosbag/bag_migration_tests/msg_current/MigratedExplicit.msg

@@ -1,4 +1,4 @@
 Header  header
-float32 afield2 #58.2
+float32 field2 #58.2
 string  combo_field3 #"aldfkja 17"
-int32   afield4 #82
+int32   field4 #82

test/test_rosbag/bag_migration_tests/msg_current/MigratedImplicit.msg

@@ -1,5 +1,5 @@
 Header  header
-MigratedExplicit field4 #(17, 58.2 "aldfkja", 82)
+MigratedExplicit field4 #(58.2 "aldfkja 17", 82)
 string  field3 #"kljene"
 float32 field2 #16.32
 int32   field1 #34

test/test_rosbag/bag_migration_tests/msg_current/MigratedMixed.msg

@@ -1,3 +1,3 @@
 Header             header
-MigratedImplicit   field1 #(34, 16.32, "kjljene", (17, 58.2, "aldfkja", 82))
+MigratedImplicit   field1 #(34, 16.32, "kjljene", (58.2, "aldfkja 17", 82))
 int32              field2 #59

test/test_rosbag/bag_migration_tests/msg_current/PartiallyMigrated.msg

@@ -1,4 +1,5 @@
 int32            field1 # 40
-MigratedExplicit field2 # (17, 58.2, "aldfkja", 82)
+MigratedExplicit field2 # (58.2, "aldfkja 17", 82)
 string           field3 # "radasdk"
-float32          field5 # 63.4
+float32          field4 # 63.4
+float64          field5 # 123.4

test/test_rosbag/bag_migration_tests/msg_current/Unmigrated.msg

@@ -1,3 +1,4 @@
 int32   field1 #12
 string  field2 #"uuiasjs"
-float32 field3 #61.7
+float32 field3 #61.7
+float64 field4 #123.4

test/test_rosbag/bag_migration_tests/msg_gen4/Constants.msg

@@ -0,0 +1,3 @@
+int32 CONSTANT=2
+int32 CONSTANT_TWO=42
+int32 value

test/test_rosbag/bag_migration_tests/msg_gen4/Converged.msg

@@ -0,0 +1,2 @@
+float32[4]           field1 # [1.2, 3.4, 5.6, 7.8]
+SimpleMigrated[4]    field2 # [11, 22, 33, 44]

test/test_rosbag/bag_migration_tests/msg_gen4/MigratedAddSub.msg

@@ -0,0 +1,2 @@
+Simple field1
+Simple field2

test/test_rosbag/bag_migration_tests/msg_gen4/MigratedExplicit.msg

@@ -0,0 +1,4 @@
+Header  header
+float32 afield2 #58.2
+string  combo_field3 #"aldfkja 17"
+int32   afield4 #82

test/test_rosbag/bag_migration_tests/msg_gen4/MigratedImplicit.msg

@@ -0,0 +1,7 @@
+Header  header
+MigratedExplicit field4 #(58.2 "aldfkja 17", 82)
+string  field3 #"kljene"
+float32 field2 #16.32
+int32   field1 #34
+
+

test/test_rosbag/bag_migration_tests/msg_gen4/MigratedMixed.msg

@@ -0,0 +1,3 @@
+Header             header
+MigratedImplicit   field1 #(34, 16.32, "kjljene", (58.2, "aldfkja 17", 82))
+int32              field2 #59

test/test_rosbag/bag_migration_tests/msg_gen4/PartiallyMigrated.msg

@@ -0,0 +1,4 @@
+int32            field1 # 40
+MigratedExplicit field2 # (58.2, "aldfkja 17", 82)
+string           field3 # "radasdk"
+float32          field4 # 63.4

test/test_rosbag/bag_migration_tests/msg_gen4/Renamed4.msg

@@ -0,0 +1,2 @@
+float64  foo  # 2.17
+int32[4] bar  # [8, 2, 5, 1]

test/test_rosbag/bag_migration_tests/msg_gen4/Simple.msg

@@ -0,0 +1 @@
+int32 field1 #42

test/test_rosbag/bag_migration_tests/msg_gen4/SimpleMigrated.msg

@@ -0,0 +1 @@
+int32 data4 # 42

test/test_rosbag/bag_migration_tests/msg_gen4/SubUnmigrated.msg

@@ -0,0 +1,2 @@
+int32      field1 # 92
+Unmigrated field2 # (12, "uuiasjs", 61.7)

test/test_rosbag/bag_migration_tests/msg_gen4/Unmigrated.msg

@@ -0,0 +1,3 @@
+int32   field1 #12
+string  field2 #"uuiasjs"
+float32 field3 #61.7

test/test_rosbag/bag_migration_tests/scripts/generate_data

@@ -22,12 +22,12 @@ save_msg()
     done
 }
 
-# Take optional positional argument that specifies which message generations to build; defaults to $(seq 1 3):
+# Take optional positional argument that specifies which message generations to build; defaults to $(seq 1 4):
 if [ $# -gt 0 ]
 then
     GENERATIONS=$@
 else
-    GENERATIONS=$(seq 1 3)
+    GENERATIONS=$(seq 1 4)
 fi
 
 # Find the bag_migration_tests folder inside the test_rosbag package, since the .bag files would be

test/test_rosbag/bag_migration_tests/scripts/generate_data_4.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+# Software License Agreement (BSD License)
+#
+# Copyright (c) 2008, Willow Garage, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of Willow Garage, Inc. nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from test_rosbag.msg import *
+
+import rosbag
+
+def generate_data():
+    bag = rosbag.Bag("test/migrated_explicit_gen4.bag", "w")
+    m = MigratedExplicit(None, 58.2, "aldfkja 17", 82)
+    bag.write("migrated_explicit", m, genpy.Time())
+    bag.close()
+
+    bag = rosbag.Bag("test/migrated_implicit_gen4.bag", "w")
+    m = MigratedImplicit(None, MigratedExplicit(None, 58.2, "aldfkja 17", 82), "kljene", 16.32, 34)
+    bag.write("migrated_implicit", m, genpy.Time())
+    bag.close()
+
+    bag = rosbag.Bag("test/migrated_mixed_gen4.bag", "w")
+    m = MigratedMixed(None, MigratedImplicit(None, MigratedExplicit(None, 58.2, "aldfkja 17", 82), "kljene", 16.32, 34), 59)
+    bag.write("migrated_mixed", m, genpy.Time())
+    bag.close()
+
+    bag = rosbag.Bag("test/partially_migrated_gen4.bag", "w")
+    m = PartiallyMigrated(40, MigratedExplicit(None, 58.2, "aldfkja 17", 82), "radasdk", 63.4)
+    bag.write("partially_migrated", m, genpy.Time())
+    bag.close()
+
+    bag = rosbag.Bag("test/renamed_gen4.bag", "w")
+    m = Renamed4(2.17, [8, 2, 5, 1])
+    bag.write("renamed", m, genpy.Time())
+    bag.close()
+
+    bag = rosbag.Bag("test/converged_gen4.bag", "w")
+    m = Converged([1.2, 3.4, 5.6, 7.8], [SimpleMigrated(11), SimpleMigrated(22), SimpleMigrated(33), SimpleMigrated(44)])
+    bag.write("converged", m, genpy.Time())
+    bag.close()
+
+if __name__ == '__main__':
+    generate_data()

test/test_rosbag/bag_migration_tests/test/migrate_test.py.in

@@ -58,7 +58,7 @@ class MigrationTest(unittest.TestCase):
     self.assertTrue(len(res[0][1]) == 1)
     self.assertTrue(not res[0][1][0].valid)
     self.assertEqual(res[0][1][0].old_class._md5sum, '4b12e5ff694b0e2a31b2ea9e0bd900f4')
-    self.assertEqual(res[0][1][0].new_class._md5sum, 'b5d640967dccef2a24697ec4b8a571ec')
+    self.assertEqual(res[0][1][0].new_class._md5sum, 'fed3471829c6040a8c84cd6c04ec5ab2')
 
 
   def test_subunmigrated(self):
@@ -73,7 +73,7 @@ class MigrationTest(unittest.TestCase):
     self.assertTrue(len(res[0][1]) == 1)
     self.assertTrue(not res[0][1][0].valid)
     self.assertEqual(res[0][1][0].old_class._md5sum, '4b12e5ff694b0e2a31b2ea9e0bd900f4')
-    self.assertEqual(res[0][1][0].new_class._md5sum, 'b5d640967dccef2a24697ec4b8a571ec')
+    self.assertEqual(res[0][1][0].new_class._md5sum, 'fed3471829c6040a8c84cd6c04ec5ab2')
 
   def do_partially_migrated(self, N):
     tmp_rule_files = ['migrated_explicit_rules.bmr', 'migrated_mixed_rules.bmr', 'migrated_addsub_rules.bmr', 'partially_migrated_rules.bmr']
@@ -86,9 +86,9 @@ class MigrationTest(unittest.TestCase):
 
     self.assertTrue(len(res[0][1]) == 1)
     self.assertTrue(not res[0][1][0].valid)
-    self.assertEqual(res[0][1][0].old_class._md5sum, 'aba12af164ecf3f5cd150fb990205c4b')
-    self.assertEqual(res[0][1][0].new_class._md5sum, 'b942bf4a41fb2bebc502889fd8981dfe')
-    
+    self.assertEqual(res[0][1][0].old_class._md5sum, '9fafd0ad3f442b8a7908d03e9bb64de2')
+    self.assertEqual(res[0][1][0].new_class._md5sum, '45f99fcf57ef956dd2a6a16472643507')
+
 
   def test_partially_migrated_gen1(self):
     self.do_partially_migrated(1)
@@ -99,6 +99,9 @@ class MigrationTest(unittest.TestCase):
   def test_partially_migrated_gen3(self):
     self.do_partially_migrated(3)
 
+  def test_partially_migrated_gen4(self):
+    self.do_partially_migrated(4)
+
 
   def test_addsub(self):
     tmp_rule_files = ['migrated_explicit_rules.bmr', 'migrated_mixed_rules.bmr', 'migrated_addsub_rules.bmr']
@@ -140,9 +143,9 @@ class MigrationTest(unittest.TestCase):
 
     self.assertTrue(len(msgs) > 0)
 
-    self.assertEqual(msgs[0][1].afield2, struct.unpack('<f',struct.pack('<f',58.2))[0])
+    self.assertEqual(msgs[0][1].field2, struct.unpack('<f',struct.pack('<f',58.2))[0])
     self.assertEqual(msgs[0][1].combo_field3, "aldfkja 17")
-    self.assertEqual(msgs[0][1].afield4, 82)
+    self.assertEqual(msgs[0][1].field4, 82)
 
   def test_migrated_explicit_gen1(self):
     self.do_migrated_explicit(1)
@@ -153,6 +156,9 @@ class MigrationTest(unittest.TestCase):
   def test_migrated_explicit_gen3(self):
     self.do_migrated_explicit(3)
 
+  def test_migrated_explicit_gen4(self):
+    self.do_migrated_explicit(4)
+
 
 
   def do_migrated_implicit(self, N):
@@ -173,9 +179,9 @@ class MigrationTest(unittest.TestCase):
 
     self.assertTrue(len(msgs) > 0)
 
-    self.assertEqual(msgs[0][1].field4.afield2, struct.unpack('<f',struct.pack('<f',58.2))[0])
+    self.assertEqual(msgs[0][1].field4.field2, struct.unpack('<f',struct.pack('<f',58.2))[0])
     self.assertEqual(msgs[0][1].field4.combo_field3, "aldfkja 17")
-    self.assertEqual(msgs[0][1].field4.afield4, 82)
+    self.assertEqual(msgs[0][1].field4.field4, 82)
 
     self.assertEqual(msgs[0][1].field1, 34)
     self.assertEqual(msgs[0][1].field2, struct.unpack('<f',struct.pack('<f',16.32))[0])
@@ -191,6 +197,9 @@ class MigrationTest(unittest.TestCase):
   def test_migrated_implicit_gen3(self):
     self.do_migrated_implicit(3)
 
+  def test_migrated_implicit_gen4(self):
+    self.do_migrated_implicit(4)
+
 
 
   def do_migrated_mixed(self, N):
@@ -211,9 +220,9 @@ class MigrationTest(unittest.TestCase):
 
     self.assertTrue(len(msgs) > 0)
 
-    self.assertEqual(msgs[0][1].field1.field4.afield2, struct.unpack('<f',struct.pack('<f',58.2))[0])
+    self.assertEqual(msgs[0][1].field1.field4.field2, struct.unpack('<f',struct.pack('<f',58.2))[0])
     self.assertEqual(msgs[0][1].field1.field4.combo_field3, "aldfkja 17")
-    self.assertEqual(msgs[0][1].field1.field4.afield4, 82)
+    self.assertEqual(msgs[0][1].field1.field4.field4, 82)
 
     self.assertEqual(msgs[0][1].field1.field1, 34)
     self.assertEqual(msgs[0][1].field1.field2, struct.unpack('<f',struct.pack('<f',16.32))[0])
@@ -230,6 +239,9 @@ class MigrationTest(unittest.TestCase):
   def test_migrated_mixed_gen3(self):
     self.do_migrated_mixed(3)
 
+  def test_migrated_mixed_gen4(self):
+    self.do_migrated_mixed(4)
+
 
 
   def do_renamed(self, N):
@@ -251,7 +263,7 @@ class MigrationTest(unittest.TestCase):
     self.assertTrue(len(msgs) > 0)
 
 
-    self.assertEqual(msgs[0][1]._type, 'test_rosbag/Renamed4', 'Type name is wrong')
+    self.assertEqual(msgs[0][1]._type, 'test_rosbag/Renamed5', 'Type name is wrong')
     self.assertEqual(msgs[0][1].foo, struct.unpack('<d',struct.pack('<d',2.17))[0])
     self.assertEqual(msgs[0][1].bar, (8, 2, 5, 1))
 
@@ -265,6 +277,9 @@ class MigrationTest(unittest.TestCase):
   def test_renamed_gen3(self):
     self.do_renamed(3)
 
+  def test_renamed_gen4(self):
+    self.do_renamed(4)
+
 
   def do_converged(self, N):
     tmp_rule_files = ['migrated_explicit_rules.bmr', 'migrated_mixed_rules.bmr', 'migrated_addsub_rules.bmr', 'renamed_rules.bmr', 'simple_migrated_rules.bmr', 'converged_rules.bmr']
@@ -305,6 +320,9 @@ class MigrationTest(unittest.TestCase):
   def test_converged_gen3(self):
     self.do_converged(3)
 
+  def test_converged_gen4(self):
+    self.do_converged(4)
+
 
   def do_convergent(self, N):
     tmp_rule_files = ['migrated_explicit_rules.bmr', 'migrated_mixed_rules.bmr', 'migrated_addsub_rules.bmr', 'renamed_rules.bmr', 'simple_migrated_rules.bmr', 'converged_rules.bmr']