From 8605ceafddc0db32270ff9f46e8c2ca47ff049e1 Mon Sep 17 00:00:00 2001
From: ankit kariryaa <kariryaa@fhi-berlin.mpg.de>
Date: Wed, 10 Feb 2016 15:02:28 +0100
Subject: [PATCH] Test and corrected regular expression for Gaussian parser
---
.../eu/nomad_lab/parsers/GaussianParser.scala | 7 ++++---
.../eu/nomad_lab/parsers/GaussianParserSpec.scala | 15 +++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 src/test/scala/eu/nomad_lab/parsers/GaussianParserSpec.scala
diff --git a/src/main/scala/eu/nomad_lab/parsers/GaussianParser.scala b/src/main/scala/eu/nomad_lab/parsers/GaussianParser.scala
index 8dc4ac7..5ba7ddb 100644
--- a/src/main/scala/eu/nomad_lab/parsers/GaussianParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/GaussianParser.scala
@@ -8,12 +8,13 @@ object GaussianParser extends SimpleExternalParserGenerator(
("name" -> jn.JString("GaussianParser")) ::
("version" -> jn.JString("1.0")) :: Nil),
mainFileTypes = Seq("text/.*"),
- mainFileRe = """\s*Invoking Gaussian \.\.\.
-\s*Version """.r,
+ mainFileRe = """\s*Gaussian, Inc\. All Rights Reserved\.\s*
+\s*
+\s*This is part of the Gaussian\(R\) [0-9]* program.""".r,
cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/gaussian/parser/parser-gaussian/parser_gaussian.py",
"--uri", "${mainFileUri}", "${mainFilePath}"),
resList = Seq(
- "parser-gaussian/GaussianParser.py",
+ "parser-gaussian/parser_gaussian.py",
"parser-gaussian/setup_paths.py",
"nomad_meta_info/common.nomadmetainfo.json",
"nomad_meta_info/meta_types.nomadmetainfo.json",
diff --git a/src/test/scala/eu/nomad_lab/parsers/GaussianParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/GaussianParserSpec.scala
new file mode 100644
index 0000000..502b65a
--- /dev/null
+++ b/src/test/scala/eu/nomad_lab/parsers/GaussianParserSpec.scala
@@ -0,0 +1,15 @@
+package eu.nomad_lab.parsers
+
+import eu.nomad_lab.{parsers, DefaultPythonInterpreter}
+import org.scalacheck.Properties
+import org.specs2.mutable.Specification
+import org.{json4s => jn}
+
+
+object GaussianParserSpec extends Specification {
+ "GaussianParserTest" >> {
+ examplesBlock {
+ ParserRun.parse(GaussianParser,"/home/kariryaa/NoMad/nomad-lab-base/parsers/gaussian/test/examples/Al.out","") must_== ParseResult.ParseSuccess
+ }
+ }
+}
--
GitLab