From 0b2de2bfea0e735d13a69755c22b16a59a74fe87 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Mon, 30 Sep 2019 10:41:39 +0200
Subject: [PATCH] Reenable org.openhab.core.io.transport.upnp.tests (#1057)

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .../upnp/internal/UpnpIOServiceTest.java      |  0
 .../.classpath                                | 27 ------
 .../.project                                  | 23 -----
 .../NOTICE                                    | 14 ---
 .../itest.bndrun                              | 95 -------------------
 .../pom.xml                                   | 15 ---
 itests/pom.xml                                |  1 -
 7 files changed, 175 deletions(-)
 rename {itests/org.openhab.core.io.transport.upnp.tests/src/main => bundles/org.openhab.core.io.transport.upnp/src/test}/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java (100%)
 delete mode 100644 itests/org.openhab.core.io.transport.upnp.tests/.classpath
 delete mode 100644 itests/org.openhab.core.io.transport.upnp.tests/.project
 delete mode 100644 itests/org.openhab.core.io.transport.upnp.tests/NOTICE
 delete mode 100644 itests/org.openhab.core.io.transport.upnp.tests/itest.bndrun
 delete mode 100644 itests/org.openhab.core.io.transport.upnp.tests/pom.xml

diff --git a/itests/org.openhab.core.io.transport.upnp.tests/src/main/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
similarity index 100%
rename from itests/org.openhab.core.io.transport.upnp.tests/src/main/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
rename to bundles/org.openhab.core.io.transport.upnp/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
diff --git a/itests/org.openhab.core.io.transport.upnp.tests/.classpath b/itests/org.openhab.core.io.transport.upnp.tests/.classpath
deleted file mode 100644
index 5e8a55fef..000000000
--- a/itests/org.openhab.core.io.transport.upnp.tests/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/itests/org.openhab.core.io.transport.upnp.tests/.project b/itests/org.openhab.core.io.transport.upnp.tests/.project
deleted file mode 100644
index 17ca98392..000000000
--- a/itests/org.openhab.core.io.transport.upnp.tests/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.openhab.core.io.transport.upnp.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/itests/org.openhab.core.io.transport.upnp.tests/NOTICE b/itests/org.openhab.core.io.transport.upnp.tests/NOTICE
deleted file mode 100644
index 6c17d0d8a..000000000
--- a/itests/org.openhab.core.io.transport.upnp.tests/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-This content is produced and maintained by the openHAB project.
-
-* Project home: https://www.openhab.org
-
-== Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License 2.0 which is available at
-https://www.eclipse.org/legal/epl-2.0/.
-
-== Source Code
-
-https://github.com/openhab/openhab-core
-
diff --git a/itests/org.openhab.core.io.transport.upnp.tests/itest.bndrun b/itests/org.openhab.core.io.transport.upnp.tests/itest.bndrun
deleted file mode 100644
index 5a717c55e..000000000
--- a/itests/org.openhab.core.io.transport.upnp.tests/itest.bndrun
+++ /dev/null
@@ -1,95 +0,0 @@
--include: ../itest-common.bndrun
-
-Bundle-SymbolicName: ${project.artifactId}
-Fragment-Host: org.openhab.core.io.transport.upnp
-
--runrequires: bnd.identity;id='org.openhab.core.io.transport.upnp.tests'
-
-#
-# done
-#
--runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
-	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	log4j;version='[1.2.17,1.2.18)',\
-	org.antlr.runtime;version='[3.2.0,3.2.1)',\
-	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
-	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
-	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
-	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
-	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
-	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
-	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.io.transport.upnp.tests/pom.xml b/itests/org.openhab.core.io.transport.upnp.tests/pom.xml
deleted file mode 100644
index be7e10951..000000000
--- a/itests/org.openhab.core.io.transport.upnp.tests/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.openhab.core.itests</groupId>
-    <artifactId>org.openhab.core.reactor.itests</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.openhab.core.io.transport.upnp.tests</artifactId>
-
-  <name>openHAB Core :: Integration Tests :: IO UPnP Tests</name>
-
-</project>
diff --git a/itests/pom.xml b/itests/pom.xml
index 70292d779..1b47225bd 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -36,7 +36,6 @@
     <module>org.openhab.core.io.http.tests</module>
     <module>org.openhab.core.io.net.tests</module>
     <module>org.openhab.core.io.rest.core.tests</module>
-    <!-- <module>org.openhab.core.io.transport.upnp.tests</module> -->
     <module>org.openhab.core.magic.tests</module>
     <module>org.openhab.core.model.core.tests</module>
     <!-- <module>org.openhab.core.model.item.tests</module> -->