From 2864b65c2ab3b8e968f70581b2738291a15c475b Mon Sep 17 00:00:00 2001
From: Arvid Ihrig <ihrig@fhi-berlin.mpg.de>
Date: Thu, 28 Jun 2018 16:24:07 +0200
Subject: [PATCH] Integrated Pipeline: fixed packge names for tests

---
 .../UnderDevelopment.scala                                    | 4 ++--
 .../WorkingFeatures.scala                                     | 4 ++--
 .../integrated_pipeline_end_to_end_tests/package.scala        | 2 ++
 .../integrated_pipeline_tests/ArchiveHandlerSpec.scala        | 2 +-
 .../integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala  | 2 +-
 .../nomad_lab}/integrated_pipeline_tests/Builders.scala       | 4 ++--
 .../CalculationParsingEngineSpec.scala                        | 2 +-
 .../CalculationParsingFlowSpec.scala                          | 2 +-
 .../integrated_pipeline_tests/MessageMatchers.scala           | 2 +-
 .../ParsingResultsProcessorFlowSpec.scala                     | 2 +-
 .../integrated_pipeline_tests/StreamAssertions.scala          | 2 +-
 .../integrated_pipeline_tests/TreeParserFlowSpec.scala        | 2 +-
 .../TreeParsingRequestGeneratorSpec.scala                     | 2 +-
 .../WriteToHDF5MergedResultsProcessorSpec.scala               | 2 +-
 .../WriteToHDF5ResultsProcessorSpec.scala                     | 2 +-
 .../WriteToJsonResultsProcessorSpec.scala                     | 2 +-
 .../nomad_lab}/integrated_pipeline_tests/package.scala        | 2 ++
 17 files changed, 22 insertions(+), 18 deletions(-)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala (94%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala (96%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_end_to_end_tests/package.scala (99%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/ArchiveHandlerSpec.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/Builders.scala (96%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/CalculationParsingEngineSpec.scala (99%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/CalculationParsingFlowSpec.scala (99%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/MessageMatchers.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala (99%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/StreamAssertions.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/TreeParserFlowSpec.scala (99%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala (98%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala (97%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala (97%)
 rename integrated-pipeline/src/test/scala/{ => eu/nomad_lab}/integrated_pipeline_tests/package.scala (99%)

diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
similarity index 94%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
index f117a438..0aeb029f 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/UnderDevelopment.scala
@@ -1,8 +1,8 @@
-package integrated_pipeline_end_to_end_tests
+package eu.nomad_lab.integrated_pipeline_end_to_end_tests
 
 import eu.nomad_lab.TreeType
 import eu.nomad_lab.integrated_pipeline.{ Main, OutputType }
-import integrated_pipeline_tests.EndToEnd
+import eu.nomad_lab.integrated_pipeline_tests.EndToEnd
 import org.scalatest.AsyncWordSpec
 
 /**
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
similarity index 96%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
index 1761e670..6369a8d1 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/WorkingFeatures.scala
@@ -1,8 +1,8 @@
-package integrated_pipeline_end_to_end_tests
+package eu.nomad_lab.integrated_pipeline_end_to_end_tests
 
 import eu.nomad_lab.TreeType
 import eu.nomad_lab.integrated_pipeline.{ Main, OutputType }
-import integrated_pipeline_tests.EndToEnd
+import eu.nomad_lab.integrated_pipeline_tests.EndToEnd
 import org.scalatest.AsyncWordSpec
 
 /**
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
index 1446956f..e1042c50 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_end_to_end_tests/package.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_end_to_end_tests/package.scala
@@ -1,3 +1,5 @@
+package eu.nomad_lab
+
 import java.nio.file.{ Path, Paths }
 
 import eu.nomad_lab.JsonSupport.formats
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
index 2bd092e5..ad4050a3 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveHandlerSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveHandlerSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
index 8eda29e8..d38c5561 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ArchiveUnpackingFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
similarity index 96%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
index 3c124b25..58ea96be 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/Builders.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/Builders.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
@@ -7,7 +7,7 @@ import eu.nomad_lab.TreeType.TreeType
 import eu.nomad_lab.integrated_pipeline.messages._
 import eu.nomad_lab.parsers.ParseResult.ParseResult
 import eu.nomad_lab.parsers._
-import integrated_pipeline_tests.Builders._
+import eu.nomad_lab.integrated_pipeline_tests.Builders._
 
 trait TestDataBuilders {
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
index 4e6d4301..c6eeeab0 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingEngineSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
index 9564a348..153a5392 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/CalculationParsingFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
index 89d60c18..7517c47c 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/MessageMatchers.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/MessageMatchers.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
index 3ba0765d..6fde2894 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/ParsingResultsProcessorFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Path, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
index 4e728155..9b9f10cf 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/StreamAssertions.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/StreamAssertions.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import akka.stream.testkit.TestSubscriber
 import akka.stream.testkit.TestSubscriber.{ OnComplete, OnError, OnNext, OnSubscribe }
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
index 74c10f55..5a0b48f2 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParserFlowSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParserFlowSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
index 3b33c53d..7b4852af 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/TreeParsingRequestGeneratorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import eu.nomad_lab.QueueMessage.TreeParserRequest
 import eu.nomad_lab.TreeType.TreeType
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
similarity index 98%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
index e6d81859..cd7239e2 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5MergedResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
similarity index 97%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
index 39aee075..8b3cb1d5 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToHDF5ResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.Paths
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
similarity index 97%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
index 3088717b..e84e2120 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/WriteToJsonResultsProcessorSpec.scala
@@ -1,4 +1,4 @@
-package integrated_pipeline_tests
+package eu.nomad_lab.integrated_pipeline_tests
 
 import java.nio.file.{ Files, Paths }
 
diff --git a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
similarity index 99%
rename from integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala
rename to integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
index cf71ef16..f1939512 100644
--- a/integrated-pipeline/src/test/scala/integrated_pipeline_tests/package.scala
+++ b/integrated-pipeline/src/test/scala/eu/nomad_lab/integrated_pipeline_tests/package.scala
@@ -1,3 +1,5 @@
+package eu.nomad_lab
+
 import java.nio.file.{ Files, Path, Paths }
 
 import akka.actor.ActorSystem
-- 
GitLab