From c71297f5181023d8974ccd6c2c54d0728a54f926 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 13 Jan 2016 09:36:42 +0100 Subject: [PATCH] Improve songsection test --- test/test_content/sections.control | 22 +++++++++++----------- test/test_content/songsection.control | 4 ++-- test/test_content/test_content.py | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/test_content/sections.control b/test/test_content/sections.control index 1aba242d..5a87c67c 100644 --- a/test/test_content/sections.control +++ b/test/test_content/sections.control @@ -1,11 +1,11 @@ -- "section{First Section!}" -- "section{Named section}" -- "section[section_short_name]{Section with short name}" -- "section*{Section* with short name}" -- "part{part section test}" -- "chapter{chapter section test}" -- "section{section section test}" -- "subsection{subsection section test}" -- "subsubsection{subsubsection section test}" -- "paragraph{paragraph section test}" -- "subparagraph{subparagraph section test}" \ No newline at end of file +- section{First Section!} +- section{Named section} +- section[section_short_name]{Section with short name} +- section*{Section* with short name} +- part{part section test} +- chapter{chapter section test} +- section{section section test} +- subsection{subsection section test} +- subsubsection{subsubsection section test} +- paragraph{paragraph section test} +- subparagraph{subparagraph section test} \ No newline at end of file diff --git a/test/test_content/songsection.control b/test/test_content/songsection.control index 25df7ac3..81197f08 100644 --- a/test/test_content/songsection.control +++ b/test/test_content/songsection.control @@ -1,6 +1,6 @@ -- songsection:Traditional +- songsection{Traditional} - exsong.sg -- songchapter:English +- songchapter{English} - texsong.tsg - chordpro.csg - exsong.sg \ No newline at end of file diff --git a/test/test_content/test_content.py b/test/test_content/test_content.py index 83ea5089..1c749198 100644 --- a/test/test_content/test_content.py +++ b/test/test_content/test_content.py @@ -81,7 +81,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): return elem.render(None)[1:] elif isinstance(elem, songsection.SongSection): - return "{}:{}".format(elem.keyword, elem.name) + return elem.render(None)[1:] elif isinstance(elem, tex.LaTeX): return files.path2posix(elem.filename)