diff --git a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala index 5146851f10b8f545d7c239945f1f861c8b6185fa..72b96dbf0f2b4a05d2e92f4ff6cf17ac082f5521 100644 --- a/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala +++ b/src/main/scala/eu/nomad_lab/parsers/Cp2kParser.scala @@ -1,8 +1,8 @@ package eu.nomad_lab.parsers -import eu.{nomad_lab=>lab} +import eu.{ nomad_lab => lab } import eu.nomad_lab.DefaultPythonInterpreter -import org.{json4s => jn} +import org.{ json4s => jn } import scala.collection.breakOut object Cp2kParser extends SimpleExternalParserGenerator( @@ -12,8 +12,9 @@ object Cp2kParser extends SimpleExternalParserGenerator( ("parserId" -> jn.JString("Cp2kParser" + lab.Cp2kVersionInfo.version)) :: ("versionInfo" -> jn.JObject( ("nomadCoreVersion" -> jn.JString(lab.NomadCoreVersionInfo.version)) :: - (lab.Cp2kVersionInfo.toMap.map{ case (key, value) => - (key -> jn.JString(value.toString)) + (lab.Cp2kVersionInfo.toMap.map { + case (key, value) => + (key -> jn.JString(value.toString)) }(breakOut): List[(String, jn.JString)]) )) :: Nil ), @@ -57,5 +58,6 @@ object Cp2kParser extends SimpleExternalParserGenerator( ) ++ DefaultPythonInterpreter.commonFiles(), dirMap = Map( "parser-cp2k" -> "parsers/cp2k/parser/parser-cp2k", - "nomad_meta_info" -> "nomad-meta-info/meta_info/nomad_meta_info") ++ DefaultPythonInterpreter.commonDirMapping() + "nomad_meta_info" -> "nomad-meta-info/meta_info/nomad_meta_info" + ) ++ DefaultPythonInterpreter.commonDirMapping() ) diff --git a/src/test/scala/eu/nomad_lab/parsers/Cp2kParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/Cp2kParserSpec.scala index f76466a94037a0b829fa10dac216eb1e2ef79f98..2d1036d21accb67f315c221134f1e368b71c968f 100644 --- a/src/test/scala/eu/nomad_lab/parsers/Cp2kParserSpec.scala +++ b/src/test/scala/eu/nomad_lab/parsers/Cp2kParserSpec.scala @@ -2,16 +2,14 @@ package eu.nomad_lab.parsers import org.specs2.mutable.Specification - - object Cp2kParserSpec extends Specification { "Cp2kParserTest" >> { - "test with json-events" >> { - ParserRun.parse(Cp2kParser,"parsers/cp2k/test/examples/Si_bulk8/Si_bulk8.out","json-events") must_== ParseResult.ParseSuccess + "test with json-events" >> { + ParserRun.parse(Cp2kParser, "parsers/cp2k/test/examples/Si_bulk8/Si_bulk8.out", "json-events") must_== ParseResult.ParseSuccess } } - "test with json" >> { - ParserRun.parse(Cp2kParser,"parsers/cp2k/test/examples/Si_bulk8/Si_bulk8.out","json") must_== ParseResult.ParseSuccess + "test with json" >> { + ParserRun.parse(Cp2kParser, "parsers/cp2k/test/examples/Si_bulk8/Si_bulk8.out", "json") must_== ParseResult.ParseSuccess } }