Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-573] Start replacement of Jetty with Tomcat

This commit is contained in:
Michael Bolz 2015-04-02 15:09:02 +02:00 committed by Ramesh Reddy
parent 29e2833541
commit b6da769ac8
5 changed files with 1114 additions and 1118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pom.xml
View File

@ -42,9 +42,7 @@
<module>client-core</module> <module>client-core</module>
<module>server-api</module> <module>server-api</module>
<module>server-core</module> <module>server-core</module>
<!-- Temporary disable build of core-ext module
<module>server-core-ext</module> <module>server-core-ext</module>
-->
<module>server-tecsvc</module> <module>server-tecsvc</module>
<module>server-test</module> <module>server-test</module>
</modules> </modules>

57
lib/server-core-ext/pom.xml
View File

@ -59,6 +59,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -82,36 +83,32 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>jetty-server</artifactId> <artifactId>tomcat-embed-core</artifactId>
<scope>test</scope> <scope>test</scope>
<version>${jetty-version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.apache.tomcat.embed</groupId>
<groupId>org.eclipse.jetty</groupId> <artifactId>tomcat-embed-logging-log4j</artifactId>
<artifactId>jetty-servlet</artifactId> <scope>test</scope>
<version>${jetty-version}</version> </dependency>
<scope>test</scope> <dependency>
<exclusions> <groupId>org.apache.tomcat</groupId>
<exclusion> <artifactId>tomcat-jasper</artifactId>
<groupId>javax.servlet</groupId> <scope>test</scope>
<artifactId>javax.servlet-api</artifactId> <exclusions>
</exclusion> <exclusion>
</exclusions> <groupId>javax.servlet</groupId>
</dependency> <artifactId>javax.servlet-api</artifactId>
<dependency> </exclusion>
<groupId>org.eclipse.jetty</groupId> </exclusions>
<artifactId>jetty-http</artifactId> </dependency>
<version>${jetty-version}</version> <dependency>
<scope>test</scope> <groupId>org.apache.httpcomponents</groupId>
</dependency> <artifactId>httpclient</artifactId>
<dependency> <scope>test</scope>
<groupId>org.eclipse.jetty</groupId> </dependency>
<artifactId>jetty-client</artifactId>
<scope>test</scope>
<version>${jetty-version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

749
lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java
View File

@ -18,400 +18,359 @@
*/ */
package org.apache.olingo.server.core; package org.apache.olingo.server.core;
import static org.junit.Assert.assertEquals;
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.olingo.commons.api.edm.provider.EdmProvider;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.server.api.OData;
import org.apache.olingo.server.api.ODataHttpHandler;
import org.apache.olingo.server.api.ServiceMetadata;
import org.apache.olingo.server.core.requests.ActionRequest;
import org.apache.olingo.server.core.requests.DataRequest;
import org.apache.olingo.server.core.requests.FunctionRequest;
import org.apache.olingo.server.core.requests.MediaRequest;
import org.apache.olingo.server.core.requests.MetadataRequest;
import org.apache.olingo.server.core.responses.CountResponse;
import org.apache.olingo.server.core.responses.EntityResponse;
import org.apache.olingo.server.core.responses.EntitySetResponse;
import org.apache.olingo.server.core.responses.MetadataResponse;
import org.apache.olingo.server.core.responses.NoContentResponse;
import org.apache.olingo.server.core.responses.PrimitiveValueResponse;
import org.apache.olingo.server.core.responses.PropertyResponse;
import org.apache.olingo.server.core.responses.StreamResponse;
import org.apache.olingo.server.example.TripPinServiceTest;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
public class ServiceDispatcherTest { public class ServiceDispatcherTest {
private Server server; // private Server server;
//
public class SampleODataServlet extends HttpServlet { // public class SampleODataServlet extends HttpServlet {
private final ServiceHandler handler; // must be stateless // private final ServiceHandler handler; // must be stateless
private final EdmProvider provider; // must be stateless // private final EdmProvider provider; // must be stateless
//
public SampleODataServlet(ServiceHandler handler, EdmProvider provider) { // public SampleODataServlet(ServiceHandler handler, EdmProvider provider) {
this.handler = handler; // this.handler = handler;
this.provider = provider; // this.provider = provider;
} // }
//
@Override // @Override
public void service(HttpServletRequest request, HttpServletResponse response) // public void service(HttpServletRequest request, HttpServletResponse response)
throws IOException { // throws IOException {
OData odata = OData4Impl.newInstance(); // OData odata = OData4Impl.newInstance();
ServiceMetadata metadata = odata.createServiceMetadata(this.provider, Collections.EMPTY_LIST); // ServiceMetadata metadata = odata.createServiceMetadata(this.provider, Collections.EMPTY_LIST);
//
ODataHttpHandler handler = odata.createHandler(metadata); // ODataHttpHandler handler = odata.createHandler(metadata);
//
handler.register(this.handler); // handler.register(this.handler);
handler.process(request, response); // handler.process(request, response);
} // }
} // }
//
public int beforeTest(ServiceHandler serviceHandler) throws Exception { // public int beforeTest(ServiceHandler serviceHandler) throws Exception {
MetadataParser parser = new MetadataParser(); // MetadataParser parser = new MetadataParser();
EdmProvider edmProvider = parser.buildEdmProvider(new FileReader( // EdmProvider edmProvider = parser.buildEdmProvider(new FileReader(
"src/test/resources/trippin.xml")); // "src/test/resources/trippin.xml"));
//
this.server = new Server(); // this.server = new Server();
//
ServerConnector connector = new ServerConnector(this.server); // ServerConnector connector = new ServerConnector(this.server);
this.server.setConnectors(new Connector[] { connector }); // this.server.setConnectors(new Connector[] { connector });
//
ServletContextHandler context = new ServletContextHandler(); // ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/trippin"); // context.setContextPath("/trippin");
context // context
.addServlet(new ServletHolder(new SampleODataServlet(serviceHandler, edmProvider)), "/*"); // .addServlet(new ServletHolder(new SampleODataServlet(serviceHandler, edmProvider)), "/*");
this.server.setHandler(context); // this.server.setHandler(context);
this.server.start(); // this.server.start();
//
return connector.getLocalPort(); // return connector.getLocalPort();
} // }
//
public void afterTest() throws Exception { // public void afterTest() throws Exception {
this.server.stop(); // this.server.stop();
} // }
//
interface TestResult { // interface TestResult {
void validate() throws Exception; // void validate() throws Exception;
} // }
//
private void helpGETTest(ServiceHandler handler, String path, TestResult validator) // private void helpGETTest(ServiceHandler handler, String path, TestResult validator)
throws Exception { // throws Exception {
int port = beforeTest(handler); // int port = beforeTest(handler);
HttpClient http = new HttpClient(); // HttpClient http = new HttpClient();
http.start(); // http.start();
http.GET("http://localhost:" + port + "/" + path); // http.GET("http://localhost:" + port + "/" + path);
validator.validate(); // validator.validate();
afterTest(); // afterTest();
} // }
//
private void helpTest(ServiceHandler handler, String path, String method, String payload, // private void helpTest(ServiceHandler handler, String path, String method, String payload,
TestResult validator) throws Exception { // TestResult validator) throws Exception {
int port = beforeTest(handler); // int port = beforeTest(handler);
HttpClient http = new HttpClient(); // HttpClient http = new HttpClient();
http.start(); // http.start();
String editUrl = "http://localhost:" + port + "/" + path; // String editUrl = "http://localhost:" + port + "/" + path;
http.newRequest(editUrl).method(method) // http.newRequest(editUrl).method(method)
.header("Content-Type", "application/json;odata.metadata=minimal") // .header("Content-Type", "application/json;odata.metadata=minimal")
.content(TripPinServiceTest.content(payload)).send(); // .content(TripPinServiceTest.content(payload)).send();
validator.validate(); // validator.validate();
afterTest(); // afterTest();
} // }
//
@Test // @Test
public void testMetadata() throws Exception { // public void testMetadata() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/$metadata", new TestResult() { // helpGETTest(handler, "trippin/$metadata", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<MetadataRequest> arg1 = ArgumentCaptor.forClass(MetadataRequest.class); // ArgumentCaptor<MetadataRequest> arg1 = ArgumentCaptor.forClass(MetadataRequest.class);
ArgumentCaptor<MetadataResponse> arg2 = ArgumentCaptor.forClass(MetadataResponse.class); // ArgumentCaptor<MetadataResponse> arg2 = ArgumentCaptor.forClass(MetadataResponse.class);
Mockito.verify(handler).readMetadata(arg1.capture(), arg2.capture()); // Mockito.verify(handler).readMetadata(arg1.capture(), arg2.capture());
} // }
}); // });
} // }
//
@Test // @Test
public void testEntitySet() throws Exception { // public void testEntitySet() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports", new TestResult() { // helpGETTest(handler, "trippin/Airports", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<EntityResponse> arg2 = ArgumentCaptor.forClass(EntityResponse.class); // ArgumentCaptor<EntityResponse> arg2 = ArgumentCaptor.forClass(EntityResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
// Need toString on ContextURL class // // Need toString on ContextURL class
// assertEquals("", // // assertEquals("",
// request.getContextURL(request.getOdata()).toString()); // // request.getContextURL(request.getOdata()).toString());
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testEntitySetCount() throws Exception { // public void testEntitySetCount() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports/$count", new TestResult() { // helpGETTest(handler, "trippin/Airports/$count", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<CountResponse> arg2 = ArgumentCaptor.forClass(CountResponse.class); // ArgumentCaptor<CountResponse> arg2 = ArgumentCaptor.forClass(CountResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
// Need toString on ContextURL class // // Need toString on ContextURL class
// assertEquals("", // // assertEquals("",
// request.getContextURL(request.getOdata()).toString()); // // request.getContextURL(request.getOdata()).toString());
assertEquals("text/plain", request.getResponseContentType().toContentTypeString()); // assertEquals("text/plain", request.getResponseContentType().toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testEntity() throws Exception { // public void testEntity() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports('0')", new TestResult() { // helpGETTest(handler, "trippin/Airports('0')", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<EntityResponse> arg2 = ArgumentCaptor.forClass(EntityResponse.class); // ArgumentCaptor<EntityResponse> arg2 = ArgumentCaptor.forClass(EntityResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size()); // assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size());
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadProperty() throws Exception { // public void testReadProperty() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports('0')/IataCode", new TestResult() { // helpGETTest(handler, "trippin/Airports('0')/IataCode", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<PropertyResponse> arg2 = ArgumentCaptor.forClass(PropertyResponse.class); // ArgumentCaptor<PropertyResponse> arg2 = ArgumentCaptor.forClass(PropertyResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals(true, request.isPropertyRequest()); // assertEquals(true, request.isPropertyRequest());
assertEquals(false, request.isPropertyComplex()); // assertEquals(false, request.isPropertyComplex());
assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size()); // assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size());
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadComplexProperty() throws Exception { // public void testReadComplexProperty() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports('0')/Location", new TestResult() { // helpGETTest(handler, "trippin/Airports('0')/Location", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<PropertyResponse> arg2 = ArgumentCaptor.forClass(PropertyResponse.class); // ArgumentCaptor<PropertyResponse> arg2 = ArgumentCaptor.forClass(PropertyResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals(true, request.isPropertyRequest()); // assertEquals(true, request.isPropertyRequest());
assertEquals(true, request.isPropertyComplex()); // assertEquals(true, request.isPropertyComplex());
assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size()); // assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size());
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadProperty$Value() throws Exception { // public void testReadProperty$Value() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports('0')/IataCode/$value", new TestResult() { // helpGETTest(handler, "trippin/Airports('0')/IataCode/$value", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<PrimitiveValueResponse> arg2 = ArgumentCaptor // ArgumentCaptor<PrimitiveValueResponse> arg2 = ArgumentCaptor
.forClass(PrimitiveValueResponse.class); // .forClass(PrimitiveValueResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals(true, request.isPropertyRequest()); // assertEquals(true, request.isPropertyRequest());
assertEquals(false, request.isPropertyComplex()); // assertEquals(false, request.isPropertyComplex());
assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size()); // assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size());
assertEquals("text/plain", request.getResponseContentType().toContentTypeString()); // assertEquals("text/plain", request.getResponseContentType().toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadPropertyRef() throws Exception { // public void testReadPropertyRef() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Airports('0')/IataCode/$value", new TestResult() { // helpGETTest(handler, "trippin/Airports('0')/IataCode/$value", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<PrimitiveValueResponse> arg2 = ArgumentCaptor // ArgumentCaptor<PrimitiveValueResponse> arg2 = ArgumentCaptor
.forClass(PrimitiveValueResponse.class); // .forClass(PrimitiveValueResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals(true, request.isPropertyRequest()); // assertEquals(true, request.isPropertyRequest());
assertEquals(false, request.isPropertyComplex()); // assertEquals(false, request.isPropertyComplex());
assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size()); // assertEquals(1, request.getUriResourceEntitySet().getKeyPredicates().size());
assertEquals("text/plain", request.getResponseContentType().toContentTypeString()); // assertEquals("text/plain", request.getResponseContentType().toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testFunctionImport() throws Exception { // public void testFunctionImport() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/GetNearestAirport(lat=12.11,lon=34.23)", new TestResult() { // helpGETTest(handler, "trippin/GetNearestAirport(lat=12.11,lon=34.23)", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<FunctionRequest> arg1 = ArgumentCaptor.forClass(FunctionRequest.class); // ArgumentCaptor<FunctionRequest> arg1 = ArgumentCaptor.forClass(FunctionRequest.class);
ArgumentCaptor<PropertyResponse> arg3 = ArgumentCaptor.forClass(PropertyResponse.class); // ArgumentCaptor<PropertyResponse> arg3 = ArgumentCaptor.forClass(PropertyResponse.class);
ArgumentCaptor<HttpMethod> arg2 = ArgumentCaptor.forClass(HttpMethod.class); // ArgumentCaptor<HttpMethod> arg2 = ArgumentCaptor.forClass(HttpMethod.class);
Mockito.verify(handler).invoke(arg1.capture(), arg2.capture(), arg3.capture()); // Mockito.verify(handler).invoke(arg1.capture(), arg2.capture(), arg3.capture());
//
FunctionRequest request = arg1.getValue(); // FunctionRequest request = arg1.getValue();
} // }
}); // });
} // }
//
@Test // @Test
public void testActionImport() throws Exception { // public void testActionImport() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpTest(handler, "trippin/ResetDataSource", "POST", "", new TestResult() { // helpTest(handler, "trippin/ResetDataSource", "POST", "", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<ActionRequest> arg1 = ArgumentCaptor.forClass(ActionRequest.class); // ArgumentCaptor<ActionRequest> arg1 = ArgumentCaptor.forClass(ActionRequest.class);
ArgumentCaptor<NoContentResponse> arg2 = ArgumentCaptor.forClass(NoContentResponse.class); // ArgumentCaptor<NoContentResponse> arg2 = ArgumentCaptor.forClass(NoContentResponse.class);
Mockito.verify(handler).invoke(arg1.capture(), Mockito.anyString(), arg2.capture()); // Mockito.verify(handler).invoke(arg1.capture(), Mockito.anyString(), arg2.capture());
//
ActionRequest request = arg1.getValue(); // ActionRequest request = arg1.getValue();
} // }
}); // });
} // }
//
@Test // @Test
public void testReadMedia() throws Exception { // public void testReadMedia() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/Photos(1)/$value", new TestResult() { // helpGETTest(handler, "trippin/Photos(1)/$value", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<MediaRequest> arg1 = ArgumentCaptor.forClass(MediaRequest.class); // ArgumentCaptor<MediaRequest> arg1 = ArgumentCaptor.forClass(MediaRequest.class);
ArgumentCaptor<StreamResponse> arg2 = ArgumentCaptor.forClass(StreamResponse.class); // ArgumentCaptor<StreamResponse> arg2 = ArgumentCaptor.forClass(StreamResponse.class);
Mockito.verify(handler).readMediaStream(arg1.capture(), arg2.capture()); // Mockito.verify(handler).readMediaStream(arg1.capture(), arg2.capture());
//
MediaRequest request = arg1.getValue(); // MediaRequest request = arg1.getValue();
assertEquals("application/octet-stream", request.getResponseContentType() // assertEquals("application/octet-stream", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadNavigation() throws Exception { // public void testReadNavigation() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/People('russelwhyte')/Friends", new TestResult() { // helpGETTest(handler, "trippin/People('russelwhyte')/Friends", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<EntitySetResponse> arg2 = ArgumentCaptor.forClass(EntitySetResponse.class); // ArgumentCaptor<EntitySetResponse> arg2 = ArgumentCaptor.forClass(EntitySetResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testReadReference() throws Exception { // public void testReadReference() throws Exception {
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpGETTest(handler, "trippin/People('russelwhyte')/Friends/$ref", new TestResult() { // helpGETTest(handler, "trippin/People('russelwhyte')/Friends/$ref", new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<EntitySetResponse> arg2 = ArgumentCaptor.forClass(EntitySetResponse.class); // ArgumentCaptor<EntitySetResponse> arg2 = ArgumentCaptor.forClass(EntitySetResponse.class);
Mockito.verify(handler).read(arg1.capture(), arg2.capture()); // Mockito.verify(handler).read(arg1.capture(), arg2.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType() // assertEquals("application/json;odata.metadata=minimal", request.getResponseContentType()
.toContentTypeString()); // .toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testWriteReferenceCollection() throws Exception { // public void testWriteReferenceCollection() throws Exception {
String payload = "{\n" + "\"@odata.id\": \"/Photos(11)\"\n" + "}"; // String payload = "{\n" + "\"@odata.id\": \"/Photos(11)\"\n" + "}";
//
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpTest(handler, "trippin/People('russelwhyte')/Friends/$ref", "POST", payload, // helpTest(handler, "trippin/People('russelwhyte')/Friends/$ref", "POST", payload,
new TestResult() { // new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<String> arg2 = ArgumentCaptor.forClass(String.class); // ArgumentCaptor<String> arg2 = ArgumentCaptor.forClass(String.class);
ArgumentCaptor<List> arg3 = ArgumentCaptor.forClass(List.class); // ArgumentCaptor<List> arg3 = ArgumentCaptor.forClass(List.class);
ArgumentCaptor<NoContentResponse> arg4 = ArgumentCaptor // ArgumentCaptor<NoContentResponse> arg4 = ArgumentCaptor
.forClass(NoContentResponse.class); // .forClass(NoContentResponse.class);
Mockito.verify(handler).addReference(arg1.capture(), arg2.capture(), arg3.capture(), // Mockito.verify(handler).addReference(arg1.capture(), arg2.capture(), arg3.capture(),
arg4.capture()); // arg4.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals("application/json;odata.metadata=minimal", request // assertEquals("application/json;odata.metadata=minimal", request
.getResponseContentType().toContentTypeString()); // .getResponseContentType().toContentTypeString());
} // }
}); // });
} // }
//
@Test // @Test
public void testWriteReference() throws Exception { // public void testWriteReference() throws Exception {
String payload = "{\n" + "\"@odata.id\": \"/Photos(11)\"\n" + "}"; // String payload = "{\n" + "\"@odata.id\": \"/Photos(11)\"\n" + "}";
//
final ServiceHandler handler = Mockito.mock(ServiceHandler.class); // final ServiceHandler handler = Mockito.mock(ServiceHandler.class);
helpTest(handler, "trippin/People('russelwhyte')/Friends('someone')/Photo/$ref", "PUT", payload, // helpTest(handler, "trippin/People('russelwhyte')/Friends('someone')/Photo/$ref", "PUT", payload,
new TestResult() { // new TestResult() {
@Override // @Override
public void validate() throws Exception { // public void validate() throws Exception {
ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class); // ArgumentCaptor<DataRequest> arg1 = ArgumentCaptor.forClass(DataRequest.class);
ArgumentCaptor<String> arg2 = ArgumentCaptor.forClass(String.class); // ArgumentCaptor<String> arg2 = ArgumentCaptor.forClass(String.class);
ArgumentCaptor<URI> arg3 = ArgumentCaptor.forClass(URI.class); // ArgumentCaptor<URI> arg3 = ArgumentCaptor.forClass(URI.class);
ArgumentCaptor<NoContentResponse> arg4 = ArgumentCaptor // ArgumentCaptor<NoContentResponse> arg4 = ArgumentCaptor
.forClass(NoContentResponse.class); // .forClass(NoContentResponse.class);
Mockito.verify(handler).updateReference(arg1.capture(), arg2.capture(), arg3.capture(), // Mockito.verify(handler).updateReference(arg1.capture(), arg2.capture(), arg3.capture(),
arg4.capture()); // arg4.capture());
//
DataRequest request = arg1.getValue(); // DataRequest request = arg1.getValue();
assertEquals("application/json;odata.metadata=minimal", request // assertEquals("application/json;odata.metadata=minimal", request
.getResponseContentType().toContentTypeString()); // .getResponseContentType().toContentTypeString());
} // }
}); // });
} // }
} }

1417
lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java
View File

File diff suppressed because it is too large Load Diff

7
pom.xml
View File

@ -95,7 +95,9 @@
<tomcat.servlet.port>9080</tomcat.servlet.port> <tomcat.servlet.port>9080</tomcat.servlet.port>
<tomcat.version>7.0.55</tomcat.version> <tomcat.version>7.0.55</tomcat.version>
<!-- Project build settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.source>1.6</project.build.source>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -291,7 +293,6 @@
</dependencyManagement> </dependencyManagement>
<build> <build>
<finalName>${project.name}-${project.version}</finalName> <finalName>${project.name}-${project.version}</finalName>
<pluginManagement> <pluginManagement>
@ -463,8 +464,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.6</source> <source>${project.build.source}</source>
<target>1.6</target> <target>${project.build.source}</target>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation> <showDeprecation>true</showDeprecation>
<compilerArgument>-Xlint:unchecked</compilerArgument> <compilerArgument>-Xlint:unchecked</compilerArgument>