Fixed unit tests

Author: portaloffreedom

Dockerfile

@@ -15,7 +15,8 @@ RUN apt-get install -y build-essential      \
                        python               \
                        python3-pip          \
                        libyaml-cpp-dev      \
-                       xsltproc
+                       xsltproc             \
+                       libcairo2-dev
 RUN apt-get install -y libgazebo9-dev gazebo9
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 

pyrevolve/revolve_bot/brain/base.py

@@ -7,9 +7,9 @@ class Brain(object):
     def from_yaml(yaml_brain):
         brain_type = yaml_brain['type']
 
-        if brain_type == 'neural-network':
+        if brain_type == pyrevolve.revolve_bot.brain.BrainNN.TYPE:
             return pyrevolve.revolve_bot.brain.BrainNN.from_yaml(yaml_brain)
-        elif brain_type == 'rlpower-splines':
+        elif brain_type == pyrevolve.revolve_bot.brain.BrainRLPowerSplines.TYPE:
             return pyrevolve.revolve_bot.brain.BrainRLPowerSplines.from_yaml(yaml_brain)
         else:
             return Brain()

pyrevolve/revolve_bot/brain/brain_nn.py

@@ -11,6 +11,7 @@ class BrainNN(Brain):
     """
     Base class allowing for constructing neural network controller components in an overviewable manner
     """
+    TYPE = 'neural-network'
 
     def __init__(self):
         self.nodes = {}
@@ -51,6 +52,7 @@ def from_yaml(yaml_object):
 
     def to_yaml(self):
         yaml_dict_brain = OrderedDict()
+        yaml_dict_brain['type'] = self.TYPE
 
         yaml_dict_neurons = OrderedDict()
         for node in self.nodes:

pyrevolve/revolve_bot/brain/rlpower_splines.py

@@ -3,13 +3,16 @@
 
 
 class BrainRLPowerSplines(Brain):
+    TYPE = 'rlpower-splines'
 
     @staticmethod
     def from_yaml(yaml_object):
         return BrainRLPowerSplines()
 
     def to_yaml(self):
-        return {}
+        return {
+            'type': self.TYPE
+        }
 
     def learner_sdf(self):
         return xml.etree.ElementTree.Element('rv:learner', {'type': 'rlpower'})

test_py/generate/test_body.py

@@ -1,22 +1,27 @@
-from __future__ import absolute_import
-
 import unittest
 
 from pyrevolve.revolve_bot import RevolveBot
 
+
 class TestRevolveBot(unittest.TestCase):
     """
     Basic tests for RobolveBot body and brain generation
     """
+    def revolve_bot_equal(self, roba, robb):
+        self._revolve_bot_body_equal(roba._body, robb._body)
+        self._revolve_bot_brain_equal(roba._brain, robb._brain)
 
-    def test_load_save_yaml(self):
-        """
-        We load a YAML file and save it
-        """
+    def _revolve_bot_body_equal(self, bodya, bodyb):
+        self.assertEqual(type(bodya), type(bodyb))
+
+    def _revolve_bot_brain_equal(self, braina, brainb):
+        self.assertEqual(type(braina), type(brainb))
+
+    def _proto_test(self, filename):
 
         revolve_bot = RevolveBot()
         revolve_bot.load_file(
-            path='experiments/examples/yaml/simple_robot.yaml',
+            path=filename,
             conf_type='yaml'
         )
         revolve_bot.save_file(
@@ -30,4 +35,13 @@ def test_load_save_yaml(self):
             conf_type='yaml'
         )
 
-        self.assertEqual(revolve_bot, revolve_bot2)
+        self.revolve_bot_equal(revolve_bot, revolve_bot2)
+
+    def test_load_save_yaml(self):
+        """
+        We load a YAML file and save it
+        """
+        self._proto_test('experiments/examples/yaml/simple_robot.yaml')
+        self._proto_test('experiments/examples/yaml/spider.yaml')
+        self._proto_test('experiments/examples/yaml/gecko.yaml')
+        self._proto_test('experiments/examples/yaml/snake.yaml')