From 0260af033e16e915378273b0c11a3d4912b0749f Mon Sep 17 00:00:00 2001
From: ankit kariryaa <kariryaa@fhi-berlin.mpg.de>
Date: Mon, 2 May 2016 15:37:46 +0200
Subject: [PATCH] Update tests; Fix name
---
.../scala/eu/nomad_lab/parsers/OctopusParser.scala | 10 +++++-----
.../scala/eu/nomad_lab/parsers/OctopusParserSpec.scala | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala b/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
index d38cddb..ea5c430 100644
--- a/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/OctopusParser.scala
@@ -6,10 +6,10 @@ import org.{ json4s => jn }
import scala.collection.breakOut
object OctopusParser extends SimpleExternalParserGenerator(
- name = "OctopusParser",
+ name = "OrcaParser",
parserInfo = jn.JObject(
- ("name" -> jn.JString("OctopusParser")) ::
- ("parserId" -> jn.JString("OctopusParser" + lab.OctopusVersionInfo.version)) ::
+ ("name" -> jn.JString("OrcaParser")) ::
+ ("parserId" -> jn.JString("OrcaParser" + lab.OctopusVersionInfo.version)) ::
("versionInfo" -> jn.JObject(
("nomadCoreVersion" -> jn.JObject(lab.NomadCoreVersionInfo.toMap.map {
case (k, v) => k -> jn.JString(v.toString)
@@ -24,10 +24,10 @@ object OctopusParser extends SimpleExternalParserGenerator(
//TODO: Update the replacement string (mainFileRe)
mainFileRe = """******************************** Grid ********************************
|Simulation Box:""".r,
- cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/octopus/parser/parser-octopus/OctopusParser.py",
+ cmd = Seq(DefaultPythonInterpreter.python2Exe(), "${envDir}/parsers/octopus/parser/parser-octopus/OrcaParser.py",
"--uri", "${mainFileUri}", "${mainFilePath}"),
resList = Seq(
- "parser-octopus/OctopusParser.py",
+ "parser-octopus/OrcaParser.py",
"parser-octopus/setup_paths.py",
"nomad_meta_info/public.nomadmetainfo.json",
"nomad_meta_info/common.nomadmetainfo.json",
diff --git a/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
index 27a7316..c4866c4 100644
--- a/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/OctopusParserSpec.scala
@@ -3,12 +3,12 @@ package eu.nomad_lab.parsers
import org.specs2.mutable.Specification
object OctopusParserSpec extends Specification {
- "CastepParserTest" >> {
+ "OctopusParserTest" >> {
"test with json-events" >> {
- ParserRun.parse(CastepParser, "parsers/castep/test/examples/", "json-events") must_== ParseResult.ParseSuccess
+ ParserRun.parse(OctopusParser, "parsers/octopus/test/examples/", "json-events") must_== ParseResult.ParseSuccess
}
"test with json" >> {
- ParserRun.parse(CastepParser, "parsers/castep/test/examples/", "json") must_== ParseResult.ParseSuccess
+ ParserRun.parse(OctopusParser, "parsers/octopus/test/examples/", "json") must_== ParseResult.ParseSuccess
}
}
}
--
GitLab