You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/03/16 10:06:12 UTC
[23/50] [abbrv] git commit: [OLINGO-157] FIT supports jax-rs and
servlet
[OLINGO-157] FIT supports jax-rs and servlet
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/3214f495
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/3214f495
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/3214f495
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 3214f4950199e8f8e26bee49e9416bf8b833abcc
Parents: 6cc3637
Author: Stephan Klevenz <sk...@apache.org>
Authored: Fri Feb 14 16:45:10 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Fri Feb 14 16:50:46 2014 +0100
----------------------------------------------------------------------
.../processor/ref/AbstractRefJsonTest.java | 8 +++
.../processor/ref/AbstractRefTest.java | 7 ++
.../processor/ref/AbstractRefXmlTest.java | 7 ++
.../processor/ref/EntryJsonCreateTest.java | 7 +-
.../processor/ref/ServiceJsonTest.java | 5 ++
.../processor/ref/ServiceXmlTest.java | 5 ++
.../odata2/fit/basic/AbstractBasicTest.java | 5 ++
.../odata2/fit/basic/AcceptHeaderTypeTest.java | 5 ++
.../olingo/odata2/fit/basic/BasicBatchTest.java | 5 ++
.../olingo/odata2/fit/basic/BasicHttpTest.java | 5 ++
.../ContentNegotiationDollarFormatTest.java | 5 ++
.../olingo/odata2/fit/basic/ContextTest.java | 5 ++
.../odata2/fit/basic/ErrorResponseTest.java | 5 ++
.../olingo/odata2/fit/basic/ExceptionsTest.java | 5 ++
.../olingo/odata2/fit/basic/FitLoadTest.java | 5 ++
.../fit/basic/HttpExceptionResponseTest.java | 5 ++
.../fit/basic/LanguageNegotiationTest.java | 5 ++
.../olingo/odata2/fit/basic/MetadataTest.java | 5 ++
.../fit/basic/RequestContentTypeTest.java | 5 ++
.../odata2/fit/basic/ServiceResolutionTest.java | 3 +-
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 5 ++
.../odata2/fit/client/ClientBatchTest.java | 5 ++
.../fit/client/ClientDeltaResponseTest.java | 7 +-
.../olingo/odata2/fit/client/util/Client.java | 2 +-
.../olingo/odata2/fit/mapping/MappingTest.java | 7 +-
.../fit/misc/CxfCacheUriInfoIssue2Test.java | 5 +-
.../fit/misc/CxfCacheUriInfoIssueTest.java | 5 ++
.../odata2/fit/ref/AbstractRefJsonTest.java | 9 +++
.../olingo/odata2/fit/ref/AbstractRefTest.java | 9 ++-
.../odata2/fit/ref/AbstractRefXmlTest.java | 7 ++
.../apache/olingo/odata2/fit/ref/BatchTest.java | 5 ++
.../odata2/fit/ref/ContentNegotiationTest.java | 5 ++
.../odata2/fit/ref/DataServiceVersionTest.java | 5 ++
.../odata2/fit/ref/EntryJsonChangeTest.java | 5 ++
.../fit/ref/EntryJsonCreateInlineTest.java | 5 ++
.../odata2/fit/ref/EntryJsonCreateTest.java | 5 ++
.../odata2/fit/ref/EntryJsonReadOnlyTest.java | 5 ++
.../odata2/fit/ref/EntryXmlChangeTest.java | 5 ++
.../odata2/fit/ref/EntryXmlCreateTest.java | 5 ++
.../odata2/fit/ref/EntryXmlReadOnlyTest.java | 5 ++
.../odata2/fit/ref/FeedJsonReadOnlyTest.java | 5 ++
.../odata2/fit/ref/FeedXmlReadOnlyTest.java | 5 ++
.../odata2/fit/ref/FunctionImportJsonTest.java | 5 ++
.../odata2/fit/ref/FunctionImportXmlTest.java | 5 ++
.../odata2/fit/ref/LinksJsonChangeTest.java | 5 ++
.../odata2/fit/ref/LinksJsonReadOnlyTest.java | 5 ++
.../odata2/fit/ref/LinksXmlChangeTest.java | 5 ++
.../odata2/fit/ref/LinksXmlReadOnlyTest.java | 5 ++
.../olingo/odata2/fit/ref/MetadataTest.java | 5 ++
.../olingo/odata2/fit/ref/MiscChangeTest.java | 5 ++
.../olingo/odata2/fit/ref/MiscReadOnlyTest.java | 5 ++
.../odata2/fit/ref/PropertyJsonChangeTest.java | 5 ++
.../fit/ref/PropertyJsonReadOnlyTest.java | 5 ++
.../odata2/fit/ref/PropertyXmlChangeTest.java | 5 ++
.../odata2/fit/ref/PropertyXmlReadOnlyTest.java | 5 ++
.../olingo/odata2/fit/ref/ServiceJsonTest.java | 5 ++
.../olingo/odata2/fit/ref/ServiceXmlTest.java | 5 ++
.../AbstractContentNegotiationTest.java | 5 ++
.../BasicContentNegotiationTest.java | 5 ++
.../ContentNegotiationGetRequestTest.java | 5 ++
.../ContentNegotiationPostRequestTest.java | 5 ++
.../odata2/testutil/fit/AbstractFitTest.java | 27 +++++++-
.../odata2/testutil/server/ServletType.java | 5 ++
.../odata2/testutil/server/TestServer.java | 72 ++++++++++++--------
64 files changed, 387 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefJsonTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefJsonTest.java
index b6a9330..7ae0e3c 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefJsonTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefJsonTest.java
@@ -18,6 +18,9 @@
******************************************************************************/
package org.apache.olingo.odata2.annotation.processor.ref;
+import org.apache.olingo.odata2.testutil.server.ServletType;
+import org.junit.Ignore;
+
import com.google.gson.Gson;
import com.google.gson.internal.StringMap;
import com.google.gson.reflect.TypeToken;
@@ -25,7 +28,12 @@ import com.google.gson.reflect.TypeToken;
/**
*
*/
+@Ignore("no test methods")
public class AbstractRefJsonTest extends AbstractRefTest {
+ public AbstractRefJsonTest(ServletType servletType) {
+ super(servletType);
+ }
+
public StringMap<?> getStringMap(final String body) {
Gson gson = new Gson();
final StringMap<?> map = gson.fromJson(body, new TypeToken<StringMap<?>>() {}.getType());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefTest.java
index 6ddbff4..b71064c 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefTest.java
@@ -41,13 +41,20 @@ import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
+import org.junit.Ignore;
/**
* Abstract base class for tests employing the reference scenario.
*
*/
+@Ignore("no test methods")
public class AbstractRefTest extends AbstractFitTest {
+ public AbstractRefTest(ServletType servletType) {
+ super(servletType);
+ }
+
protected static final String IMAGE_JPEG = "image/jpeg";
protected static final String IMAGE_GIF = "image/gif";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
index aefd16b..a5cb671 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
@@ -28,17 +28,24 @@ import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.exceptions.XpathException;
import org.junit.Before;
+import org.junit.Ignore;
import org.xml.sax.SAXException;
/**
* Abstract base class for tests employing the reference scenario reading or writing XML.
*
*/
+@Ignore("no test methods")
public class AbstractRefXmlTest extends AbstractRefTest {
+ public AbstractRefXmlTest(ServletType servletType) {
+ super(servletType);
+ }
+
@Before
public void setXmlNamespacePrefixes() {
Map<String, String> prefixMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
index 0adb3a7..183d023 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
@@ -28,6 +28,7 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
import com.google.gson.internal.StringMap;
@@ -37,6 +38,10 @@ import com.google.gson.internal.StringMap;
*/
public class EntryJsonCreateTest extends AbstractRefJsonTest {
+ public EntryJsonCreateTest(ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createEntryRoom() throws Exception {
String id = UUID.randomUUID().toString();
@@ -118,7 +123,7 @@ public class EntryJsonCreateTest extends AbstractRefJsonTest {
checkMediaType(updateResponse, HttpContentType.APPLICATION_JSON);
String updatedBody = getBody(updateResponse);
StringMap<?> updatedMap = getStringMap(updatedBody);
- assertEquals("1", updatedMap.get("EmployeeId"));
+ assertNotNull(updatedMap.get("EmployeeId"));
assertEquals("Douglas", updatedMap.get("EmployeeName"));
assertNull(updatedMap.get("EntryData"));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
index 66d3ff2..0a875e1 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
@@ -30,6 +30,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Test;
@@ -39,6 +40,10 @@ import org.junit.Test;
*
*/
public class ServiceJsonTest extends AbstractRefTest {
+ public ServiceJsonTest(ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void serviceDocumentDollarFormatJson() throws Exception {
final HttpResponse response = callUri("?$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
index a864c6a..d620f37 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
@@ -27,6 +27,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.exceptions.XpathException;
import org.junit.Test;
import org.xml.sax.SAXException;
@@ -36,6 +37,10 @@ import org.xml.sax.SAXException;
*/
public class ServiceXmlTest extends AbstractRefXmlTest {
+ public ServiceXmlTest(ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void serviceDocument() throws Exception {
final HttpResponse response = callUri("/");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
index b0397aa..4e96b84 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
@@ -36,6 +36,7 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -44,6 +45,10 @@ import org.mockito.stubbing.Answer;
*/
public abstract class AbstractBasicTest extends AbstractFitTest {
+ public AbstractBasicTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private ODataContext context;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
index ac77a6b..d6a32da 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
@@ -40,6 +40,7 @@ import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
import org.apache.olingo.odata2.api.uri.info.GetEntityUriInfo;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -47,6 +48,10 @@ import org.junit.Test;
*/
public class AcceptHeaderTypeTest extends AbstractBasicTest {
+ public AcceptHeaderTypeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
index f11d93a..d440635 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
@@ -58,6 +58,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.mock.MockFacade;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -65,6 +66,10 @@ import org.junit.Test;
*/
public class BasicBatchTest extends AbstractBasicTest {
+ public BasicBatchTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final String LF = "\n";
private static final String REG_EX_BOUNDARY =
"(([a-zA-Z0-9_\\-\\.'\\+]{1,70})|\"([a-zA-Z0-9_\\-\\.'\\+\\s\\(\\),/:=\\?]" +
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index e813fb1..b8d5939 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -51,6 +51,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.HttpMerge;
import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -58,6 +59,10 @@ import org.junit.Test;
*/
public class BasicHttpTest extends AbstractBasicTest {
+ public BasicHttpTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
index 1e4bb76..5831f82 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
@@ -39,6 +39,7 @@ import org.apache.olingo.odata2.api.processor.feature.CustomContentType;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -46,6 +47,10 @@ import org.junit.Test;
*/
public class ContentNegotiationDollarFormatTest extends AbstractBasicTest {
+ public ContentNegotiationDollarFormatTest(final ServletType servletType) {
+ super(servletType);
+ }
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
index fb35a8c..3069282 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
@@ -48,6 +48,7 @@ import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -55,6 +56,10 @@ import org.junit.Test;
*/
public class ContextTest extends AbstractBasicTest {
+ public ContextTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
index c5c01eb..28087d3 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
@@ -33,6 +33,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -40,6 +41,10 @@ import org.junit.Test;
*/
public class ErrorResponseTest extends AbstractBasicTest {
+ public ErrorResponseTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
index 7d5d2f6..f9df039 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
@@ -31,6 +31,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Test;
@@ -39,6 +40,10 @@ import org.junit.Test;
*
*/
public class ExceptionsTest extends AbstractBasicTest {
+ public ExceptionsTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
return mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
index 7d846bd..c7abbaf 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
@@ -41,6 +41,7 @@ import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -48,6 +49,10 @@ import org.junit.Test;
*/
public class FitLoadTest extends AbstractBasicTest {
+ public FitLoadTest(final ServletType servletType) {
+ super(servletType);
+ }
+
/*
* increase for load analysis > 10.000
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
index 768c9f4..8fbba2f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
@@ -46,6 +46,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
import org.apache.olingo.odata2.ref.edm.ScenarioEdmProvider;
import org.apache.olingo.odata2.testutil.helper.ClassHelper;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.hamcrest.BaseMatcher;
@@ -59,6 +60,10 @@ import org.mockito.Matchers;
*/
public class HttpExceptionResponseTest extends AbstractBasicTest {
+ public HttpExceptionResponseTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private ODataSingleProcessor processor;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
index d73dd7d..3d46b45 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
@@ -42,6 +42,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.exceptions.XpathException;
@@ -54,6 +55,10 @@ import org.xml.sax.SAXException;
*/
public class LanguageNegotiationTest extends AbstractBasicTest {
+ public LanguageNegotiationTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
index b91d784..2168086 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
@@ -34,6 +34,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -41,6 +42,10 @@ import org.junit.Test;
*/
public class MetadataTest extends AbstractBasicTest {
+ public MetadataTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
index 7e43669..0c14f14 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
@@ -34,6 +34,7 @@ import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Before;
import org.junit.Test;
@@ -42,6 +43,10 @@ import org.junit.Test;
*/
public class RequestContentTypeTest extends AbstractBasicTest {
+ public RequestContentTypeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
return mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
index f378715..621701e 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
@@ -49,6 +49,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.testutil.fit.BaseTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.apache.olingo.odata2.testutil.server.TestServer;
import org.junit.After;
import org.junit.Before;
@@ -62,7 +63,7 @@ import org.mockito.stubbing.Answer;
public class ServiceResolutionTest extends BaseTest {
private final HttpClient httpClient = new DefaultHttpClient();
- private final TestServer server = new TestServer();
+ private final TestServer server = new TestServer(ServletType.JAXRS_SERVLET);
private ODataContext context;
private ODataSingleProcessorService service;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
index d8417de..348e715 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
@@ -47,6 +47,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
import org.apache.olingo.odata2.testutil.helper.HttpMerge;
import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -54,6 +55,10 @@ import org.junit.Test;
*/
public class UrlRewriteTest extends AbstractBasicTest {
+ public UrlRewriteTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
index 82d3223..0e1075f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientBatchTest.java
@@ -43,9 +43,14 @@ import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.fit.ref.AbstractRefTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
public class ClientBatchTest extends AbstractRefTest {
+ public ClientBatchTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final String PUT = "PUT";
private static final String POST = "POST";
private static final String GET = "GET";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
index d91aa24..f2d0c4b 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/ClientDeltaResponseTest.java
@@ -49,11 +49,16 @@ import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
import org.apache.olingo.odata2.fit.client.util.Client;
import org.apache.olingo.odata2.ref.edm.ScenarioEdmProvider;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Before;
import org.junit.Test;
public class ClientDeltaResponseTest extends AbstractFitTest {
+ public ClientDeltaResponseTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final String DELTATOKEN_1234 = "!deltatoken=1234";
private static int roomDataCount = 2;
@@ -159,8 +164,6 @@ public class ClientDeltaResponseTest extends AbstractFitTest {
Edm edm = client.getEdm();
assertNotNull(edm);
assertNotNull(edm.getDefaultEntityContainer());
-
- System.out.println(edm.getDefaultEntityContainer().getName());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
index 8238926..4cdd523 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/client/util/Client.java
@@ -189,7 +189,7 @@ public class Client {
EdmEntityContainer entityContainer = edm.getEntityContainer(entityContainerName);
InputStream content = (InputStream) connect(deltaLink, contentType, "GET").getContent();
-
+
return EntityProvider.readDeltaFeed(contentType, entityContainer.getEntitySet(entitySetName), content,
EntityProviderReadProperties.init().build());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
index e668a9d..c9baf51 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
@@ -36,6 +36,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.apache.olingo.odata2.testutil.server.TestServer;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
@@ -47,8 +48,12 @@ import org.junit.Test;
*/
public class MappingTest extends AbstractFitTest {
+ public MappingTest(final ServletType servletType) {
+ super(servletType);
+ }
+
public static void main(final String[] args) {
- final TestServer server = new TestServer();
+ final TestServer server = new TestServer(ServletType.JAXRS_SERVLET);
try {
server.startServer(MapFactory.class);
System.out.println("Press any key to exit");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssue2Test.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssue2Test.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssue2Test.java
index 7141777..28d9b58 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssue2Test.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssue2Test.java
@@ -26,6 +26,7 @@ import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.apache.olingo.odata2.testutil.server.TestServer;
import org.junit.After;
import org.junit.Before;
@@ -38,8 +39,8 @@ public class CxfCacheUriInfoIssue2Test {
@Before
public void before() {
- server1 = new TestServer("/service1");
- server2 = new TestServer("/service2");
+ server1 = new TestServer("/service1", ServletType.JAXRS_SERVLET);
+ server2 = new TestServer("/service2", ServletType.JAXRS_SERVLET);
server1.setPathSplit(0);
server2.setPathSplit(0);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
index c659e4e..aa77856 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
@@ -39,6 +39,7 @@ import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.fit.basic.AbstractBasicTest;
import org.apache.olingo.odata2.testutil.fit.FitStaticServiceFactory;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -46,6 +47,10 @@ import org.junit.Test;
*/
public class CxfCacheUriInfoIssueTest extends AbstractBasicTest {
+ public CxfCacheUriInfoIssueTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Override
protected ODataSingleProcessor createProcessor() throws ODataException {
final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
index 72ce71b..2beed3c 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
@@ -18,6 +18,9 @@
******************************************************************************/
package org.apache.olingo.odata2.fit.ref;
+import org.apache.olingo.odata2.testutil.server.ServletType;
+import org.junit.Ignore;
+
import com.google.gson.Gson;
import com.google.gson.internal.StringMap;
import com.google.gson.reflect.TypeToken;
@@ -25,7 +28,13 @@ import com.google.gson.reflect.TypeToken;
/**
*
*/
+@Ignore("no test methods")
public class AbstractRefJsonTest extends AbstractRefTest {
+
+ public AbstractRefJsonTest(final ServletType servletType) {
+ super(servletType);
+ }
+
public StringMap<?> getStringMap(final String body) {
Gson gson = new Gson();
final StringMap<?> map = gson.fromJson(body, new TypeToken<StringMap<?>>() {}.getType());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
index 6c8e2f9..6a8fad1 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
@@ -47,13 +47,20 @@ import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
+import org.junit.Ignore;
/**
* Abstract base class for tests employing the reference scenario.
*
*/
+@Ignore("no test methods")
public class AbstractRefTest extends AbstractFitTest {
+ public AbstractRefTest(final ServletType servletType) {
+ super(servletType);
+ }
+
protected static final String IMAGE_JPEG = "image/jpeg";
protected static final String IMAGE_GIF = "image/gif";
@@ -211,7 +218,7 @@ public class AbstractRefTest extends AbstractFitTest {
}
protected void checkMediaType(final HttpResponse response, final String expectedMediaType) {
- assertEquals(expectedMediaType.toUpperCase(),
+ assertEquals(expectedMediaType.toUpperCase(),
response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue().toUpperCase());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
index 8a88084..469d38e 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
@@ -28,17 +28,24 @@ import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.exceptions.XpathException;
import org.junit.Before;
+import org.junit.Ignore;
import org.xml.sax.SAXException;
/**
* Abstract base class for tests employing the reference scenario reading or writing XML.
*
*/
+@Ignore("no test methods")
public class AbstractRefXmlTest extends AbstractRefTest {
+ public AbstractRefXmlTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Before
public void setXmlNamespacePrefixes() {
Map<String, String> prefixMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
index c2fcad0..f4e81f0 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
@@ -35,6 +35,7 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -43,6 +44,10 @@ import org.junit.Test;
*/
public class BatchTest extends AbstractRefTest {
+ public BatchTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void testSimpleBatch() throws Exception {
String responseBody = execute("/simple.batch");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
index d8ccbc4..402f500 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
@@ -24,6 +24,7 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -31,6 +32,10 @@ import org.junit.Test;
*/
public class ContentNegotiationTest extends AbstractRefTest {
+ public ContentNegotiationTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void formatOverwriteAcceptHeader() throws Exception {
final HttpResponse response = callUri("?$format=xml", HttpHeaders.ACCEPT, IMAGE_GIF, HttpStatusCodes.OK);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
index 6b9be91..4d07324 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
@@ -26,6 +26,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.ODataServiceVersion;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpHeaders;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -33,6 +34,10 @@ import org.junit.Test;
*/
public class DataServiceVersionTest extends AbstractRefTest {
+ public DataServiceVersionTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static void checkVersion(final HttpResponse response, final String expectedValue) throws AssertionError {
final Header header = response.getFirstHeader(ODataHttpHeaders.DATASERVICEVERSION);
assertNotNull(header);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
index 4327491..8fd04ce 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
@@ -25,6 +25,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -33,6 +34,10 @@ import org.junit.Test;
*/
public class EntryJsonChangeTest extends AbstractRefTest {
+ public EntryJsonChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createEntry() throws Exception {
final String requestBody = "{\"Id\":\"99\",\"Name\":\"Building 4\",\"Image\":\"" + PHOTO_DEFAULT_IMAGE + "\","
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
index 2aeef99..f9e6336 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
@@ -28,6 +28,7 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
import com.google.gson.internal.StringMap;
@@ -37,6 +38,10 @@ import com.google.gson.internal.StringMap;
*/
public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
+ public EntryJsonCreateInlineTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createThreeLevelsDeepInsert() throws Exception {
String content =
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
index ca3d884..4d2a805 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
@@ -26,6 +26,7 @@ import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
import com.google.gson.internal.StringMap;
@@ -35,6 +36,10 @@ import com.google.gson.internal.StringMap;
*/
public class EntryJsonCreateTest extends AbstractRefJsonTest {
+ public EntryJsonCreateTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createEntryRoom() throws Exception {
String content = "{\"d\":{\"__metadata\":{\"id\":\"" + getEndpoint() + "Rooms('1')\","
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
index 28acc2a..e7895cc 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -30,6 +31,10 @@ import org.junit.Test;
*/
public class EntryJsonReadOnlyTest extends AbstractRefTest {
+ public EntryJsonReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void entry() throws Exception {
final HttpResponse response = callUri("Rooms('3')?$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
index 93616df..078b97e 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
@@ -31,6 +31,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -39,6 +40,10 @@ import org.junit.Test;
*/
public class EntryXmlChangeTest extends AbstractRefXmlTest {
+ public EntryXmlChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void create() throws Exception {
// Create an entry for a type that has no media resource.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
index 8d7e436..c859542 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
@@ -26,6 +26,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -34,6 +35,10 @@ import org.junit.Test;
*/
public class EntryXmlCreateTest extends AbstractRefXmlTest {
+ public EntryXmlCreateTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createDeepInsertRoomWithFourEmployees() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
index 65c6664..f34acb5 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
@@ -34,6 +34,7 @@ import org.apache.olingo.odata2.ref.model.DataContainer;
import org.apache.olingo.odata2.ref.model.Photo;
import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.XMLAssert;
import org.junit.Test;
@@ -43,6 +44,10 @@ import org.junit.Test;
*/
public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
+ public EntryXmlReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void entry() throws Exception {
HttpResponse response = callUri("Employees('2')");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
index 0658210..9271912 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -31,6 +32,10 @@ import org.junit.Test;
*/
public class FeedJsonReadOnlyTest extends AbstractRefTest {
+ public FeedJsonReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void feed() throws Exception {
final HttpResponse response = callUri("Buildings()?$top=2&$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
index ca1cb84..4beea9d 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -34,6 +35,10 @@ import org.junit.Test;
*/
public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
+ public FeedXmlReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void feed() throws Exception {
HttpResponse response = callUri("Employees()");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
index 64370e9..937f64f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -32,6 +33,10 @@ import org.junit.Test;
*/
public class FunctionImportJsonTest extends AbstractRefTest {
+ public FunctionImportJsonTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void functionImports() throws Exception {
HttpResponse response = callUri("EmployeeSearch?q='nat'&$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
index b04ab21..6a45963 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertNull;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -37,6 +38,10 @@ import org.junit.Test;
*/
public class FunctionImportXmlTest extends AbstractRefXmlTest {
+ public FunctionImportXmlTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void functionImports() throws Exception {
HttpResponse response = callUri("EmployeeSearch('1')/ne_Room/Id/$value?q='alter'");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
index 9a0e0fc..00f1318 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -30,6 +31,10 @@ import org.junit.Test;
*/
public final class LinksJsonChangeTest extends AbstractRefTest {
+ public LinksJsonChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void createLink() throws Exception {
final String uriString = "Rooms('3')/$links/nr_Employees";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
index 29b8cbc..afdd13a 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -30,6 +31,10 @@ import org.junit.Test;
*/
public final class LinksJsonReadOnlyTest extends AbstractRefTest {
+ public LinksJsonReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void singleLink() throws Exception {
HttpResponse response = callUri("Employees('1')/$links/ne_Room?$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
index 8bb66fb..8d8deb7 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
@@ -24,6 +24,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -32,6 +33,10 @@ import org.junit.Test;
*/
public final class LinksXmlChangeTest extends AbstractRefTest {
+ public LinksXmlChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final String XML_DECLARATION = "<?xml version='1.0' encoding='utf-8'?>";
@Test
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
index 8424839..13a1a5f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -32,6 +33,10 @@ import org.junit.Test;
*/
public final class LinksXmlReadOnlyTest extends AbstractRefXmlTest {
+ public LinksXmlReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void singleLink() throws Exception {
HttpResponse response = callUri("Employees('6')/$links/ne_Room");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
index 1a8c3b3..b9deba9 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertFalse;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Before;
import org.junit.Test;
@@ -32,6 +33,10 @@ import org.junit.Test;
*/
public class MetadataTest extends AbstractRefXmlTest {
+ public MetadataTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static String payload;
@Before
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
index a67365b..9d84a53 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
@@ -25,6 +25,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -33,6 +34,10 @@ import org.junit.Test;
*/
public class MiscChangeTest extends AbstractRefTest {
+ public MiscChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void deleteEntry() throws Exception {
deleteUriOk("Employees('2')");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
index b34f747..43d4147 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNull;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -32,6 +33,10 @@ import org.junit.Test;
*/
public class MiscReadOnlyTest extends AbstractRefTest {
+ public MiscReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void checkUrls() throws Exception {
checkUri("/");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
index e4cc3bd..29cd829 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -31,6 +32,10 @@ import org.junit.Test;
*/
public class PropertyJsonChangeTest extends AbstractRefTest {
+ public PropertyJsonChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void simplePropertyWithoutAcceptHeader() throws Exception {
final String url = "Employees('2')/Age";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
index d8f1710..950acf9 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -29,6 +30,10 @@ import org.junit.Test;
*
*/
public class PropertyJsonReadOnlyTest extends AbstractRefTest {
+ public PropertyJsonReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void simpleProperty() throws Exception {
HttpResponse response = callUri("Employees('2')/Age?$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
index 9cb009b..39ffb7b 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
@@ -26,6 +26,7 @@ import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -33,6 +34,10 @@ import org.junit.Test;
*/
public class PropertyXmlChangeTest extends AbstractRefXmlTest {
+ public PropertyXmlChangeTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void simpleProperty() throws Exception {
final String url1 = "Employees('2')/Age";
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
index acc656e..614c765 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
@@ -27,6 +27,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
/**
@@ -34,6 +35,10 @@ import org.junit.Test;
*
*/
public class PropertyXmlReadOnlyTest extends AbstractRefXmlTest {
+ public PropertyXmlReadOnlyTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void simpleProperty() throws Exception {
HttpResponse response = callUri("Employees('2')/Age/$value");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
index ab5bc07..a42f919 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
@@ -29,6 +29,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Test;
@@ -38,6 +39,10 @@ import org.junit.Test;
*
*/
public class ServiceJsonTest extends AbstractRefTest {
+ public ServiceJsonTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void serviceDocumentDollarFormatJson() throws Exception {
final HttpResponse response = callUri("?$format=json");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
index 15054d5..c8b6c75 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
@@ -27,6 +27,7 @@ import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.exceptions.XpathException;
import org.junit.Test;
import org.xml.sax.SAXException;
@@ -37,6 +38,10 @@ import org.xml.sax.SAXException;
*/
public class ServiceXmlTest extends AbstractRefXmlTest {
+ public ServiceXmlTest(final ServletType servletType) {
+ super(servletType);
+ }
+
@Test
public void serviceDocument() throws Exception {
final HttpResponse response = callUri("/");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
index 64c73c3..b51e1a1 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
@@ -58,6 +58,7 @@ import org.apache.olingo.odata2.ref.processor.ListsProcessor;
import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,6 +68,10 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
+ public AbstractContentNegotiationTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final Logger LOG = LoggerFactory.getLogger(AbstractContentNegotiationTest.class);
protected final static List<String> ACCEPT_HEADER_VALUES = Arrays.asList(
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/3214f495/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
index b14d97f..c4677a1 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
@@ -40,6 +40,7 @@ import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,6 +50,10 @@ import org.slf4j.LoggerFactory;
*/
public class BasicContentNegotiationTest extends AbstractContentNegotiationTest {
+ public BasicContentNegotiationTest(final ServletType servletType) {
+ super(servletType);
+ }
+
private static final Logger LOG = LoggerFactory.getLogger(BasicContentNegotiationTest.class);
@Test