diff options
author | Jakob Odersky <jodersky@gmail.com> | 2015-03-25 10:33:14 +0100 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2015-03-25 10:33:14 +0100 |
commit | c7c4f2056df108a2b8213792fc28c6be5a11cf17 (patch) | |
tree | 9db506e5d6bb6f6fe3a4ad991e3710f941043c8e /mavlink-library/src/test | |
parent | 24b02aab563de43db696de73b81c65a20f9a6587 (diff) | |
parent | dd926f514b1a3642a724e970537f834285c8e53b (diff) | |
download | sbt-mavlink-c7c4f2056df108a2b8213792fc28c6be5a11cf17.tar.gz sbt-mavlink-c7c4f2056df108a2b8213792fc28c6be5a11cf17.tar.bz2 sbt-mavlink-c7c4f2056df108a2b8213792fc28c6be5a11cf17.zip |
Merge branch 'chernetsov-master'
Diffstat (limited to 'mavlink-library/src/test')
-rw-r--r-- | mavlink-library/src/test/resources/including.xml | 4 | ||||
-rw-r--r-- | mavlink-library/src/test/scala/com/github/jodersky/mavlink/MainTest.scala | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/mavlink-library/src/test/resources/including.xml b/mavlink-library/src/test/resources/including.xml new file mode 100644 index 0000000..e1b026f --- /dev/null +++ b/mavlink-library/src/test/resources/including.xml @@ -0,0 +1,4 @@ +<?xml version='1.0'?> +<mavlink> + <include>concise.xml</include> +</mavlink>
\ No newline at end of file diff --git a/mavlink-library/src/test/scala/com/github/jodersky/mavlink/MainTest.scala b/mavlink-library/src/test/scala/com/github/jodersky/mavlink/MainTest.scala index faf252a..be46212 100644 --- a/mavlink-library/src/test/scala/com/github/jodersky/mavlink/MainTest.scala +++ b/mavlink-library/src/test/scala/com/github/jodersky/mavlink/MainTest.scala @@ -1,16 +1,15 @@ package com.github.jodersky.mavlink -import scala.io.Source -import scala.xml.XML -import trees._ +import java.io.File object MainTest { def main(args: Array[String]): Unit = { - val definition = XML.load(getClass.getResource("/concise.xml")) - val dialect = Parser.parseDialect(definition) + val parser: Parser = new Parser(StandardReporter) + val dialectDefinitionFile: File = new File("mavlink-library/src/test/resources/including.xml") + val dialect = parser.parseDialect(dialectDefinitionFile) val generator = new Generator(dialect) - println(generator.generate()) + println(generator.targets.map(_.generate()).mkString("\n\n")) } }
\ No newline at end of file |