THRIFT-3435 Separate package for fullcamel thrift Client: Java Test Patch: Tom Lee
This closes #708 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9caf6d63 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9caf6d63 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9caf6d63 Branch: refs/heads/master Commit: 9caf6d63c6d582c407a692cf9be923586006499c Parents: ba3fe86 Author: Tom Lee <[email protected]> Authored: Fri Nov 20 16:28:44 2015 -0800 Committer: Nobuaki Sukegawa <[email protected]> Committed: Sun Dec 6 10:11:19 2015 +0900 ---------------------------------------------------------------------- lib/java/build.xml | 2 +- .../test/org/apache/thrift/TestFullCamel.java | 4 +-- test/FullCamelTest.thrift | 38 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/9caf6d63/lib/java/build.xml ---------------------------------------------------------------------- diff --git a/lib/java/build.xml b/lib/java/build.xml index 679142e..2dc7ebe 100755 --- a/lib/java/build.xml +++ b/lib/java/build.xml @@ -279,7 +279,7 @@ <arg line="-p ${genfullcamel}"/> </exec> <exec executable="../../compiler/cpp/thrift" failonerror="true"> - <arg line="--gen java:hashcode,fullcamel -out ${genfullcamel} ${test.thrift.home}/DenseLinkingTest.thrift"/> + <arg line="--gen java:hashcode,fullcamel -out ${genfullcamel} ${test.thrift.home}/FullCamelTest.thrift"/> </exec> <exec executable="mkdir" failonerror="true"> <arg line="-p ${genreuse}"/> http://git-wip-us.apache.org/repos/asf/thrift/blob/9caf6d63/lib/java/test/org/apache/thrift/TestFullCamel.java ---------------------------------------------------------------------- diff --git a/lib/java/test/org/apache/thrift/TestFullCamel.java b/lib/java/test/org/apache/thrift/TestFullCamel.java index 1681fb8..fc98898 100644 --- a/lib/java/test/org/apache/thrift/TestFullCamel.java +++ b/lib/java/test/org/apache/thrift/TestFullCamel.java @@ -26,8 +26,8 @@ import junit.framework.TestCase; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TType; -import thrift.test.OneOfEachZZ; -import thrift.test.UnderscoreSrv; +import thrift.test.fullcamel.OneOfEachZZ; +import thrift.test.fullcamel.UnderscoreSrv; // Sanity check for the code generated by 'fullcamel'. // http://git-wip-us.apache.org/repos/asf/thrift/blob/9caf6d63/test/FullCamelTest.thrift ---------------------------------------------------------------------- diff --git a/test/FullCamelTest.thrift b/test/FullCamelTest.thrift new file mode 100644 index 0000000..cee4dd8 --- /dev/null +++ b/test/FullCamelTest.thrift @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +namespace java thrift.test.fullcamel + +struct OneOfEachZZ { + 1: bool im_true, + 2: bool im_false, + 3: byte a_bite, + 4: i16 integer16, + 5: i32 integer32, + 6: i64 integer64, + 7: double double_precision, + 8: string some_characters, + 9: string zomg_unicode, + 10: bool what_who, +} + +service UnderscoreSrv { + i64 some_rpc_call(1: string message) +} +
