summaryrefslogtreecommitdiff
path: root/java-compat
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-01-06 16:42:35 -0500
committerBernard Normier <bernard@zeroc.com>2017-01-06 16:42:35 -0500
commitd7778df86336f3becb561463ae24243ccfe02164 (patch)
tree4e437427a9d333b44665fbdecea239350c800522 /java-compat
parentTest script fix, don't terminate the process twice (diff)
downloadice-d7778df86336f3becb561463ae24243ccfe02164.tar.bz2
ice-d7778df86336f3becb561463ae24243ccfe02164.tar.xz
ice-d7778df86336f3becb561463ae24243ccfe02164.zip
Renamed Slice/keyword test to clash, and added identifier-clash test
Diffstat (limited to 'java-compat')
-rw-r--r--java-compat/test/slice.gradle2
-rw-r--r--java-compat/test/src/main/java/test/Slice/escape/Clash.ice74
-rw-r--r--java-compat/test/src/main/java/test/Slice/escape/Client.java (renamed from java-compat/test/src/main/java/test/Slice/keyword/Client.java)44
-rw-r--r--java-compat/test/src/main/java/test/Slice/escape/Key.ice (renamed from java-compat/test/src/main/java/test/Slice/keyword/Key.ice)2
4 files changed, 98 insertions, 24 deletions
diff --git a/java-compat/test/slice.gradle b/java-compat/test/slice.gradle
index a4056c562c8..c19abe8e119 100644
--- a/java-compat/test/slice.gradle
+++ b/java-compat/test/slice.gradle
@@ -59,7 +59,7 @@ task testSliceTask {
'IceBox/admin/*.ice',
'IceBox/configuration/*.ice',
'IceSSL/configuration/*.ice',
- 'Slice/keyword/*.ice',
+ 'Slice/escape/*.ice',
'Slice/macros/*.ice',
'Slice/structure/*.ice'])
}
diff --git a/java-compat/test/src/main/java/test/Slice/escape/Clash.ice b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice
new file mode 100644
index 00000000000..83e70db266c
--- /dev/null
+++ b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice
@@ -0,0 +1,74 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+[["underscore"]]
+[["java:package:test.Slice.escape"]]
+
+module Clash
+{
+
+interface Intf
+{
+ void context();
+ void current();
+ void response();
+ void typeId();
+ void del();
+ void cookie();
+ void sync();
+ void inS();
+ void istr();
+ void obj();
+
+ void op(string context, string current, string response, string ex, string sent, string cookie,
+ string sync, string result, string istr, string ostr, optional(1) string proxy, optional(2) int obj);
+ void opOut(out string context, out string current, out string response, out string ex,
+ out string sent, out string cookie, out string sync, out string result, out string istr,
+ out string ostr, out optional(1) string proxy, out optional(2) int obj);
+};
+
+class Cls
+{
+ Intf* s;
+ string context;
+ int current;
+ short response;
+ int typeId;
+ short del;
+ optional(1) short cookie;
+ string ex;
+ int result;
+ string istr;
+ string ostr;
+ string inS;
+ string in;
+ string proxy;
+ int obj;
+ int getCookie;
+ string clone;
+};
+
+struct St
+{
+ string v;
+ short istr;
+ int ostr;
+ int rhs;
+ string hashCode;
+ int clone;
+};
+
+exception Ex
+{
+ short istr;
+ int ostr;
+ string cause;
+};
+
+};
diff --git a/java-compat/test/src/main/java/test/Slice/keyword/Client.java b/java-compat/test/src/main/java/test/Slice/escape/Client.java
index 240286789a0..998291e1583 100644
--- a/java-compat/test/src/main/java/test/Slice/keyword/Client.java
+++ b/java-compat/test/src/main/java/test/Slice/escape/Client.java
@@ -7,27 +7,27 @@
//
// **********************************************************************
-package test.Slice.keyword;
-import test.Slice.keyword._abstract.AMD_catch_checkedCast;
-import test.Slice.keyword._abstract._assert;
-import test.Slice.keyword._abstract._break;
-import test.Slice.keyword._abstract._catch;
-import test.Slice.keyword._abstract._catchDisp;
-import test.Slice.keyword._abstract._default;
-import test.Slice.keyword._abstract._defaultDisp;
-import test.Slice.keyword._abstract._else;
-import test.Slice.keyword._abstract._finalize;
-import test.Slice.keyword._abstract._hashCode;
-import test.Slice.keyword._abstract._import;
-import test.Slice.keyword._abstract._new;
-import test.Slice.keyword._abstract._switch;
-import test.Slice.keyword._abstract.catchPrx;
-import test.Slice.keyword._abstract.defaultPrx;
-import test.Slice.keyword._abstract.defaultPrxHelper;
-import test.Slice.keyword._abstract.elsePrx;
-import test.Slice.keyword._abstract.finalizePrx;
-import test.Slice.keyword._abstract.forHolder;
-import test.Slice.keyword._abstract.gotoHolder;
+package test.Slice.escape;
+import test.Slice.escape._abstract.AMD_catch_checkedCast;
+import test.Slice.escape._abstract._assert;
+import test.Slice.escape._abstract._break;
+import test.Slice.escape._abstract._catch;
+import test.Slice.escape._abstract._catchDisp;
+import test.Slice.escape._abstract._default;
+import test.Slice.escape._abstract._defaultDisp;
+import test.Slice.escape._abstract._else;
+import test.Slice.escape._abstract._finalize;
+import test.Slice.escape._abstract._hashCode;
+import test.Slice.escape._abstract._import;
+import test.Slice.escape._abstract._new;
+import test.Slice.escape._abstract._switch;
+import test.Slice.escape._abstract.catchPrx;
+import test.Slice.escape._abstract.defaultPrx;
+import test.Slice.escape._abstract.defaultPrxHelper;
+import test.Slice.escape._abstract.elsePrx;
+import test.Slice.escape._abstract.finalizePrx;
+import test.Slice.escape._abstract.forHolder;
+import test.Slice.escape._abstract.gotoHolder;
public class Client
{
@@ -189,7 +189,7 @@ public class Client
Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
Ice.InitializationData initData = new Ice.InitializationData();
initData.properties = Ice.Util.createProperties(argsH);
- initData.properties.setProperty("Ice.Package._abstract", "test.Slice.keyword");
+ initData.properties.setProperty("Ice.Package._abstract", "test.Slice.escape");
initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
initData.properties.setProperty("TestAdapter.Endpoints", "default");
diff --git a/java-compat/test/src/main/java/test/Slice/keyword/Key.ice b/java-compat/test/src/main/java/test/Slice/escape/Key.ice
index 2f0e36ae3f0..9548461f36d 100644
--- a/java-compat/test/src/main/java/test/Slice/keyword/Key.ice
+++ b/java-compat/test/src/main/java/test/Slice/escape/Key.ice
@@ -9,7 +9,7 @@
#pragma once
-[["java:package:test.Slice.keyword"]]
+[["java:package:test.Slice.escape"]]
module abstract
{