From 0c4298f6a6ffef6aad59858c33f68722d90adba7 Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Wed, 6 Feb 2019 15:07:34 +0100 Subject: [PATCH] migrate tests for io.rest.core Signed-off-by: Markus Rathgeb --- bom/test/pom.xml | 5 ++ .../itest.bndrun | 90 ++++++------------- itests/pom.xml | 2 +- 3 files changed, 34 insertions(+), 63 deletions(-) diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 1a4531908..0ebe4b983 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -36,6 +36,11 @@ slf4j-simple ${slf4j.version} + + com.jayway.jsonpath + json-path + 2.4.0 + diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 51aa71d2c..fe72e9686 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -3,7 +3,14 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.core.io.rest.core --runrequires: bnd.identity;id='org.openhab.core.io.rest.core.tests' +-runrequires: \ + bnd.identity;id='org.openhab.core.io.rest.core.tests',\ + bnd.identity;id='com.eclipsesource.jaxrs.jersey-all' + +# If we would like to use a storage at all, we will use the "volatile" storage. +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json',\ + bnd.identity;id='org.openhab.core.storage.mapdb' # # done @@ -11,85 +18,44 @@ Fragment-Host: org.openhab.core.io.rest.core -runbundles: \ ch.qos.logback.classic;version='[1.2.0,1.2.1)',\ ch.qos.logback.core;version='[1.2.0,1.2.1)',\ + com.eclipsesource.jaxrs.jersey-all;version='[2.22.2,2.22.3)',\ 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)',\ + com.jayway.jsonpath.json-path;version='[2.4.0,2.4.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)',\ + net.bytebuddy.byte-buddy;version='[1.7.9,1.7.10)',\ + net.bytebuddy.byte-buddy-agent;version='[1.7.9,1.7.10)',\ + net.minidev.accessors-smart;version='[1.2.0,1.2.1)',\ + net.minidev.json-smart;version='[2.3.0,2.3.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.mockito.mockito-core;version='[2.13.0,2.13.1)',\ + org.objectweb.asm;version='[5.0.4,5.0.5)',\ + org.objenesis;version='[2.6.0,2.6.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.config.discovery;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.io.rest;version='[2.5.0,2.5.1)',\ + org.openhab.core.io.rest.core;version='[2.5.0,2.5.1)',\ + org.openhab.core.io.rest.core.tests;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.test;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)' + org.osgi.service.event;version='[1.4.0,1.4.1)',\ + osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ + osgi.enroute.junit.wrapper;version='[4.12.0,4.12.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)' \ No newline at end of file diff --git a/itests/pom.xml b/itests/pom.xml index 3534ad56f..d3623bf7e 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -37,7 +37,7 @@ org.openhab.core.io.net.tests - + org.openhab.core.io.rest.core.tests