You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:34 UTC
[12/59] [abbrv] Cleanup of core
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
index 018dfc2..7fdab60 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -39,369 +39,390 @@ import org.apache.olingo.odata2.core.edm.Uint7;
import org.junit.Test;
/**
- *
+ *
* Differences to ABAP Parser
- * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed
+ * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed
*
*/
public class TestAbapCompatibility extends TestBase {
@Test
- public void abapTestParameterPromotion() //copy of ABAP method test_parameter_promotion
+ public void abapTestParameterPromotion() // copy of ABAP method test_parameter_promotion
{
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
- //lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
+ // lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
GetPTF("X'1234567890ABCDEF'").aEdmType(EdmBinary.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
GetPTF("true").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- //lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
GetPTF("1").aEdmType(Bit.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- //lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
GetPTF("0").aEdmType(Bit.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
- ///lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
+ // /lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
GetPTF("123").aEdmType(Uint7.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
- //lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
+ // lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
GetPTF("130").aEdmType(EdmByte.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
- //lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
+ // lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type = lo_simple_type ).
GetPTF("datetime'2011-07-31T23:30:59'").aEdmType(EdmDateTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
- //lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
+ // lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'` io_expected_type =
+ // lo_simple_type ).
GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aEdmType(EdmDateTimeOffset.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
- //lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
GetPTF("1.1M").aEdmType(EdmDecimal.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
GetPTF("1.1D").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
GetPTF("1.1E+02D").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
- //lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
+ // lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'` io_expected_type =
+ // lo_simple_type ).
GetPTF("guid'12345678-1234-1234-1234-123456789012'").aEdmType(EdmGuid.getInstance());
- //-->FLOAT not available on OData library for JAVA
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
- //lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
- //GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
+ // -->FLOAT not available on OData library for JAVA
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ // GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
- //lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
+ // lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
GetPTF("12345").aEdmType(EdmInt16.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
GetPTF("1234512345").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
- //lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
+ // lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
GetPTF("12345L").aEdmType(EdmInt64.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
- //lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
+ // lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
GetPTF("-12").aEdmType(EdmSByte.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
- //lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
GetPTF("1.1F").aEdmType(EdmSingle.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
- //lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
+ // lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
GetPTF("'TEST'").aEdmType(EdmString.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
GetPTF("time'PT19H02M01S'").aEdmType(EdmTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type = lo_simple_type ).
GetPTF("time'PT23H14M33S'").aEdmType(EdmTime.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
GetPTF("1.1D add 1").aEdmType(EdmDouble.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- //lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
GetPTF("1 add 1.1D").aEdmType(EdmDouble.getInstance());
- //"lcl_helper=>veri_type( iv_expression = `null` io_expected_type = /IWCOR/cl_DS_edm_simple_type=>null( ) ).
+ // "lcl_helper=>veri_type( iv_expression = `null` io_expected_type = /IWCOR/cl_DS_edm_simple_type=>null( ) ).
GetPTF("null").aEdmType(EdmNull.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'` io_expected_type =
+ // lo_simple_type ).
GetPTF("time'PT19H02M01S' eq time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- //lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'` io_expected_type =
+ // lo_simple_type ).
GetPTF("time'PT19H02M01S' lt time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
// lcl_helper=>veri_type( iv_expression = `hour(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
GetPTF("hour(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
+ // ).
GetPTF("minute(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
+ // ).
GetPTF("second(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("hour(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("minute(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
GetPTF("second(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("hour(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("minute(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
- //lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- //lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type = lo_simple_type ).
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
+ // lo_simple_type ).
GetPTF("second(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
}
@Test
- public void abapTestOrderByParser() //copy of ABAP method test_orderby_parser
+ public void abapTestOrderByParser() // copy of ABAP method test_orderby_parser
{
- //lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return lower asc
+ // lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return lower asc
GetPTO("a").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
GetPTO("a,b").aSerialized("{oc({o(a, asc)},{o(b, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c asc)})}' ).
GetPTO("a,b,c").aSerialized("{oc({o(a, asc)},{o(b, asc)},{o(c, asc)})}");
- //see comment of class
- ////lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
- //GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
+ // see comment of class
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
+ // GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
+ // lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
GetPTO("a asc").aSerialized("{oc({o(a, asc)})}");
- //lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
- //-->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
+ // lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
+ // -->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
- //// iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
- //GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
+ // // iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
+ // GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
- //// iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
- //GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
+ // // iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
+ // GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
- //see comment of class (case sensitive)
- ////lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
- //// iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
- //GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
+ // // iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
+ // GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
- //lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
- // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
+ // lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
+ // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
GetPTO("concat( 'Start_' , starttime ) desc").aSerialized("{oc({o({concat('Start_',starttime)}, desc)})}");
}
@Test
- public void abapTestFilterParser() { //copy of ABAP method test_filter_parser
- //lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
+ public void abapTestFilterParser() { // copy of ABAP method test_filter_parser
+ // lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
GetPTF("W/X").aSerialized("{W/X}");
- //lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
GetPTF("W/X eq TEST").aSerialized("{{W/X} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
GetPTF("ABC eq W/X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
GetPTF("ABC eq W / X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- //lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
GetPTF("W/X/Y/Z").aSerialized("{{{W/X}/Y}/Z}");
- //lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
GetPTF("X").aSerialized("X");
- //lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
+ // lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
GetPTF("-X").aSerialized("{- X}");
- //lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
GetPTF("not X").aSerialized("{not X}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
GetPTF("X mul Y").aSerialized("{X mul Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
GetPTF("X div Y").aSerialized("{X div Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
GetPTF("X mod Y").aSerialized("{X mod Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
GetPTF("X add Y").aSerialized("{X add Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
GetPTF("X sub Y").aSerialized("{X sub Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
GetPTF("X lt Y").aSerialized("{X lt Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
GetPTF("X gt Y").aSerialized("{X gt Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
GetPTF("X le Y").aSerialized("{X le Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
GetPTF("X ge Y").aSerialized("{X ge Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
GetPTF("X eq Y").aSerialized("{X eq Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
GetPTF("X ne Y").aSerialized("{X ne Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
GetPTF("X and Y").aSerialized("{X and Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
GetPTF("X or Y").aSerialized("{X or Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
GetPTF("X mul Y eq Z").aSerialized("{{X mul Y} eq Z}");
- //lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
GetPTF("X eq Y mul Z").aSerialized("{X eq {Y mul Z}}");
- //lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
GetPTF("(X)").aSerialized("X");
- //lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
GetPTF("(X or Y)").aSerialized("{X or Y}");
- //lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
GetPTF("X mul (Y eq Z)").aSerialized("{X mul {Y eq Z}}");
- //lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
+ // lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
GetPTF("(X eq Y) mul Z").aSerialized("{{X eq Y} mul Z}");
- //lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
GetPTF("indexof(X,Y)").aSerialized("{indexof(X,Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
GetPTF("concat(X, Y)").aSerialized("{concat(X,Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected = '{concat(X,Y,Z,1,2,3)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected = '{concat(X,Y,Z,1,2,3)}' ).
GetPTF("concat(X,Y,Z, 1,2,3)").aSerialized("{concat(X,Y,Z,1,2,3)}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c} eq d}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c} eq d}' ).
GetPTF("a eq b eq c eq d").aSerialized("{{{a eq b} eq c} eq d}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c mul d}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c mul d}}' ).
GetPTF("a mul b eq c mul d").aSerialized("{{a mul b} eq {c mul d}}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a mul {concat(X,Y,Z)}} eq {c mul d}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a mul
+ // {concat(X,Y,Z)}} eq {c mul d}}' ).
GetPTF("a mul concat(X,Y,Z) eq c mul d").aSerialized("{{a mul {concat(X,Y,Z)}} eq {c mul d}}");
- //lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected = '{{a mul {{concat(X,Y,Z)} eq c}} mul d}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected = '{{a mul
+ // {{concat(X,Y,Z)} eq c}} mul d}' ).
GetPTF("a mul (concat(X,Y,Z) eq c) mul d").aSerialized("{{a mul {{concat(X,Y,Z)} eq c}} mul d}");
- //lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
+ // lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
GetPTF("- not X").aSerialized("{- {not X}}");
- //=>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
+ // =>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
GetPTF("concat(-X,Y)").aSerialized("{concat({- X},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not X},Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not X},Y)}' ).
GetPTF("concat(not X,Y)").aSerialized("{concat({not X},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not X}},Y)}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not X}},Y)}' ).
GetPTF("concat(- not X,Y)").aSerialized("{concat({- {not X}},Y)}");
- //lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({- X},Y)}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({- X},Y)}}' ).
GetPTF("not concat(-X,Y)").aSerialized("{not {concat({- X},Y)}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not {concat({- X},Y)}}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not {concat({-
+ // X},Y)}}}' ).
GetPTF("a eq not concat(-X,Y)").aSerialized("{a eq {not {concat({- X},Y)}}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq b} or {{c eq d} and {e eq f}}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq b} or {{c eq d}
+ // and {e eq f}}}' ).
GetPTF("a eq b or c eq d and e eq f").aSerialized("{{a eq b} or {{c eq d} and {e eq f}}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq b} and {c eq d}} or {e eq f}}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq b} and {c eq
+ // d}} or {e eq f}}' ).
GetPTF("a eq b and c eq d or e eq f").aSerialized("{{{a eq b} and {c eq d}} or {e eq f}}");
- //lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
+ // lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
GetPTF("a eq 1.1E+02D").aSerialized("{a eq 1.1E+02D}");
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `concat('a' 'b')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
- //iv_expected_msg = 'Invalid parameter for function ''concat''' ).
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('a' 'b')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
+ // iv_expected_msg = 'Invalid parameter for function ''concat''' ).
GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `concat('125')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
- //iv_expected_msg = 'Too few parameters for function ''concat''' ).
- GetPTF("concat('125')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
-
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `indexof('a','b','c')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
- //iv_expected_msg = 'Too many parameters for function ''indexof''' ).
- GetPTF("indexof('a','b','c')").aExMsgText("No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
-
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `replace('aBa','B','CCC')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
- //iv_expected_msg = `Invalid function 'replace' detected` ).
- //-->see test method abapMethodRleplaceNotAllowed()
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('125')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
+ // iv_expected_msg = 'Too few parameters for function ''concat''' ).
+ GetPTF("concat('125')")
+ .aExMsgText(
+ "No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the " +
+ "specified arguments. Method \"concat\" requires 2 or more arguments.");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `indexof('a','b','c')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
+ // iv_expected_msg = 'Too many parameters for function ''indexof''' ).
+ GetPTF("indexof('a','b','c')")
+ .aExMsgText(
+ "No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with " +
+ "the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `replace('aBa','B','CCC')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
+ // iv_expected_msg = `Invalid function 'replace' detected` ).
+ // -->see test method abapMethodRleplaceNotAllowed()
}
@Test
- public void abapMethodRleplaceNotAllowed() //copy of ABAP method test_filter_parser
+ public void abapMethodRleplaceNotAllowed() // copy of ABAP method test_filter_parser
{
- //Filter method is NOT allowed
- //lcl_helper=>veri_expression_ex(
- //iv_expression = `replace('aBa','B','CCC')`
- //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
- //iv_expected_msg = `Invalid function 'replace' detected` ).
-
- //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=replace('aBa','B','CCC')
- //-->Unknown function 'replace' at position 0.
- GetPTF("replace('aBa','B','CCC')").aExMsgText("Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
+ // Filter method is NOT allowed
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `replace('aBa','B','CCC')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
+ // iv_expected_msg = `Invalid function 'replace' detected` ).
+
+ // http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=replace('aBa','B','CCC')
+ // -->Unknown function 'replace' at position 0.
+ GetPTF("replace('aBa','B','CCC')").aExMsgText(
+ "Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
index c3d4ce9..5a636fe 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
index b4a27a0..7605409 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
index bb335f7..fda21b3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.uri.expression;
@@ -84,7 +84,8 @@ public class TestParser extends TestBase {
GetPTO("sven desc, test desc").aSerialized("{oc({o(sven, desc)},{o(test, desc)})}");
GetPTO("'sven', 77").order(1).aSortOrder(SortOrder.asc);
- GetPTO("'sven', 77 desc").root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance()).root().order(1).aSortOrder(SortOrder.desc).aExpr().aEdmType(Uint7.getInstance());
+ GetPTO("'sven', 77 desc").root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance())
+ .root().order(1).aSortOrder(SortOrder.desc).aExpr().aEdmType(Uint7.getInstance());
}
@@ -129,13 +130,18 @@ public class TestParser extends TestBase {
@Test
public void testProperties() {
// GetPTF("sven").aSerialized("sven").aKind(ExpressionKind.PROPERTY);
- GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven1").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven2");
+ GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}").aKind(ExpressionKind.BINARY).root().left().aKind(
+ ExpressionKind.PROPERTY).aUriLiteral("sven1").root().right().aKind(ExpressionKind.PROPERTY)
+ .aUriLiteral("sven2");
}
@Test
public void testDeepProperties() {
GetPTF("a/b").aSerialized("{a/b}").aKind(ExpressionKind.MEMBER);
- GetPTF("a/b/c").aSerialized("{{a/b}/c}").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a").root().left().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("c");
+ GetPTF("a/b/c").aSerialized("{{a/b}/c}").root().aKind(ExpressionKind.MEMBER).root().left().aKind(
+ ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a").root().left()
+ .right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b").root().right().aKind(ExpressionKind.PROPERTY)
+ .aUriLiteral("c");
}
@Test
@@ -157,14 +163,21 @@ public class TestParser extends TestBase {
GetPTF(edmEtAllTypes, "'text' eq String").root().aKind(ExpressionKind.BINARY);
- GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right().aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
+ GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right()
+ .aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(
+ complexStringType);
- GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
+ GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(
+ ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(
+ complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(
+ complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY)
+ .aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
EdmProperty boolean_ = (EdmProperty) edmEtAllTypes.getProperty("Boolean");
EdmSimpleType boolean_Type = (EdmSimpleType) boolean_.getType();
- GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(boolean_).aEdmType(boolean_Type);
+ GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(
+ boolean_).aEdmType(boolean_Type);
} catch (EdmException e) {
fail("Error in testPropertiesWithEdm:" + e.getLocalizedMessage());
@@ -195,7 +208,8 @@ public class TestParser extends TestBase {
GetPTF("1d add 2d").aSerialized("{1d add 2d}");
GetPTF("1d div 2d").aSerialized("{1d div 2d}");
- GetPTF("1d add 2d").aSerialized("{1d add 2d}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.LITERAL).root().right().aKind(ExpressionKind.LITERAL);
+ GetPTF("1d add 2d").aSerialized("{1d add 2d}").aKind(ExpressionKind.BINARY).root().left().aKind(
+ ExpressionKind.LITERAL).root().right().aKind(ExpressionKind.LITERAL);
}
@@ -344,11 +358,15 @@ public class TestParser extends TestBase {
GetPTF("123").aUriLiteral("123").aKind(ExpressionKind.LITERAL).aEdmType(Uint7Inst);
- GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
- GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
+ GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL)
+ .aEdmType(datetimeInst);
+ GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL)
+ .aEdmType(datetimeInst);
- GetPTF("datetimeoffset'2009-12-26T21:23:38Z'").aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
- GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+ GetPTF("datetimeoffset'2009-12-26T21:23:38Z'").aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'").aKind(
+ ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+ GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'").aKind(
+ ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
GetPTF("4.5m").aUriLiteral("4.5m").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
GetPTF("4.5M").aUriLiteral("4.5M").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
@@ -356,7 +374,8 @@ public class TestParser extends TestBase {
GetPTF("4.5d").aUriLiteral("4.5d").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
GetPTF("4.5D").aUriLiteral("4.5D").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
- GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
+ GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'")
+ .aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
GetPTF("-32768").aUriLiteral("-32768").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
GetPTF("3276").aUriLiteral("3276").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);