\n");
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRequest.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRequest.java
index 8eba537bc..be38f681a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRequest.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabRequest.java
@@ -20,7 +20,7 @@ package org.apache.olingo.server.core.debug;
import java.io.IOException;
import java.io.Writer;
-import java.util.LinkedHashMap;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -36,33 +36,20 @@ public class DebugTabRequest implements DebugTab {
private final String method;
private final String uri;
private final String protocol;
- private final Map headers;
+ private final Map> headers;
public DebugTabRequest(ODataRequest request) {
- method = request.getMethod() == null ? "unkown" : request.getMethod().toString();
- uri = request.getRawRequestUri() == null ? "unkown" : request.getRawRequestUri();
- protocol = request.getProtocol() == null ? "unkown" : request.getProtocol();
- // TODO: Should we really wrap the headers here or keep the original structure?
- headers = wrapHeaders(request.getAllHeaders());
- }
-
- private Map wrapHeaders(Map> allHeaders) {
- Map localHeaders = new LinkedHashMap();
- for (Map.Entry> entry : allHeaders.entrySet()) {
- String value = null;
- if (entry.getValue() != null) {
- value = "";
- boolean first = true;
- for (String valuePart : entry.getValue()) {
- if (!first) {
- value = value + ", ";
- }
- value = value + valuePart;
- }
- }
- localHeaders.put(entry.getKey(), value);
+ if (request != null) {
+ method = request.getMethod() == null ? "unkown" : request.getMethod().toString();
+ uri = request.getRawRequestUri() == null ? "unkown" : request.getRawRequestUri();
+ protocol = request.getProtocol() == null ? "unkown" : request.getProtocol();
+ headers = request.getAllHeaders();
+ } else {
+ method = "unkown";
+ uri = "unkown";
+ protocol = "unkown";
+ headers = Collections.emptyMap();
}
- return localHeaders;
}
@Override
@@ -70,25 +57,26 @@ public class DebugTabRequest implements DebugTab {
writer.append("Request Method
\n")
.append("").append(method).append("
\n")
.append("Request URI
\n")
- .append("").append(DebugResponseHelperImpl.escapeHtml(uri.toString())).append("
\n")
+ .append("").append(DebugResponseHelperImpl.escapeHtml(uri)).append("
\n")
.append("Request Protocol
\n")
- .append("").append(protocol).append("
\n");
+ .append("").append(DebugResponseHelperImpl.escapeHtml(protocol)).append("
\n");
writer.append("Request Headers
\n");
- DebugResponseHelperImpl.appendHtmlTable(writer, headers);
-// .append("\n\n")
-// .append("Name Value ").append(name).append(" ")
-// .append("").append(DebugResponseHelperImpl.escapeHtml(value))
-// .append("
\n");
+ writer.append("\n\n")
+ .append("Name Value > entry : headers.entrySet()) {
+ List headersList = entry.getValue();
+ if (headersList != null && !headersList.isEmpty()) {
+ for (String headerValue : headersList) {
+ writer.append("").append(entry.getKey()).append(" ")
+ .append("")
+ .append(DebugResponseHelperImpl.escapeHtml(headerValue))
+ .append(" \n
\n");
}
@Override
@@ -107,7 +95,32 @@ public class DebugTabRequest implements DebugTab {
if (!headers.isEmpty()) {
gen.writeFieldName("headers");
- DebugResponseHelperImpl.appendJsonTable(gen, headers);
+
+ gen.writeStartObject();
+
+ for (Map.Entry> entry : headers.entrySet()) {
+ List headersList = entry.getValue();
+ if (headersList != null && !headersList.isEmpty()) {
+ if (headersList.size() == 1) {
+ gen.writeStringField(entry.getKey(), headersList.get(0));
+ } else {
+ gen.writeFieldName(entry.getKey());
+ gen.writeStartArray();
+ for (String headerValue : headersList) {
+ if (headerValue != null) {
+ gen.writeString(headerValue);
+ } else {
+ gen.writeNull();
+ }
+ }
+ gen.writeEndArray();
+ }
+ } else {
+ gen.writeNullField(entry.getKey());
+ }
+ }
+
+ gen.writeEndObject();
}
gen.writeEndObject();
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
index 5cb153ca9..528cf6160 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabResponse.java
@@ -20,6 +20,7 @@ package org.apache.olingo.server.core.debug;
import java.io.IOException;
import java.io.Writer;
+import java.util.Collections;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpStatusCode;
@@ -39,9 +40,14 @@ public class DebugTabResponse implements DebugTab {
public DebugTabResponse(final ODataResponse applicationResponse, final String serviceRoot) {
this.response = applicationResponse;
- this.serviceRoot = serviceRoot;
- status = HttpStatusCode.fromStatusCode(response.getStatusCode());
- headers = response.getHeaders();
+ if (response != null) {
+ status = HttpStatusCode.fromStatusCode(response.getStatusCode());
+ headers = response.getHeaders();
+ } else {
+ status = HttpStatusCode.INTERNAL_SERVER_ERROR;
+ headers = Collections.emptyMap();
+ }
+ this.serviceRoot = serviceRoot == null ? "/" : serviceRoot;
}
@Override
@@ -67,7 +73,11 @@ public class DebugTabResponse implements DebugTab {
}
gen.writeFieldName("body");
- new DebugTabBody(response, serviceRoot).appendJson(gen);
+ if (response != null && response.getContent() != null) {
+ new DebugTabBody(response, serviceRoot).appendJson(gen);
+ } else {
+ gen.writeNull();
+ }
gen.writeEndObject();
}
@@ -80,7 +90,7 @@ public class DebugTabResponse implements DebugTab {
.append("Response Headers
\n");
DebugResponseHelperImpl.appendHtmlTable(writer, headers);
writer.append("Response Body
\n");
- if (response.getContent() != null) {
+ if (response != null && response.getContent() != null) {
new DebugTabBody(response, serviceRoot).appendHtml(writer);
} else {
writer.append("ODataLibrary: no response body
");
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
index 4eb95ba59..2faae3e11 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/DebugTabServer.java
@@ -42,7 +42,11 @@ public class DebugTabServer implements DebugTab {
@Override
public void appendJson(JsonGenerator gen) throws IOException {
- DebugResponseHelperImpl.appendJsonTable(gen, serverEnvironmentVaribles);
+ if (serverEnvironmentVaribles != null && !serverEnvironmentVaribles.isEmpty()) {
+ DebugResponseHelperImpl.appendJsonTable(gen, serverEnvironmentVaribles);
+ } else {
+ gen.writeNull();
+ }
}
@Override
@@ -52,6 +56,8 @@ public class DebugTabServer implements DebugTab {
.append("").append(pack.getImplementationTitle())
.append(" Version ").append(pack.getImplementationVersion()).append("
\n")
.append("Server Environment
\n");
- DebugResponseHelperImpl.appendHtmlTable(writer, serverEnvironmentVaribles);
+ if (serverEnvironmentVaribles != null && !serverEnvironmentVaribles.isEmpty()) {
+ DebugResponseHelperImpl.appendHtmlTable(writer, serverEnvironmentVaribles);
+ }
}
}
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
index fcf611df6..8bdbe3915 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ServerCoreDebugger.java
@@ -64,6 +64,11 @@ public class ServerCoreDebugger {
public ODataResponse createDebugResponse(final HttpServletRequest request, final Exception exception,
final ODataRequest odRequest, final ODataResponse odResponse, UriInfo uriInfo,
Map serverEnvironmentVaribles) {
+ //Failsafe so we do not generate unauthorized debug messages
+ if(!isDebugMode){
+ return odResponse;
+ }
+
try {
DebugInformation debugInfo =
createDebugInformation(request, exception, odRequest, odResponse, uriInfo, serverEnvironmentVaribles);
@@ -80,7 +85,7 @@ public class ServerCoreDebugger {
odResponse.setHeader(HttpHeader.CONTENT_TYPE, ContentType.TEXT_PLAIN.toContentTypeString());
InputStream content = new ByteArrayInputStream("ODataLibrary: Could not assemble debug response.".getBytes());
odResponse.setContent(content);
- return null;
+ return odResponse;
}
private DebugInformation createDebugInformation(final HttpServletRequest request, final Exception exception,
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
index 377c5e1d6..c907b8f15 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/AbstractDebugTabTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/AbstractDebugTabTest.java
new file mode 100644
index 000000000..43b1aaaaf
--- /dev/null
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/AbstractDebugTabTest.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.debug;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.olingo.server.core.serializer.utils.CircleStreamBuffer;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+
+public abstract class AbstractDebugTabTest {
+
+ protected String createHtml(DebugTab tab) throws Exception {
+ StringWriter writer = new StringWriter();
+ tab.appendHtml(writer);
+ writer.flush();
+ byte[] bytes = writer.toString().getBytes("UTF-8");
+ return IOUtils.toString(new ByteArrayInputStream(bytes));
+ }
+
+ protected String createJson(DebugTab requestTab) throws IOException {
+ CircleStreamBuffer csb = new CircleStreamBuffer();
+ JsonGenerator gen = new JsonFactory().createGenerator(csb.getOutputStream(), JsonEncoding.UTF8);
+ requestTab.appendJson(gen);
+ gen.flush();
+ gen.close();
+ csb.closeWrite();
+ return IOUtils.toString(csb.getInputStream());
+ }
+
+ protected void print(DebugTab tab) throws Exception{
+ System.out.println(createJson(tab));
+ System.out.println("---------------------------------------------------------");
+ System.out.println(createHtml(tab));
+ }
+
+}
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
new file mode 100644
index 000000000..7d3a58e43
--- /dev/null
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabBodyTest.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.debug;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class DebugTabBodyTest extends AbstractDebugTabTest {
+
+ @Test
+ public void nullResponseMustNotLeadToException() throws Exception {
+ DebugTabBody tab = new DebugTabBody(null, null);
+
+ String expectedHtml = "\n"
+ + "ODataLibrary: No body.
\n";
+
+ assertEquals("null", createJson(tab));
+ assertEquals(expectedHtml, createHtml(tab));
+ }
+}
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabRequestTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabRequestTest.java
new file mode 100644
index 000000000..368930152
--- /dev/null
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabRequestTest.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.debug;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.olingo.commons.api.http.HttpMethod;
+import org.apache.olingo.server.api.ODataRequest;
+import org.junit.Test;
+
+public class DebugTabRequestTest extends AbstractDebugTabTest {
+
+ @Test
+ public void initialRequestMustNotleadToException() throws Exception {
+ String expectedJson = "{\"method\":\"unkown\",\"uri\":\"unkown\",\"protocol\":\"unkown\"}";
+ String expectedHtml = "Request Method
\n"
+ + "unkown
\n"
+ + "Request URI
\n"
+ + "unkown
\n"
+ + "Request Protocol
\n"
+ + "unkown
\n"
+ + "Request Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value
\n";
+
+ DebugTabRequest requestTab = new DebugTabRequest(null);
+ assertEquals(expectedJson, createJson(requestTab));
+ assertEquals(expectedHtml, createHtml(requestTab));
+
+ requestTab = new DebugTabRequest(new ODataRequest());
+ assertEquals(expectedJson, createJson(requestTab));
+ assertEquals(expectedHtml, createHtml(requestTab));
+ }
+
+ @Test
+ public void onlyProtocolNotSet() throws Exception {
+ String expectedJson = "{\"method\":\"GET\",\"uri\":\"def&\",\"protocol\":\"unkown\"}";
+ String expectedHtml = "Request Method
\n"
+ + "GET
\n"
+ + "Request URI
\n"
+ + "def&
\n"
+ + "Request Protocol
\n"
+ + "unkown
\n"
+ + "Request Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value
\n";
+
+ ODataRequest oDataRequest = new ODataRequest();
+ oDataRequest.setMethod(HttpMethod.GET);
+ oDataRequest.setRawRequestUri("def&");
+
+ DebugTabRequest requestTab = new DebugTabRequest(oDataRequest);
+ assertEquals(expectedJson, createJson(requestTab));
+ assertEquals(expectedHtml, createHtml(requestTab));
+ }
+
+ @Test
+ public void singleHeaderValue() throws Exception {
+ String expectedJson =
+ "{\"method\":\"GET\",\"uri\":\"def&\",\"protocol\":\"def&\",\"headers\":{\"HEADERNAME\":\"Value1\"}}";
+ String expectedHtml = "Request Method
\n"
+ + "GET
\n"
+ + "Request URI
\n"
+ + "def&
\n"
+ + "Request Protocol
\n"
+ + "def&
\n"
+ + "Request Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value HEADERNAME Value1
\n";
+
+ ODataRequest oDataRequest = new ODataRequest();
+ oDataRequest.setMethod(HttpMethod.GET);
+ oDataRequest.setRawRequestUri("def&");
+ oDataRequest.setProtocol("def&");
+ List headerValues = new ArrayList();
+ headerValues.add("Value1");
+ oDataRequest.addHeader("HeaderName", headerValues);
+
+ DebugTabRequest requestTab = new DebugTabRequest(oDataRequest);
+ System.out.println(createHtml(requestTab));
+ assertEquals(expectedJson, createJson(requestTab));
+ assertEquals(expectedHtml, createHtml(requestTab));
+ }
+
+ @Test
+ public void multiHeaderValueResultsInMap() throws Exception {
+ String expectedJson = "{\"method\":\"GET\",\"uri\":\"def&\",\"protocol\":\"def&\","
+ + "\"headers\":{\"HEADERNAME\":[\"Value1\",\"Value2\"]}}";
+ String expectedHtml = "Request Method
\n"
+ + "GET
\n"
+ + "Request URI
\n"
+ + "def&
\n"
+ + "Request Protocol
\n"
+ + "def&
\n"
+ + "Request Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value HEADERNAME Value1 HEADERNAME Value2
\n";
+
+ ODataRequest oDataRequest = new ODataRequest();
+ oDataRequest.setMethod(HttpMethod.GET);
+ oDataRequest.setRawRequestUri("def&");
+ oDataRequest.setProtocol("def&");
+ List headerValues = new ArrayList();
+ headerValues.add("Value1");
+ headerValues.add("Value2");
+ oDataRequest.addHeader("HeaderName", headerValues);
+
+ DebugTabRequest requestTab = new DebugTabRequest(oDataRequest);
+ assertEquals(expectedJson, createJson(requestTab));
+ assertEquals(expectedHtml, createHtml(requestTab));
+ }
+
+}
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
new file mode 100644
index 000000000..af55a4086
--- /dev/null
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabResponseTest.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.debug;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.olingo.commons.api.http.HttpStatusCode;
+import org.apache.olingo.server.api.ODataResponse;
+import org.junit.Test;
+
+public class DebugTabResponseTest extends AbstractDebugTabTest {
+
+ @Test
+ public void nullResponseMustNotLeadToException() throws Exception {
+ DebugTabResponse tab = new DebugTabResponse(null, null);
+
+ String expectedJson = "{\"status\":{\"code\":\"500\",\"info\":\"Internal Server Error\"},\"body\":null}";
+ String expectedHtml = "Status Code
\n"
+ + "500 Internal Server Error
\n"
+ + "Response Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value
\n"
+ + "Response Body
\n"
+ + "ODataLibrary: no response body
";
+
+ assertEquals(expectedJson, createJson(tab));
+ assertEquals(expectedHtml, createHtml(tab));
+ }
+
+ @Test
+ public void withInformationNoBody() throws Exception {
+ ODataResponse response = new ODataResponse();
+ response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
+ response.setHeader("headername", "headervalue");
+ response.setHeader("headername2", "headervalue2");
+ DebugTabResponse tab = new DebugTabResponse(response, null);
+
+ String expectedJson = "{\"status\":{\"code\":\"204\",\"info\":\"No Content\"},"
+ + "\"headers\":{\"headername\":\"headervalue\",\"headername2\":\"headervalue2\"},\"body\":null}";
+ String expectedHtml = "Status Code
\n"
+ + "204 No Content
\n"
+ + "Response Headers
\n"
+ + "\n"
+ + "\n"
+ + "Name Value headername headervalue headername2 headervalue2
\n"
+ + "Response Body
\n"
+ + "ODataLibrary: no response body
";
+ assertEquals(expectedJson, createJson(tab));
+ assertEquals(expectedHtml, createHtml(tab));
+ }
+
+}
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabServerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabServerTest.java
new file mode 100644
index 000000000..dc4748da3
--- /dev/null
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/debug/DebugTabServerTest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.debug;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+public class DebugTabServerTest extends AbstractDebugTabTest {
+
+ @Test
+ public void nullServerInformationMustNotleadToException() throws Exception {
+ DebugTabServer serverTab = new DebugTabServer(null);
+
+ assertEquals("null", createJson(serverTab));
+ String html = createHtml(serverTab);
+ assertTrue(html.startsWith("Library Version
"));
+ assertTrue(html.endsWith("Server Environment
\n"));
+ }
+
+ @Test
+ public void initialServerInformationMustNotleadToException() throws Exception {
+ Map env = Collections.emptyMap();
+ DebugTabServer serverTab = new DebugTabServer(env);
+
+ assertEquals("null", createJson(serverTab));
+ String html = createHtml(serverTab);
+ assertTrue(html.startsWith("Library Version
"));
+ assertTrue(html.endsWith("Server Environment
\n"));
+ }
+
+ @Test
+ public void twoParametersNoNull() throws Exception {
+ Map env = new LinkedHashMap();
+ env.put("key1", "value1");
+ env.put("key2", "value2");
+ DebugTabServer serverTab = new DebugTabServer(env);
+
+ String expectedJson = "{\"key1\":\"value1\",\"key2\":\"value2\"}";
+
+ assertEquals(expectedJson, createJson(serverTab));
+ String html = createHtml(serverTab);
+ assertTrue(html.contains("key1 value1 key2 value2 env = new LinkedHashMap();
+ env.put("key1", null);
+ env.put("key2", null);
+ DebugTabServer serverTab = new DebugTabServer(env);
+
+ String expectedJson = "{\"key1\":null,\"key2\":null}";
+
+ assertEquals(expectedJson, createJson(serverTab));
+ String html = createHtml(serverTab);
+ assertTrue(html.contains("key1 null key2 null