http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java index cf54938..a8d16e9 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java @@ -48,38 +48,38 @@ public class UriValidator { //@formatter:off (Eclipse formatter) //CHECKSTYLE:OFF (Maven checkstyle) private final boolean[][] decisionMatrix = - { - /* 0-FILTER 1-FORMAT 2-EXPAND 3-ID 4-COUNT 5-ORDERBY 6-SEARCH 7-SELECT 8-SKIP 9-SKIPTOKEN 10-TOP */ - /* all 0 */ { true , true , true , false, true , true , true , true , true , true , true }, - /* batch 1 */ { false, false, false, false, false, false, false, false, false, false, false }, - /* crossjoin 2 */ { true , true , true , false, true , true , true , true , true , true , true }, - /* entityId 3 */ { false, true , true , true , false, false, false, true , false, false, false }, - /* metadata 4 */ { false, true , false, false, false, false, false, false, false, false, false }, - /* service 5 */ { false, true , false, false, false, false, false, false, false, false, false }, - /* entitySet 6 */ { true , true , true , false, true , true , true , true , true , true , true }, - /* entitySetCount 7 */ { true , false, false, false, false, false, true, false, false, false, false }, - /* entity 8 */ { false, true , true , false, false, false, false, true , false, false, false }, - /* mediaStream 9 */ { false, false, false, false, false, false, false, false, false, false, false }, - /* references 10 */ { true , true , false, true, false, true , true , false, true , true , true }, - /* reference 11 */ { false, true , false, false, false, false, false, false, false, false, false }, - /* propertyComplex 12 */ { false, true , true , false, false, false, false, true , false, false, false }, - /* propertyComplexCollection 13 */ { true , true , true , false, true , true , false, true , true , true , true }, - /* propertyComplexCollectionCount 14 */ { true , false, false, false, false, false, true, false, false, false, false }, - /* propertyPrimitive 15 */ { false, true , false, false, false, false, false, false, false, false, false }, - /* propertyPrimitiveCollection 16 */ { true , true , false, false, true , true , false, false, true , true , true }, - /* propertyPrimitiveCollectionCount 17 */ { true , false, false, false, false, false, true, false, false, false, false }, - /* propertyPrimitiveValue 18 */ { false, true , false, false, false, false, false, false, false, false, false }, - /* none 19 */ { false, true , false, false, false, false, false, false, false, false, false } - }; + { + /* 0-FILTER 1-FORMAT 2-EXPAND 3-ID 4-COUNT 5-ORDERBY 6-SEARCH 7-SELECT 8-SKIP 9-SKIPTOKEN 10-TOP */ + /* all 0 */ { true , true , true , false, true , true , true , true , true , true , true }, + /* batch 1 */ { false, false, false, false, false, false, false, false, false, false, false }, + /* crossjoin 2 */ { true , true , true , false, true , true , true , true , true , true , true }, + /* entityId 3 */ { false, true , true , true , false, false, false, true , false, false, false }, + /* metadata 4 */ { false, true , false, false, false, false, false, false, false, false, false }, + /* service 5 */ { false, true , false, false, false, false, false, false, false, false, false }, + /* entitySet 6 */ { true , true , true , false, true , true , true , true , true , true , true }, + /* entitySetCount 7 */ { true , false, false, false, false, false, true, false, false, false, false }, + /* entity 8 */ { false, true , true , false, false, false, false, true , false, false, false }, + /* mediaStream 9 */ { false, false, false, false, false, false, false, false, false, false, false }, + /* references 10 */ { true , true , false, true, false, true , true , false, true , true , true }, + /* reference 11 */ { false, true , false, false, false, false, false, false, false, false, false }, + /* propertyComplex 12 */ { false, true , true , false, false, false, false, true , false, false, false }, + /* propertyComplexCollection 13 */ { true , true , true , false, true , true , false, true , true , true , true }, + /* propertyComplexCollectionCount 14 */ { true , false, false, false, false, false, true, false, false, false, false }, + /* propertyPrimitive 15 */ { false, true , false, false, false, false, false, false, false, false, false }, + /* propertyPrimitiveCollection 16 */ { true , true , false, false, true , true , false, false, true , true , true }, + /* propertyPrimitiveCollectionCount 17 */ { true , false, false, false, false, false, true, false, false, false, false }, + /* propertyPrimitiveValue 18 */ { false, true , false, false, false, false, false, false, false, false, false }, + /* none 19 */ { false, true , false, false, false, false, false, false, false, false, false } + }; private final boolean[][] decisionMatrixForHttpMethod = { - /* 0-FILTER 1-FORMAT 2-EXPAND 3-ID 4-COUNT 5-ORDERBY 6-SEARCH 7-SELECT 8-SKIP 9-SKIPTOKEN 10-TOP */ - /* GET 0 */ { true , true , true , true, true , true , true , true , true , true , true }, - /* POST 0 */ { true , false , true , false, false , true , false , true , false , false , false }, - /* PUT 0 */ { false , false , false , false, false , false , false , false , false , false , false }, - /* DELETE 0 */ { false , false , false , true, false , false, false , false, false , false , false }, - /* PATCH 0 */ { false , false , false , false, false , false , false , false , false , false , false } + /* 0-FILTER 1-FORMAT 2-EXPAND 3-ID 4-COUNT 5-ORDERBY 6-SEARCH 7-SELECT 8-SKIP 9-SKIPTOKEN 10-TOP */ + /* GET 0 */ { true , true , true , true, true , true , true , true , true , true , true }, + /* POST 0 */ { true , false , true , false, false , true , false , true , false , false , false }, + /* PUT 0 */ { false , false , false , false, false , false , false , false , false , false , false }, + /* DELETE 0 */ { false , false , false , true, false , false, false , false, false , false , false }, + /* PATCH 0 */ { false , false , false , false, false , false , false , false , false , false , false } }; //CHECKSTYLE:ON //@formatter:on
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java index af12eaa..f84ef95 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java @@ -70,11 +70,11 @@ public class ContentNegotiatorTest { { "a/a;v=w;x=y", null, "a/a;x=y", "a/a;b=c,a/a;v=w;x=y" }, { "a/a;v=w;x=y", "a/a;x=y", null, "a/a;b=c,a/a;v=w;x=y" }, { ACCEPT_CASE_MIN, "json", ACCEPT_CASE_MIN, null }, - { ACCEPT_CASE_FULL, null, ACCEPT_CASE_FULL, ACCEPT_CASE_FULL }, + { ACCEPT_CASE_FULL, null, ACCEPT_CASE_FULL, ACCEPT_CASE_FULL }, { ACCEPT_CASE_MIN_UTF8, null, ACCEPT_CASE_MIN_UTF8, null } - }; + }; - String[][] casesMetadata = { + String[][] casesMetadata = { /* expected $format accept modified content types */ { ACCEPT_CASE_XML, null, null, null }, { ACCEPT_CASE_XML, "xml", null, null }, @@ -87,7 +87,7 @@ public class ContentNegotiatorTest { { "a/a;x=y", "a/a", ACCEPT_CASE_WILDCARD1, "a/a;x=y" } }; - String[][] casesFail = { + String[][] casesFail = { /* expected $format accept modified content types */ { null, "xxx/yyy", null, null }, { null, "a/a", null, "b/b" }, @@ -140,7 +140,7 @@ public class ContentNegotiatorTest { testContentNegotiation(useCase, RepresentationType.COLLECTION_ENTITY); fail("Exception expected for '" + useCase[1] + '|' + useCase[2] + '|' + useCase[3] + "'!"); } catch (final ContentNegotiatorException e) { - //Expected Exception + // Expected Exception } } } @@ -200,8 +200,8 @@ public class ContentNegotiatorTest { final String[] contentTypes = contentTypeString.split(","); List<ContentType> types = new ArrayList<ContentType>(); - for (int i = 0; i < contentTypes.length; i++) { - types.add(ContentType.create(contentTypes[i])); + for (String contentType : contentTypes) { + types.add(ContentType.create(contentType)); } CustomContentTypeSupport customContentTypeSupport = mock(CustomContentTypeSupport.class); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java index a1c09a0..6ce4226 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java @@ -88,7 +88,7 @@ public class ODataHttpHandlerImplTest { ODataHttpHandlerImpl.extractMethod(odr, hr); fail(); } catch (ODataTranslatedException e) { - //expected + // expected } } } @@ -100,41 +100,41 @@ public class ODataHttpHandlerImplTest { //CHECKSTYLE:OFF (Maven checkstyle) String [][] uris = { /* 0: host 1: cp 2: sp 3: sr 4: od 5: qp 6: spl */ - { "http://localhost";, "", "", "", "", "", "0"}, - { "http://localhost";, "", "", "", "/", "", "0"}, - { "http://localhost";, "", "", "", "/od", "", "0"}, - { "http://localhost";, "", "", "", "/od/", "", "0"}, - - { "http://localhost";, "/cp", "", "", "", "", "0"}, - { "http://localhost";, "/cp", "", "", "/", "", "0"}, - { "http://localhost";, "/cp", "", "", "/od", "", "0"}, - { "http://localhost";, "", "/sp", "", "", "", "0"}, - { "http://localhost";, "", "/sp", "", "/", "", "0"}, - { "http://localhost";, "", "/sp", "", "/od", "", "0"}, - { "http://localhost";, "", "", "/sr", "", "", "1"}, - { "http://localhost";, "", "", "/sr", "/", "", "1"}, - { "http://localhost";, "", "", "/sr", "/od", "", "1"}, - { "http://localhost";, "", "", "/sr/sr", "", "", "2"}, - { "http://localhost";, "", "", "/sr/sr", "/", "", "2"}, - { "http://localhost";, "", "", "/sr/sr", "/od", "", "2"}, - - { "http://localhost";, "/cp", "/sp", "", "", "", "0"}, - { "http://localhost";, "/cp", "/sp", "", "/", "", "0"}, - { "http://localhost";, "/cp", "/sp", "", "/od", "", "0"}, - { "http://localhost";, "/cp", "", "/sr", "/", "", "1"}, - { "http://localhost";, "/cp", "", "/sr", "/od", "", "1"}, - { "http://localhost";, "", "/sp", "/sr", "", "", "1"}, - { "http://localhost";, "", "/sp", "/sr", "/", "", "1"}, - { "http://localhost";, "", "/sp", "/sr", "/od", "", "1"}, - { "http://localhost";, "/cp", "/sp", "/sr", "", "", "1"}, - { "http://localhost";, "/cp", "/sp", "/sr", "/", "", "1"}, - { "http://localhost";, "/cp", "/sp", "/sr", "/od", "", "1"}, - - { "http://localhost";, "", "", "", "", "qp", "0"}, - { "http://localhost";, "", "", "", "/", "qp", "0"}, - { "http://localhost";, "/cp", "/sp", "/sr", "/od", "qp", "1"}, - - { "http://localhost:8080";, "/c%20p", "/s%20p", "/s%20r", "/o%20d", "p+q", "1"}, + { "http://localhost";, "", "", "", "", "", "0"}, + { "http://localhost";, "", "", "", "/", "", "0"}, + { "http://localhost";, "", "", "", "/od", "", "0"}, + { "http://localhost";, "", "", "", "/od/", "", "0"}, + + { "http://localhost";, "/cp", "", "", "", "", "0"}, + { "http://localhost";, "/cp", "", "", "/", "", "0"}, + { "http://localhost";, "/cp", "", "", "/od", "", "0"}, + { "http://localhost";, "", "/sp", "", "", "", "0"}, + { "http://localhost";, "", "/sp", "", "/", "", "0"}, + { "http://localhost";, "", "/sp", "", "/od", "", "0"}, + { "http://localhost";, "", "", "/sr", "", "", "1"}, + { "http://localhost";, "", "", "/sr", "/", "", "1"}, + { "http://localhost";, "", "", "/sr", "/od", "", "1"}, + { "http://localhost";, "", "", "/sr/sr", "", "", "2"}, + { "http://localhost";, "", "", "/sr/sr", "/", "", "2"}, + { "http://localhost";, "", "", "/sr/sr", "/od", "", "2"}, + + { "http://localhost";, "/cp", "/sp", "", "", "", "0"}, + { "http://localhost";, "/cp", "/sp", "", "/", "", "0"}, + { "http://localhost";, "/cp", "/sp", "", "/od", "", "0"}, + { "http://localhost";, "/cp", "", "/sr", "/", "", "1"}, + { "http://localhost";, "/cp", "", "/sr", "/od", "", "1"}, + { "http://localhost";, "", "/sp", "/sr", "", "", "1"}, + { "http://localhost";, "", "/sp", "/sr", "/", "", "1"}, + { "http://localhost";, "", "/sp", "/sr", "/od", "", "1"}, + { "http://localhost";, "/cp", "/sp", "/sr", "", "", "1"}, + { "http://localhost";, "/cp", "/sp", "/sr", "/", "", "1"}, + { "http://localhost";, "/cp", "/sp", "/sr", "/od", "", "1"}, + + { "http://localhost";, "", "", "", "", "qp", "0"}, + { "http://localhost";, "", "", "", "/", "qp", "0"}, + { "http://localhost";, "/cp", "/sp", "/sr", "/od", "qp", "1"}, + + { "http://localhost:8080";, "/c%20p", "/s%20p", "/s%20r", "/o%20d", "p+q", "1"}, }; //@formatter:on // CHECKSTYLE:on http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java index 5460d9f..47e4547 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/TranslatedExceptionSubclassesTest.java @@ -18,6 +18,13 @@ */ package org.apache.olingo.server.core; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.util.Formatter; +import java.util.Locale; +import java.util.Properties; +import java.util.UUID; + import org.apache.olingo.server.api.ODataTranslatedException; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; @@ -26,13 +33,6 @@ import org.apache.olingo.server.core.uri.validator.UriValidationException; import org.junit.Assert; import org.junit.Test; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.Formatter; -import java.util.Locale; -import java.util.Properties; -import java.util.UUID; - /** * Generic test for all exceptions which inherit from ODataTranslatedException * if their MessageKeys are available in the resource bundle and the parameters are replaced. @@ -72,7 +72,7 @@ public class TranslatedExceptionSubclassesTest { clazz.getConstructor(String.class, ODataTranslatedException.MessageKey.class, String[].class); String[] paras = new String[paraCount]; for (int i = 0; i < paras.length; i++) { - paras[i] = "470" + i; + paras[i] = "470" + i; } String developerMessage = UUID.randomUUID().toString(); ODataTranslatedException e = ctor.newInstance(developerMessage, messageKey, paras); @@ -89,12 +89,11 @@ public class TranslatedExceptionSubclassesTest { } } - - private int countParameters(String value) { + private int countParameters(final String value) { char[] chars = value.toCharArray(); int count = 0; for (char aChar : chars) { - if(aChar == '%') { + if (aChar == '%') { count++; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java index aa5df37..22e71d2 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java @@ -88,7 +88,7 @@ public class MockedBatchHandlerTest { + "Content-Transfer-Encoding: binary" + CRLF + "Content-Id: 3" + CRLF + CRLF - + "PUT ESAllPrim(1) HTTP/1.1" + CRLF + + "PUT ESAllPrim(1) HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + CRLF @@ -97,7 +97,7 @@ public class MockedBatchHandlerTest { + "Content-Transfer-Encoding: binary" + CRLF + "Content-Id: 4" + CRLF + CRLF - + "PUT $3/PropertyInt32 HTTP/1.1" + CRLF + + "PUT $3/PropertyInt32 HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + CRLF @@ -106,7 +106,7 @@ public class MockedBatchHandlerTest { + "Content-Transfer-Encoding: binary" + CRLF + "Content-Id: 1" + CRLF + CRLF - + "POST ESAllPrim HTTP/1.1" + CRLF + + "POST ESAllPrim HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + CRLF @@ -115,7 +115,7 @@ public class MockedBatchHandlerTest { + "Content-Transfer-Encoding: binary" + CRLF + "Content-Id: 5" + CRLF + CRLF - + "POST http://localhost:8080/odata/$1/NavPropertyETTwoPrimMany HTTP/1.1" + CRLF + + "POST http://localhost:8080/odata/$1/NavPropertyETTwoPrimMany HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + CRLF @@ -133,7 +133,7 @@ public class MockedBatchHandlerTest { + "Content-Transfer-Encoding: binary" + CRLF + "Content-Id: 6" + CRLF + CRLF - + "PUT ESAllPrim(1) HTTP/1.1" + CRLF + + "PUT ESAllPrim(1) HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + CRLF @@ -519,7 +519,7 @@ public class MockedBatchHandlerTest { /* * Helper methods */ - private String checkChangeSetPartHeader(final List<String> response, int line) { + private String checkChangeSetPartHeader(final List<String> response, final int line) { int lineNumber = line; assertEquals(CRLF, response.get(lineNumber++)); assertTrue(response.get(lineNumber++).contains("--changeset_")); @@ -570,12 +570,12 @@ public class MockedBatchHandlerTest { private OData odata; @Override - public void init(OData odata, ServiceMetadata serviceMetadata) { + public void init(final OData odata, final ServiceMetadata serviceMetadata) { this.odata = odata; } @Override - public ODataResponsePart processChangeSet(BatchFacade fascade, List<ODataRequest> requests) { + public ODataResponsePart processChangeSet(final BatchFacade fascade, final List<ODataRequest> requests) { List<ODataResponse> responses = new ArrayList<ODataResponse>(); for (ODataRequest request : requests) { @@ -590,7 +590,7 @@ public class MockedBatchHandlerTest { } @Override - public void processBatch(BatchFacade fascade, ODataRequest request, ODataResponse response) + public void processBatch(final BatchFacade fascade, final ODataRequest request, final ODataResponse response) throws BatchDeserializerException, BatchSerializerException { final String boundary = getBoundary(request.getHeader(HttpHeader.CONTENT_TYPE)); final BatchOptions options = BatchOptions.with().isStrict(true).rawBaseUri(BASE_URI).build(); @@ -603,7 +603,7 @@ public class MockedBatchHandlerTest { // Mock the processor for a given requests when(oDataHandler.process(oDataRequest)).then(new Answer<ODataResponse>() { @Override - public ODataResponse answer(InvocationOnMock invocation) throws Throwable { + public ODataResponse answer(final InvocationOnMock invocation) throws Throwable { Object[] arguments = invocation.getArguments(); return buildResponse((ODataRequest) arguments[0]); @@ -617,18 +617,18 @@ public class MockedBatchHandlerTest { final String responeBoundary = "batch_" + UUID.randomUUID().toString(); final InputStream responseStream = odata.createFixedFormatSerializer().batchResponse(responseParts, responeBoundary); - + response.setStatusCode(HttpStatusCode.ACCEPTED.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, HttpContentType.MULTIPART_MIXED + ";boundary=" + responeBoundary); response.setContent(responseStream); } - private String getBoundary(String contentType) throws BatchDeserializerException { + private String getBoundary(final String contentType) throws BatchDeserializerException { return BatchParserCommon.getBoundary(contentType, 0); } } - private ODataResponse buildResponse(ODataRequest request) { + private ODataResponse buildResponse(final ODataRequest request) { final ODataResponse oDataResponse = new ODataResponse(); if (request.getMethod() == HttpMethod.POST) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerTest.java index 27f6a5d..565c32a 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerTest.java @@ -37,7 +37,7 @@ public class FixedFormatDeserializerTest { @Test public void binary() throws Exception { - assertArrayEquals(new byte [] { 0x41, 0x42, 0x43 }, + assertArrayEquals(new byte[] { 0x41, 0x42, 0x43 }, deserializer.binary(IOUtils.toInputStream("ABC"))); } @@ -46,8 +46,8 @@ public class FixedFormatDeserializerTest { assertEquals(4 * 3 * 26, deserializer.binary(IOUtils.toInputStream( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" - + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" - + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" - + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")).length); + + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" + + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" + + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")).length); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommonTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommonTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommonTest.java index 294283f..89656ab 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommonTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommonTest.java @@ -18,15 +18,13 @@ */ package org.apache.olingo.server.core.deserializer.batch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.List; import org.apache.olingo.commons.api.http.HttpHeader; -import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon; -import org.apache.olingo.server.core.deserializer.batch.Header; -import org.apache.olingo.server.core.deserializer.batch.Line; import org.junit.Test; public class BatchParserCommonTest { @@ -40,19 +38,19 @@ public class BatchParserCommonTest { "Content-Id: 2" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> contentIdHeaders = header.getHeaders(BatchParserCommon.HTTP_CONTENT_ID); assertNotNull(contentIdHeaders); assertEquals(2, contentIdHeaders.size()); assertEquals("1", contentIdHeaders.get(0)); assertEquals("2", contentIdHeaders.get(1)); } - + @Test public void testMultipleHeaderSameValue() throws Exception { String[] messageRaw = new String[] { @@ -60,18 +58,18 @@ public class BatchParserCommonTest { "Content-Id: 1" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> contentIdHeaders = header.getHeaders(BatchParserCommon.HTTP_CONTENT_ID); assertNotNull(contentIdHeaders); assertEquals(1, contentIdHeaders.size()); assertEquals("1", contentIdHeaders.get(0)); } - + @Test public void testHeaderSperatedByComma() throws Exception { String[] messageRaw = new String[] { @@ -79,12 +77,12 @@ public class BatchParserCommonTest { "Upgrade: HTTP/2.0, SHTTP/1.3, IRC/6.9, RTA/x11" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> upgradeHeader = header.getHeaders("upgrade"); assertNotNull(upgradeHeader); assertEquals(4, upgradeHeader.size()); @@ -93,7 +91,7 @@ public class BatchParserCommonTest { assertEquals("IRC/6.9", upgradeHeader.get(2)); assertEquals("RTA/x11", upgradeHeader.get(3)); } - + @Test public void testMultipleAcceptHeader() throws Exception { String[] messageRaw = new String[] { @@ -102,17 +100,17 @@ public class BatchParserCommonTest { "Accept-Language:en-US,en;q=0.7,en-UK;q=0.9" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> acceptHeader = header.getHeaders(HttpHeader.ACCEPT); assertNotNull(acceptHeader); assertEquals(4, acceptHeader.size()); } - + @Test public void testMultipleAcceptHeaderSameValue() throws Exception { String[] messageRaw = new String[] { @@ -121,17 +119,17 @@ public class BatchParserCommonTest { "Accept-Language:en-US,en;q=0.7,en-UK;q=0.9" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> acceptHeader = header.getHeaders(HttpHeader.ACCEPT); assertNotNull(acceptHeader); assertEquals(3, acceptHeader.size()); } - + @Test public void testMultipleAccepLanguagetHeader() throws Exception { String[] messageRaw = new String[] { @@ -139,17 +137,17 @@ public class BatchParserCommonTest { "Accept-Language: de-DE;q=0.3" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> acceptLanguageHeader = header.getHeaders(HttpHeader.ACCEPT_LANGUAGE); assertNotNull(acceptLanguageHeader); assertEquals(4, acceptLanguageHeader.size()); } - + @Test public void testMultipleAccepLanguagetHeaderSameValue() throws Exception { String[] messageRaw = new String[] { @@ -157,73 +155,73 @@ public class BatchParserCommonTest { "Accept-Language:en-US,en;q=0.7" + CRLF, "content-type: Application/http" + CRLF, "content-transfer-encoding: Binary" + CRLF - }; + }; List<Line> message = toLineList(messageRaw); - + final Header header = BatchParserCommon.consumeHeaders(message); assertNotNull(header); - + final List<String> acceptLanguageHeader = header.getHeaders(HttpHeader.ACCEPT_LANGUAGE); assertNotNull(acceptLanguageHeader); assertEquals(3, acceptLanguageHeader.size()); } - + @Test public void testRemoveEndingCRLF() { String line = "Test\r\n"; - assertEquals("Test", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Test", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveLastEndingCRLF() { String line = "Test\r\n\r\n"; - assertEquals("Test\r\n", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Test\r\n", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveEndingCRLFWithWS() { String line = "Test\r\n "; - assertEquals("Test", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Test", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveEndingCRLFNothingToRemove() { String line = "Hallo\r\nBla"; - assertEquals("Hallo\r\nBla", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Hallo\r\nBla", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveEndingCRLFAll() { String line = "\r\n"; - assertEquals("", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveEndingCRLFSpace() { String line = "\r\n "; - assertEquals("", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveLastEndingCRLFWithWS() { String line = "Test \r\n"; - assertEquals("Test ", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Test ", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } @Test public void testRemoveLastEndingCRLFWithWSLong() { String line = "Test \r\nTest2 \r\n"; - assertEquals("Test \r\nTest2 ", BatchParserCommon.removeEndingCRLF(new Line(line,1)).toString()); + assertEquals("Test \r\nTest2 ", BatchParserCommon.removeEndingCRLF(new Line(line, 1)).toString()); } - - private List<Line> toLineList(String[] messageRaw) { + + private List<Line> toLineList(final String[] messageRaw) { final List<Line> lineList = new ArrayList<Line>(); int counter = 1; - - for(final String currentLine : messageRaw) { + + for (final String currentLine : messageRaw) { lineList.add(new Line(currentLine, counter++)); } - + return lineList; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchRequestParserTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchRequestParserTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchRequestParserTest.java index 6282742..a194cc9 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchRequestParserTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BatchRequestParserTest.java @@ -36,8 +36,6 @@ import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; import org.apache.olingo.server.api.batch.exception.BatchDeserializerException.MessageKeys; import org.apache.olingo.server.api.deserializer.batch.BatchOptions; import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; -import org.apache.olingo.server.core.deserializer.batch.BatchParser; -import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon; import org.junit.Test; public class BatchRequestParserTest { @@ -188,7 +186,7 @@ public class BatchRequestParserTest { } } } - + @Test public void testAbsoluteUri() throws Exception { final String batch = "" @@ -199,21 +197,21 @@ public class BatchRequestParserTest { + CRLF + CRLF + "--batch_8194-cf13-1f56--"; - + final List<BatchRequestPart> batchRequestParts = parse(batch); - + assertEquals(1, batchRequestParts.size()); final BatchRequestPart part = batchRequestParts.get(0); - + assertEquals(1, part.getRequests().size()); final ODataRequest request = part.getRequests().get(0); - + assertEquals("/Employees('1')/EmployeeName", request.getRawODataPath()); assertEquals("$top=1", request.getRawQueryPath()); assertEquals("http://localhost/odata/Employees('1')/EmployeeName?$top=1", request.getRawRequestUri()); assertEquals("http://localhost/odata";, request.getRawBaseUri()); } - + @Test public void testBoundaryParameterWithQuotas() throws Exception { final String contentType = "multipart/mixed; boundary=\"batch_1.2+34:2j)0?\""; @@ -552,7 +550,7 @@ public class BatchRequestParserTest { + "Content-Id: 1" + CRLF + CRLF + "POST Employees('2') HTTP/1.1" + CRLF - + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + "Content-Id: 2" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BufferedReaderIncludingLineEndingsTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BufferedReaderIncludingLineEndingsTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BufferedReaderIncludingLineEndingsTest.java index efc3714..4a41dc6 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BufferedReaderIncludingLineEndingsTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/BufferedReaderIncludingLineEndingsTest.java @@ -18,19 +18,19 @@ */ package org.apache.olingo.server.core.deserializer.batch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.InputStreamReader; import java.util.List; -import org.apache.olingo.server.core.deserializer.batch.BufferedReaderIncludingLineEndings; -import org.apache.olingo.server.core.deserializer.batch.Line; import org.junit.Test; public class BufferedReaderIncludingLineEndingsTest { - private static final String TEXT_COMBINED = "Test\r" + "Test2\r\n" + "Test3\n" + @@ -377,18 +377,18 @@ public class BufferedReaderIncludingLineEndingsTest { assertEquals(null, reader.readLine()); assertEquals(-1, reader.read()); } - + @Test public void testLineEqualsAndHashCode() { Line l1 = new Line("The first line", 1); Line l2 = new Line("The first line", 1); Line l3 = new Line("The second line", 2); - + assertEquals(l1, l2); assertFalse(l1.equals(l3)); assertTrue(l1.hashCode() != l3.hashCode()); } - + @Test(expected = IllegalArgumentException.class) public void testSkipNegative() throws Exception { BufferedReaderIncludingLineEndings reader = create("123"); @@ -473,7 +473,7 @@ public class BufferedReaderIncludingLineEndingsTest { .getBytes("UTF-8")))); } - private BufferedReaderIncludingLineEndings create(final String inputString, int bufferSize) throws Exception { + private BufferedReaderIncludingLineEndings create(final String inputString, final int bufferSize) throws Exception { return new BufferedReaderIncludingLineEndings(new InputStreamReader(new ByteArrayInputStream(inputString .getBytes("UTF-8"))), bufferSize); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HeaderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HeaderTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HeaderTest.java index 282251e..6ab6491 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HeaderTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HeaderTest.java @@ -18,15 +18,16 @@ */ package org.apache.olingo.server.core.deserializer.batch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.commons.api.http.HttpHeader; -import org.apache.olingo.server.core.deserializer.batch.BatchParserCommon; -import org.apache.olingo.server.core.deserializer.batch.Header; import org.junit.Test; public class HeaderTest { @@ -154,7 +155,7 @@ public class HeaderTest { assertEquals(HttpContentType.APPLICATION_ATOM_SVC, header.getHeaders(HttpHeader.CONTENT_TYPE).get(1)); assertEquals(HttpContentType.APPLICATION_ATOM_XML, header.getHeaders(HttpHeader.CONTENT_TYPE).get(2)); } - + @Test public void testSplitValues() { final String values = "abc, def,123,77, 99, ysd"; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HttpRequestStatusLineTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HttpRequestStatusLineTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HttpRequestStatusLineTest.java index 5ea7cc8..f859481 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HttpRequestStatusLineTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/batch/HttpRequestStatusLineTest.java @@ -18,7 +18,8 @@ */ package org.apache.olingo.server.core.deserializer.batch; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; @@ -41,7 +42,7 @@ public class HttpRequestStatusLineTest { assertEquals(baseUri, line.getRawBaseUri()); assertEquals(serviceResolutionUri, line.getRawServiceResolutionUri()); } - + @Test public void testAbsoluteWithRelativePath() throws BatchDeserializerException { final HttpRequestStatusLine line = parse("http://localhost/odata/../../Employee?$top=2";); @@ -51,7 +52,7 @@ public class HttpRequestStatusLineTest { assertEquals(baseUri, line.getRawBaseUri()); assertEquals(serviceResolutionUri, line.getRawServiceResolutionUri()); } - + @Test public void testRelativeWithDots() throws BatchDeserializerException { final HttpRequestStatusLine line = parse("../../Employee?$top=2"); @@ -61,7 +62,7 @@ public class HttpRequestStatusLineTest { assertEquals(baseUri, line.getRawBaseUri()); assertEquals(serviceResolutionUri, line.getRawServiceResolutionUri()); } - + @Test public void testRelative() throws BatchDeserializerException { final HttpRequestStatusLine line = parse("Employee?$top=2"); @@ -71,7 +72,7 @@ public class HttpRequestStatusLineTest { assertEquals(baseUri, line.getRawBaseUri()); assertEquals(serviceResolutionUri, line.getRawServiceResolutionUri()); } - + @Test public void testRelativeMultipleSegements() throws BatchDeserializerException { final HttpRequestStatusLine line = parse("Employee/Manager/EmployeeName?$top=2"); @@ -81,23 +82,23 @@ public class HttpRequestStatusLineTest { assertEquals(baseUri, line.getRawBaseUri()); assertEquals(serviceResolutionUri, line.getRawServiceResolutionUri()); } - + @Test public void testOtherBaseUri() throws BatchDeserializerException { parseFail("http://otherhost/odata/Employee?$top=2";, MessageKeys.INVALID_BASE_URI); } - + @Test public void testInvalidRelative() throws BatchDeserializerException { parseFail("/Employee?$top=2", MessageKeys.INVALID_URI); } - + HttpRequestStatusLine parse(final String uri) throws BatchDeserializerException { Line statusline = new Line(HttpMethod.GET.toString().toUpperCase() + SPACE + uri + SPACE + HTTP_VERSION, 0); return new HttpRequestStatusLine(statusline, baseUri, serviceResolutionUri); } - - void parseFail(final String uri, MessageKeys messageKey) { + + void parseFail(final String uri, final MessageKeys messageKey) { try { parse(uri); fail("Expceted exception"); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerBasicTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerBasicTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerBasicTest.java index b63181d..720029c 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerBasicTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerBasicTest.java @@ -58,7 +58,7 @@ public class ODataJsonDeserializerBasicTest { "}"; ODataDeserializer deserializer = OData.newInstance().createDeserializer(ODataFormat.JSON); List<URI> values = deserializer.entityReferences(new ByteArrayInputStream(payload.getBytes())) - .getEntityReferences(); + .getEntityReferences(); assertEquals(2, values.size()); assertEquals("Orders(10643)", values.get(0).toASCIIString()); assertEquals("Orders(10759)", values.get(1).toASCIIString()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java index 14919b7..5e12b7c 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java @@ -18,6 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Arrays; +import java.util.List; + import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmNamed; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; @@ -25,12 +31,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.core.edm.AbstractEdmNamed; import org.junit.Test; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class AbstractEdmNamedTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java index 71b8d2b..b97c995 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java @@ -18,6 +18,17 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmException; @@ -32,17 +43,6 @@ import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmComplexTypeImplTest { private EdmComplexType baseType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java index 471972f..b7017ec 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java @@ -262,7 +262,7 @@ public class EdmEntityContainerImplTest { @Override public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, - final String functionImportName) + final String functionImportName) throws ODataException { if (functionImportName != null) { return new CsdlFunctionImport().setName("functionImportName"); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java index a0000fb..ac36a8a 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java @@ -304,7 +304,7 @@ public class EdmEntityTypeImplTest { assertNotNull(keyPropertyRefs); assertEquals(1, keyPropertyRefs.size()); assertEquals("Id", keyPropertyRefs.get(0).getName()); - for(int i = 0; i < keyPropertyRefs.size(); i++){ + for (int i = 0; i < keyPropertyRefs.size(); i++) { assertEquals(keyPropertyRefs.get(i).getName(), typeWithBaseType.getKeyPropertyRefs().get(i).getName()); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java index 054f9d8..f87c47f 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java @@ -18,6 +18,20 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; + +import java.util.Arrays; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmException; @@ -28,26 +42,12 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmEnumTypeImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; import org.mockito.Mockito; -import java.util.Arrays; -import java.util.List; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - public class EdmEnumTest { private final EdmEnumType instance; @@ -73,34 +73,40 @@ public class EdmEnumTest { int16EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() - .setName("MyEnum") - .setFlags(false) - .setUnderlyingType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()) - .setMembers( - Arrays.asList( - new CsdlEnumMember().setName("A") - .setValue("0"), - new CsdlEnumMember().setName("B") - .setValue("1"), - new CsdlEnumMember().setName("C") - .setValue("2")))); - - int32EnumType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), - new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() + .setName("MyEnum") + .setFlags(false) + .setUnderlyingType(EdmPrimitiveTypeKind.Int16.getFullQualifiedName()) + .setMembers( + Arrays.asList( + new CsdlEnumMember().setName("A") + .setValue("0"), + new CsdlEnumMember().setName("B") + .setValue("1"), + new CsdlEnumMember().setName("C") + .setValue("2")))); + + int32EnumType = + new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") .setFlags(false) .setUnderlyingType(EdmPrimitiveTypeKind.Int32.getFullQualifiedName()) - .setMembers(Arrays - .asList(new CsdlEnumMember().setName("A").setValue("0"), new CsdlEnumMember().setName("B").setValue("1"), + .setMembers( + Arrays + .asList(new CsdlEnumMember().setName("A").setValue("0"), new CsdlEnumMember().setName("B") + .setValue("1"), new CsdlEnumMember().setName("C").setValue("2")))); - int32FlagType = new EdmEnumTypeImpl(Mockito.mock(Edm.class), - new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() + int32FlagType = + new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") .setFlags(true) .setUnderlyingType(EdmPrimitiveTypeKind.Int32.getFullQualifiedName()) - .setMembers(Arrays - .asList(new CsdlEnumMember().setName("A").setValue("2"), new CsdlEnumMember().setName("B").setValue("4"), + .setMembers( + Arrays + .asList(new CsdlEnumMember().setName("A").setValue("2"), new CsdlEnumMember().setName("B") + .setValue("4"), new CsdlEnumMember().setName("C").setValue("8")))); } @@ -264,8 +270,7 @@ public class EdmEnumTest { final EdmPrimitiveTypeKind underlyingType, final String message) { try { - @SuppressWarnings("unused") - EdmEnumType instance = new EdmEnumTypeImpl(Mockito.mock(Edm.class), + new EdmEnumTypeImpl(Mockito.mock(Edm.class), new FullQualifiedName("testNamespace", "testName"), new CsdlEnumType() .setName("MyEnum") @@ -295,8 +300,6 @@ public class EdmEnumTest { expectErrorInValueToString(int16EnumType, Integer.MAX_VALUE, null, null, null, null, null, ""); } - - protected void expectErrorInFromUriLiteral(final EdmPrimitiveType instance, final String value) { try { instance.fromUriLiteral(value); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java index 477dee4..c122cb8 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java @@ -18,6 +18,13 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; + import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmReturnType; @@ -29,13 +36,6 @@ import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - public class EdmFunctionImplTest { private EdmFunction functionImpl1; @@ -46,7 +46,7 @@ public class EdmFunctionImplTest { EdmProviderImpl provider = mock(EdmProviderImpl.class); CsdlFunction function1 = new CsdlFunction().setReturnType( - new CsdlReturnType().setType(new FullQualifiedName("Edm", "String"))); + new CsdlReturnType().setType(new FullQualifiedName("Edm", "String"))); functionImpl1 = new EdmFunctionImpl(provider, new FullQualifiedName("namespace", "name"), function1); CsdlFunction function2 = new CsdlFunction().setComposable(true); functionImpl2 = new EdmFunctionImpl(provider, new FullQualifiedName("namespace", "name"), function2); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java index 730322b..2131881 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java @@ -18,6 +18,15 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Arrays; +import java.util.Collections; + import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; @@ -29,21 +38,12 @@ import org.apache.olingo.commons.api.edm.provider.CsdlFunction; import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; import org.apache.olingo.commons.api.edm.provider.CsdlParameter; import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; import org.apache.olingo.commons.core.edm.EdmFunctionImportImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; -import java.util.Arrays; -import java.util.Collections; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmFunctionImportImplTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java index 187534b..00b2fc5 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java @@ -18,6 +18,13 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -28,13 +35,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; import org.apache.olingo.commons.core.edm.EdmKeyPropertyRefImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmKeyPropertyRefImplTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java index d6ae3a7..a5e774c 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; + import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; import org.apache.olingo.commons.core.edm.EdmMemberImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; - public class EdmMemberImplTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java index fee5673..bfab176 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java @@ -18,6 +18,18 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmType; @@ -32,18 +44,6 @@ import org.apache.olingo.commons.core.edm.EdmNavigationPropertyImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmNavigationPropertyImplTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java index d14fdba..5babbdb 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java @@ -18,6 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; @@ -34,12 +40,6 @@ import org.apache.olingo.commons.core.edm.EdmParameterImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmParameterImplTest { @Test @@ -94,7 +94,7 @@ public class EdmParameterImplTest { EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName typeName = new FullQualifiedName("ns", "definition"); CsdlTypeDefinition typeProvider = - new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); + new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); when(provider.getTypeDefinition(typeName)).thenReturn(typeProvider); CsdlParameter parameterProvider = new CsdlParameter(); parameterProvider.setType(typeName); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java index b071c27..e9f907f 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java @@ -18,6 +18,14 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -34,14 +42,6 @@ import org.apache.olingo.commons.core.edm.EdmPropertyImpl; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmPropertyImplTest { @Test @@ -99,7 +99,7 @@ public class EdmPropertyImplTest { EdmProviderImpl edm = new EdmProviderImpl(provider); final FullQualifiedName typeName = new FullQualifiedName("ns", "definition"); CsdlTypeDefinition typeProvider = - new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); + new CsdlTypeDefinition().setUnderlyingType(new FullQualifiedName("Edm", "String")); when(provider.getTypeDefinition(typeName)).thenReturn(typeProvider); CsdlProperty propertyProvider = new CsdlProperty(); propertyProvider.setType(typeName); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java index 3db70de..45d3d2b 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java @@ -18,6 +18,18 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmException; @@ -31,18 +43,6 @@ import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmProviderImplOverloadingTest { private Edm edm; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java index 089f4f0..1456c37 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java @@ -18,6 +18,18 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmComplexType; @@ -39,18 +51,6 @@ import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmProviderImplTest { private Edm edm; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java index 2d95ca7..ac36635 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java @@ -18,6 +18,13 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEnumType; @@ -28,18 +35,11 @@ import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.commons.core.edm.EdmReturnTypeImpl; +import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class EdmReturnTypeImplTest { @Test @@ -60,7 +60,7 @@ public class EdmReturnTypeImplTest { @Test public void primitiveCollectionReturnType() { CsdlReturnType providerType = new CsdlReturnType().setType( - new FullQualifiedName("Edm", "String")).setCollection(true); + new FullQualifiedName("Edm", "String")).setCollection(true); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); @@ -71,7 +71,7 @@ public class EdmReturnTypeImplTest { @Test(expected = EdmException.class) public void invalidPrimitiveType() { CsdlReturnType providerType = new CsdlReturnType().setType( - new FullQualifiedName("Edm", "wrong")).setCollection(true); + new FullQualifiedName("Edm", "wrong")).setCollection(true); EdmReturnType typeImpl = new EdmReturnTypeImpl(mock(EdmProviderImpl.class), providerType); typeImpl.getType(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java index 6dddcfc..3714046 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java @@ -265,7 +265,7 @@ public class EdmSchemaImplTest { @Override public CsdlFunctionImport getFunctionImport(final FullQualifiedName entityContainer, - final String functionImportName) + final String functionImportName) throws ODataException { throw new RuntimeException("Provider must not be called in the schema case"); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java index cf610c3..63d21f5 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java @@ -18,22 +18,22 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.commons.core.edm.EdmTypeDefinitionImpl; +import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; - public class EdmTypeDefinitionImplTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java index c440c9d..64c9744 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java @@ -18,6 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Arrays; +import java.util.List; + import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -27,12 +33,6 @@ import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.core.edm.EdmTypeImpl; import org.junit.Test; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class EdmTypeImplTest { @Test
