From c2aefdc2ff5fa5316f25e43c53729acba8a860e6 Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Sat, 5 Dec 2015 00:41:42 +0200
Subject: [PATCH] Move integration tests to top-level directory

Since integration tests are now based on Karaf, they have to run after
everything else is built, so they don't seem to fit well with the
'mappingservice' component.

Change-Id: I5f5e18a3b068e430a14b53d720e8fa4e57951b80
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 .../ms.integration-tests.launch                                 | 0
 {mappingservice/integrationtest => integrationtest}/pom.xml     | 0
 .../integrationtest/MappingServiceIntegrationTest.java          | 0
 mappingservice/integrationtest/.gitignore                       | 1 -
 pom.xml                                                         | 2 +-
 5 files changed, 1 insertion(+), 2 deletions(-)
 rename {mappingservice/integrationtest => integrationtest}/ms.integration-tests.launch (100%)
 rename {mappingservice/integrationtest => integrationtest}/pom.xml (100%)
 rename {mappingservice/integrationtest => integrationtest}/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java (100%)
 delete mode 100644 mappingservice/integrationtest/.gitignore

diff --git a/mappingservice/integrationtest/ms.integration-tests.launch b/integrationtest/ms.integration-tests.launch
similarity index 100%
rename from mappingservice/integrationtest/ms.integration-tests.launch
rename to integrationtest/ms.integration-tests.launch
diff --git a/mappingservice/integrationtest/pom.xml b/integrationtest/pom.xml
similarity index 100%
rename from mappingservice/integrationtest/pom.xml
rename to integrationtest/pom.xml
diff --git a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
similarity index 100%
rename from mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
rename to integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
diff --git a/mappingservice/integrationtest/.gitignore b/mappingservice/integrationtest/.gitignore
deleted file mode 100644
index a48e45b9d..000000000
--- a/mappingservice/integrationtest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target-ide
diff --git a/pom.xml b/pom.xml
index a36ecdffb..a7eadb27b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <module>ui</module>
     <module>features</module>
     <module>distribution-karaf</module>
-    <module>mappingservice/integrationtest</module>
+    <module>integrationtest</module>
   </modules>
 
   <build>
-- 
2.36.6