Tests: Added composite tests

test/.gitignore

@@ -1,6 +1,7 @@
 all.log
 *.pyc
 classifier.t
+composite.t
 exclusion.t
 grammar.t
 interval.t

test/CMakeLists.txt

@@ -11,7 +11,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 include_directories (${CMAKE_INSTALL_PREFIX}/include)
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
-set (test_SRCS classifier.t exclusion.t grammar.t interval.t lexer.t lr0.t rules.t util.t)
+set (test_SRCS classifier.t composite.t exclusion.t grammar.t interval.t lexer.t lr0.t rules.t util.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS}

test/composite.t.cpp

@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cmake.h>
+#include <Composite.h>
+#include <test.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int, char**)
+{
+  UnitTest t (1);
+
+  Composite c;
+  c.add ("left",  2, Color ("red"));
+  c.add ("right", 4, Color ("on blue"));
+  t.diag (c.str ());
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+