[Personalrobots-commit] SF.net SVN: personalrobots:[22972] pkg/trunk/stacks

[<jl...@us...>]

Revision: 22972
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22972&view=rev
Author:   jleibs
Date:     2009-08-26 16:39:27 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
Moving test for BatteryState from test_common_msgs to pr2_msgs.

Modified Paths:
--------------
    pkg/trunk/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
    pkg/trunk/stacks/pr2_common/pr2_msgs/test/test_pr2_msgs_migration.py

Added Paths:
-----------
    pkg/trunk/stacks/pr2_common/pr2_msgs/test/saved/BatteryState.saved

Removed Paths:
-------------
    pkg/trunk/stacks/common_msgs/test_common_msgs/test/saved/BatteryState.saved

Deleted: pkg/trunk/stacks/common_msgs/test_common_msgs/test/saved/BatteryState.saved
===================================================================
--- pkg/trunk/stacks/common_msgs/test_common_msgs/test/saved/BatteryState.saved	2009-08-26 16:36:30 UTC (rev 22971)
+++ pkg/trunk/stacks/common_msgs/test_common_msgs/test/saved/BatteryState.saved	2009-08-26 16:39:27 UTC (rev 22972)
@@ -1,22 +0,0 @@
-[robot_msgs/BatteryState]:
-Header header
-float64 energy_remaining ## Joules
-float64 energy_capacity ## Joules
-float64 power_consumption ## Watts
-
-================================================================================
-MSG: roslib/Header
-#Standard metadata for higher-level flow data types
-#sequence ID: consecutively increasing ID 
-uint32 seq
-#Two-integer timestamp that is expressed as:
-# * stamp.secs: seconds (stamp_secs) since epoch
-# * stamp.nsecs: nanoseconds since stamp_secs
-# time-handling sugar is provided by the client library
-time stamp
-#Frame this data is associated with
-# 0: no frame
-# 1: global frame
-string frame_id
-
-

Modified: pkg/trunk/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py
===================================================================
--- pkg/trunk/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py	2009-08-26 16:36:30 UTC (rev 22971)
+++ pkg/trunk/stacks/common_msgs/test_common_msgs/test/test_common_msgs_migration.py	2009-08-26 16:39:27 UTC (rev 22972)
@@ -449,24 +449,6 @@
     self.do_test('angular_acceleration', self.get_old_angular_acceleration, self.get_new_angular_acceleration)
 
 
-########### BatteryState ###############
-
-#  def get_old_battery_state(self):
-#    battery_state_classes = self.load_saved_classes('BatteryState.saved')
-#
-#    battery_state = battery_state_classes['robot_msgs/BatteryState']
-#
-#    return battery_state(None, 1.23, 4.56, 7.89)
-#
-#  def get_new_battery_state(self):
-#    from pr2_msgs.msg import BatteryState
-#
-#    return BatteryState(None, 1.23, 4.56, 7.89)
-#
-#  def test_battery_state(self):
-#    self.do_test('battery_state', self.get_old_battery_state, self.get_new_battery_state)
-
-
 ########### DiagnosticValue ###############
 
   def get_old_diagnostic_value(self):

Copied: pkg/trunk/stacks/pr2_common/pr2_msgs/test/saved/BatteryState.saved (from rev 22956, pkg/trunk/stacks/common_msgs/test_common_msgs/test/saved/BatteryState.saved)
===================================================================
--- pkg/trunk/stacks/pr2_common/pr2_msgs/test/saved/BatteryState.saved	                        (rev 0)
+++ pkg/trunk/stacks/pr2_common/pr2_msgs/test/saved/BatteryState.saved	2009-08-26 16:39:27 UTC (rev 22972)
@@ -0,0 +1,22 @@
+[robot_msgs/BatteryState]:
+Header header
+float64 energy_remaining ## Joules
+float64 energy_capacity ## Joules
+float64 power_consumption ## Watts
+
+================================================================================
+MSG: roslib/Header
+#Standard metadata for higher-level flow data types
+#sequence ID: consecutively increasing ID 
+uint32 seq
+#Two-integer timestamp that is expressed as:
+# * stamp.secs: seconds (stamp_secs) since epoch
+# * stamp.nsecs: nanoseconds since stamp_secs
+# time-handling sugar is provided by the client library
+time stamp
+#Frame this data is associated with
+# 0: no frame
+# 1: global frame
+string frame_id
+
+

Modified: pkg/trunk/stacks/pr2_common/pr2_msgs/test/test_pr2_msgs_migration.py
===================================================================
--- pkg/trunk/stacks/pr2_common/pr2_msgs/test/test_pr2_msgs_migration.py	2009-08-26 16:36:30 UTC (rev 22971)
+++ pkg/trunk/stacks/pr2_common/pr2_msgs/test/test_pr2_msgs_migration.py	2009-08-26 16:39:27 UTC (rev 22972)
@@ -78,6 +78,24 @@
     self.do_test('laser_scanner_signal', self.get_old_laser_scanner_signal, self.get_new_laser_scanner_signal)
 
 
+########### BatteryState ###############
+
+  def get_old_battery_state(self):
+    battery_state_classes = self.load_saved_classes('BatteryState.saved')
+
+    battery_state = battery_state_classes['robot_msgs/BatteryState']
+
+    return battery_state(None, 1.23, 4.56, 7.89)
+
+  def get_new_battery_state(self):
+    from pr2_msgs.msg import BatteryState
+
+    return BatteryState(None, 1.23, 4.56, 7.89)
+
+  def test_battery_state(self):
+    self.do_test('battery_state', self.get_old_battery_state, self.get_new_battery_state)
+
+
 ########### Helper functions ###########
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.