Renamed Slice/keyword test to clash, and added identifier-clash test

6 files changed, 75 insertions, 0 deletions

diff --git a/csharp/test/Slice/escape/Clash.ice b/csharp/test/Slice/escape/Clash.ice
new file mode 100644
index 00000000000..d76879d764f
--- /dev/null
+++ b/csharp/test/Slice/escape/Clash.ice
@@ -0,0 +1,73 @@
+// **********************************************************************
+//
+// 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"]]
+
+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/csharp/test/Slice/keyword/Client.cs b/csharp/test/Slice/escape/Client.cs
index 6c0d00d12c1..6c0d00d12c1 100644
--- a/csharp/test/Slice/keyword/Client.cs
+++ b/csharp/test/Slice/escape/Client.cs
diff --git a/csharp/test/Slice/keyword/Key.ice b/csharp/test/Slice/escape/Key.ice
index fb93dc2b69d..fb93dc2b69d 100644
--- a/csharp/test/Slice/keyword/Key.ice
+++ b/csharp/test/Slice/escape/Key.ice
diff --git a/csharp/test/Slice/keyword/msbuild/client/client.csproj b/csharp/test/Slice/escape/msbuild/client/client.csproj
index a63639ba14b..8f5498084a2 100644
--- a/csharp/test/Slice/keyword/msbuild/client/client.csproj
+++ b/csharp/test/Slice/escape/msbuild/client/client.csproj
@@ -38,9 +38,11 @@
     <Compile Include="..\..\Client.cs">
       <Link>Client.cs</Link>
     </Compile>
+    <Compile Include="generated\Clash.cs" />
     <Compile Include="generated\Key.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Clash.ice" />
     <None Include="client.exe.config" />
     <None Include="..\..\Key.ice">
       <Link>Key.ice</Link>
diff --git a/csharp/test/Slice/keyword/msbuild/client/client.exe.config b/csharp/test/Slice/escape/msbuild/client/client.exe.config
index e515fe2bc95..e515fe2bc95 100644
--- a/csharp/test/Slice/keyword/msbuild/client/client.exe.config
+++ b/csharp/test/Slice/escape/msbuild/client/client.exe.config
diff --git a/csharp/test/Slice/keyword/msbuild/client/packages.config b/csharp/test/Slice/escape/msbuild/client/packages.config
index e92a6bdbb98..e92a6bdbb98 100644
--- a/csharp/test/Slice/keyword/msbuild/client/packages.config
+++ b/csharp/test/Slice/escape/msbuild/client/packages.config