Removed xxxAMD.ice files, as they were no longer needed (ICE-7729)

16 files changed, 7 insertions, 1221 deletions

diff --git a/python/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 5c96a48c987..ea6b9a9832f 100755
--- a/python/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
@@ -16,7 +16,7 @@ if not slice_dir:
     print(sys.argv[0] + ': Slice directory not found.')
     sys.exit(1)
 
-Ice.loadSlice('"-I' + slice_dir + '" TestAMD.ice')
+Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
 import Test
 
 def test(b):
diff --git a/python/test/Ice/exceptions/TestAMD.ice b/python/test/Ice/exceptions/TestAMD.ice
deleted file mode 100644
index adc95dbd784..00000000000
--- a/python/test/Ice/exceptions/TestAMD.ice
+++ /dev/null
@@ -1,81 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-#include <Ice/BuiltinSequences.ice>
-
-module Test
-{
-
-interface Thrower;
-
-exception A
-{
-    int aMem;
-};
-
-exception B extends A
-{
-    int bMem;
-};
-
-exception C extends B
-{
-    int cMem;
-};
-
-exception D
-{
-    int dMem;
-};
-
-module Mod
-{
-    exception A extends ::Test::A
-    {
-        int a2Mem;
-    };
-};
-
-
-["amd"] interface Thrower
-{
-    void shutdown();
-    bool supportsUndeclaredExceptions();
-    bool supportsAssertException();
-
-    void throwAasA(int a) throws A;
-    void throwAorDasAorD(int a) throws A, D;
-    void throwBasA(int a, int b) throws A;
-    void throwCasA(int a, int b, int c) throws A;
-    void throwBasB(int a, int b) throws B;
-    void throwCasB(int a, int b, int c) throws B;
-    void throwCasC(int a, int b, int c) throws C;
-
-    void throwModA(int a, int a2) throws Mod::A;
-
-    void throwUndeclaredA(int a);
-    void throwUndeclaredB(int a, int b);
-    void throwUndeclaredC(int a, int b, int c);
-    void throwLocalException();
-    void throwNonIceException();
-    void throwAssertException();
-    Ice::ByteSeq throwMemoryLimitException(Ice::ByteSeq seq);
-
-    void throwAfterResponse();
-    void throwAfterException() throws A;
-};
-
-["amd"] interface WrongOperation
-{
-    void noSuchOperation();
-};
-
-};
diff --git a/python/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index a7cce20ca50..26375cfe2b3 100755
--- a/python/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
@@ -20,7 +20,7 @@ if not slice_dir:
     print(sys.argv[0] + ': Slice directory not found.')
     sys.exit(1)
 
-Ice.loadSlice("'-I" + slice_dir + "' TestAMD.ice")
+Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
 import Test
 
 def test(b):
diff --git a/python/test/Ice/operations/TestAMD.ice b/python/test/Ice/operations/TestAMD.ice
deleted file mode 100644
index 078fd362409..00000000000
--- a/python/test/Ice/operations/TestAMD.ice
+++ /dev/null
@@ -1,350 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-module Test
-{
-
-enum MyEnum
-{
-    enum1,
-    enum2,
-    enum3
-};
-
-interface MyClass;
-
-struct AnotherStruct
-{
-    string s;
-};
-
-struct Structure
-{
-    MyClass* p;
-    MyEnum e;
-    AnotherStruct s;
-};
-
-sequence<byte> ByteS;
-sequence<bool> BoolS;
-sequence<short> ShortS;
-sequence<int> IntS;
-sequence<long> LongS;
-sequence<float> FloatS;
-sequence<double> DoubleS;
-sequence<string> StringS;
-sequence<MyEnum> MyEnumS;
-sequence<MyClass*> MyClassS;
-
-sequence<ByteS> ByteSS;
-sequence<BoolS> BoolSS;
-sequence<ShortS> ShortSS;
-sequence<IntS> IntSS;
-sequence<LongS> LongSS;
-sequence<FloatS> FloatSS;
-sequence<DoubleS> DoubleSS;
-sequence<StringS> StringSS;
-sequence<MyEnumS> MyEnumSS;
-sequence<MyClassS> MyClassSS;
-
-sequence<StringSS> StringSSS;
-
-struct MyStruct
-{
-    int i;
-    int j;
-};
-
-dictionary<byte, bool> ByteBoolD;
-dictionary<short, int> ShortIntD;
-dictionary<long, float> LongFloatD;
-dictionary<string, string> StringStringD;
-dictionary<string, MyEnum> StringMyEnumD;
-dictionary<MyEnum, string> MyEnumStringD;
-dictionary<MyStruct, MyEnum> MyStructMyEnumD;
-
-sequence<ByteBoolD> ByteBoolDS;
-sequence<ShortIntD> ShortIntDS;
-sequence<LongFloatD> LongFloatDS;
-sequence<StringStringD> StringStringDS;
-sequence<StringMyEnumD> StringMyEnumDS;
-sequence<MyEnumStringD> MyEnumStringDS;
-sequence<MyStructMyEnumD> MyStructMyEnumDS;
-
-dictionary<byte, ByteS> ByteByteSD;
-dictionary<bool, BoolS> BoolBoolSD;
-dictionary<short, ShortS> ShortShortSD;
-dictionary<int, IntS> IntIntSD;
-dictionary<long, LongS> LongLongSD;
-dictionary<string, FloatS> StringFloatSD;
-dictionary<string, DoubleS> StringDoubleSD;
-dictionary<string, StringS> StringStringSD;
-dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
-
-["amd"] interface MyClass
-{
-    void shutdown();
-
-    void opVoid();
-
-    byte opByte(byte p1, byte p2,
-                out byte p3);
-
-    bool opBool(bool p1, bool p2,
-                out bool p3);
-
-    long opShortIntLong(short p1, int p2, long p3,
-                        out short p4, out int p5, out long p6);
-
-    double opFloatDouble(float p1, double p2,
-                         out float p3, out double p4);
-
-    string opString(string p1, string p2,
-                    out string p3);
-
-    MyEnum opMyEnum(MyEnum p1, out MyEnum p2);
-
-    MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3);
-
-    Structure opStruct(Structure p1, Structure p2,
-                       out Structure p3);
-
-    ByteS opByteS(ByteS p1, ByteS p2,
-                  out ByteS p3);
-
-    BoolS opBoolS(BoolS p1, BoolS p2,
-                  out BoolS p3);
-
-    LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3,
-                          out ::Test::ShortS p4, out IntS p5, out LongS p6);
-
-    DoubleS opFloatDoubleS(FloatS p1, DoubleS p2,
-                           out FloatS p3, out DoubleS p4);
-
-    StringS opStringS(StringS p1, StringS p2,
-                      out StringS p3);
-
-    ByteSS opByteSS(ByteSS p1, ByteSS p2,
-                    out ByteSS p3);
-
-    BoolSS opBoolSS(BoolSS p1, BoolSS p2,
-                    out BoolSS p3);
-
-    LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3,
-                            out ShortSS p4, out IntSS p5, out LongSS p6);
-
-    DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2,
-                             out FloatSS p3, out DoubleSS p4);
-
-    StringSS opStringSS(StringSS p1, StringSS p2,
-                        out StringSS p3);
-
-    StringSSS opStringSSS(StringSSS p1, StringSSS p2,
-                        out StringSSS p3);
-
-    ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2,
-                          out ByteBoolD p3);
-
-    ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2,
-                          out ShortIntD p3);
-
-    LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2,
-                            out LongFloatD p3);
-
-    StringStringD opStringStringD(StringStringD p1, StringStringD p2,
-                                  out StringStringD p3);
-
-    StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2,
-                                  out StringMyEnumD p3);
-
-    MyEnumStringD opMyEnumStringD(MyEnumStringD p1, MyEnumStringD p2,
-                                  out MyEnumStringD p3);
-
-    MyStructMyEnumD opMyStructMyEnumD(MyStructMyEnumD p1, MyStructMyEnumD p2,
-                                      out MyStructMyEnumD p3);
-
-    ByteBoolDS opByteBoolDS(ByteBoolDS p1, ByteBoolDS p2,
-                            out ByteBoolDS p3);
-
-    ShortIntDS opShortIntDS(ShortIntDS p1, ShortIntDS p2,
-                            out ShortIntDS p3);
-
-    LongFloatDS opLongFloatDS(LongFloatDS p1, LongFloatDS p2,
-                              out LongFloatDS p3);
-
-    StringStringDS opStringStringDS(StringStringDS p1, StringStringDS p2,
-                                    out StringStringDS p3);
-
-    StringMyEnumDS opStringMyEnumDS(StringMyEnumDS p1, StringMyEnumDS p2,
-                                    out StringMyEnumDS p3);
-
-    MyEnumStringDS opMyEnumStringDS(MyEnumStringDS p1, MyEnumStringDS p2,
-                                    out MyEnumStringDS p3);
-
-    MyStructMyEnumDS opMyStructMyEnumDS(MyStructMyEnumDS p1, MyStructMyEnumDS p2,
-                                        out MyStructMyEnumDS p3);
-
-    ByteByteSD opByteByteSD(ByteByteSD p1, ByteByteSD p2,
-                            out ByteByteSD p3);
-
-    BoolBoolSD opBoolBoolSD(BoolBoolSD p1, BoolBoolSD p2,
-                            out BoolBoolSD p3);
-
-    ShortShortSD opShortShortSD(ShortShortSD p1, ShortShortSD p2,
-                                out ShortShortSD p3);
-
-    IntIntSD opIntIntSD(IntIntSD p1, IntIntSD p2,
-                        out IntIntSD p3);
-
-    LongLongSD opLongLongSD(LongLongSD p1, LongLongSD p2,
-                            out LongLongSD p3);
-
-    StringFloatSD opStringFloatSD(StringFloatSD p1, StringFloatSD p2,
-                                  out StringFloatSD p3);
-
-    StringDoubleSD opStringDoubleSD(StringDoubleSD p1, StringDoubleSD p2,
-                                    out StringDoubleSD p3);
-
-    StringStringSD opStringStringSD(StringStringSD p1, StringStringSD p2,
-                                    out StringStringSD p3);
-
-    MyEnumMyEnumSD opMyEnumMyEnumSD(MyEnumMyEnumSD p1, MyEnumMyEnumSD p2,
-                                    out MyEnumMyEnumSD p3);
-
-    IntS opIntS(IntS s);
-
-    void opByteSOneway(ByteS s);
-
-    int opByteSOnewayCallCount();
-
-    StringStringD opContext();
-
-    void opDoubleMarshaling(double p1, DoubleS p2);
-
-    idempotent void opIdempotent();
-
-    ["nonmutating"] idempotent void opNonmutating();
-
-    byte opByte1(byte opByte1);
-    short opShort1(short opShort1);
-    int opInt1(int opInt1);
-    long opLong1(long opLong1);
-    float opFloat1(float opFloat1);
-    double opDouble1(double opDouble1);
-    string opString1(string opString1);
-    StringS opStringS1(StringS opStringS1);
-    ByteBoolD opByteBoolD1(ByteBoolD opByteBoolD1);
-    StringS opStringS2(StringS stringS);
-    ByteBoolD opByteBoolD2(ByteBoolD byteBoolD);
-
-    StringS opStringLiterals();
-    StringS opWStringLiterals();
-
-    ["marshaled-result"] Structure opMStruct1();
-    ["marshaled-result"] Structure opMStruct2(Structure p1, out Structure p2);
-
-    ["marshaled-result"] StringS opMSeq1();
-    ["marshaled-result"] StringS opMSeq2(StringS p1, out StringS p2);
-
-    ["marshaled-result"] StringStringD opMDict1();
-    ["marshaled-result"] StringStringD opMDict2(StringStringD p1, out StringStringD p2);
-};
-
-struct MyStruct1
-{
-    string tesT; // Same name as the enclosing module
-    MyClass myClass; // Same name as an already defined class
-    string myStruct1; // Same name as the enclosing struct
-};
-
-class MyClass1
-{
-    string tesT; // Same name as the enclosing module
-    MyClass myClass; // Same name as an already defined class
-    string myClass1; // Same name as the enclosing class
-};
-
-["amd"] interface MyDerivedClass extends MyClass
-{
-    void opDerived();
-    MyClass1 opMyClass1(MyClass1 opMyClass1);
-    MyStruct1 opMyStruct1(MyStruct1 opMyStruct1);
-};
-
-//
-// String literals
-//
-
-const string s0 = "\u005c";                           // backslash
-const string s1 = "\u0041";                           // A
-const string s2 = "\u0049\u0063\u0065";               // Ice
-const string s3 = "\u004121";                         // A21
-const string s4 = "\\u0041 \\U00000041";              // \\u0041 \\U00000041
-const string s5 = "\u00FF";                           // ÿ
-const string s6 = "\u03FF";                           // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
-const string s7 = "\u05F0";                           // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
-const string s8 = "\U00010000";                       // LINEAR B SYLLABLE B008 A (U+10000)
-const string s9 = "\U0001F34C";                       // BANANA (U+1F34C)
-const string s10 = "\u0DA7";                          // Sinhala Letter Alpapraana Ttayanna
-
-const string sw0 = "\U0000005c";                      // backslash
-const string sw1 = "\U00000041";                      // A
-const string sw2 = "\U00000049\U00000063\U00000065";  // Ice
-const string sw3 = "\U0000004121";                    // A21
-const string sw4 = "\\u0041 \\U00000041";             // \\u0041 \\U00000041
-const string sw5 = "\U000000FF";                      // ÿ
-const string sw6 = "\U000003FF";                      // GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL (U+03FF)
-const string sw7 = "\U000005F0";                      // HEBREW LIGATURE YIDDISH DOUBLE VAV (U+05F0)
-const string sw8 = "\U00010000";                      // LINEAR B SYLLABLE B008 A (U+10000)
-const string sw9 = "\U0001F34C";                      // BANANA (U+1F34C)
-const string sw10 = "\U00000DA7";                     // Sinhala Letter Alpapraana Ttayanna
-
-/**
-\'	single quote	byte 0x27 in ASCII encoding
-\"	double quote	byte 0x22 in ASCII encoding
-\?	question mark	byte 0x3f in ASCII encoding
-\\	backslash	byte 0x5c in ASCII encoding
-\a	audible bell	byte 0x07 in ASCII encoding
-\b	backspace	byte 0x08 in ASCII encoding
-\f	form feed - new page	byte 0x0c in ASCII encoding
-\n	line feed - new line	byte 0x0a in ASCII encoding
-\r	carriage return	byte 0x0d in ASCII encoding
-\t	horizontal tab	byte 0x09 in ASCII encoding
-\v	vertical tab	byte 0x0b in ASCII encoding
-**/
-
-const string ss0 = "\'\"\?\\\a\b\f\n\r\t\v\6";
-const string ss1 = "\u0027\u0022\u003f\u005c\u0007\u0008\u000c\u000a\u000d\u0009\u000b\u0006";
-const string ss2 = "\U00000027\U00000022\U0000003f\U0000005c\U00000007\U00000008\U0000000c\U0000000a\U0000000d\U00000009\U0000000b\U00000006";
-
-const string ss3 = "\\\\U\\u\\"; /* \\U\u\  */
-const string ss4 = "\\\u0041\\"; /* \A\     */
-const string ss5 = "\\u0041\\";  /* \u0041\ */
-
-//
-// Ĩ - Unicode Character 'LATIN CAPITAL LETTER I WITH TILDE' (U+0128)
-// Ÿ - Unicode Character 'LATIN CAPITAL LETTER Y WITH DIAERESIS' (U+0178)
-// ÿ - Unicode Character 'LATIN SMALL LETTER Y WITH DIAERESIS' (U+00FF)
-// Ā - Unicode Character 'LATIN CAPITAL LETTER A WITH MACRON' (U+0100)
-// ἀ - Unicode Character 'GREEK SMALL LETTER ALPHA WITH PSILI' (U+1F00)
-// 𐆔 - Unicode Character 'ROMAN DIMIDIA SEXTULA SIGN' (U+10194)
-// 𐅪 - Unicode Character 'GREEK ACROPHONIC THESPIAN ONE HUNDRED' (U+1016A)
-// 𐆘 - Unicode Character 'ROMAN SESTERTIUS SIGN' (U+10198)
-// 🍀 - Unicode Character 'FOUR LEAF CLOVER' (U+1F340)
-// 🍁 - Unicode Character 'MAPLE LEAF' (U+1F341)
-// 🍂 - Unicode Character 'FALLEN LEAF' (U+1F342)
-// 🍃 - Unicode Character 'LEAF FLUTTERING IN WIND' (U+1F343)
-//
-const string su0 = "ĨŸÿĀἀ𐆔𐅪𐆘🍀🍁🍂🍃";
-const string su1 = "\u0128\u0178\u00FF\u0100\u1F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
-const string su2 = "\U00000128\U00000178\U000000FF\U00000100\U00001F00\U00010194\U0001016A\U00010198\U0001F340\U0001F341\U0001F342\U0001F343";
-
-};
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index 67e8db9baab..91ec454acfa 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -11,7 +11,7 @@
 import os, sys, traceback
 
 import Ice
-Ice.loadSlice('TestAMD.ice')
+Ice.loadSlice('Test.ice')
 import Test
 
 class InitialI(Test.Initial):
diff --git a/python/test/Ice/optional/TestAMD.ice b/python/test/Ice/optional/TestAMD.ice
deleted file mode 100644
index 1562414e1c2..00000000000
--- a/python/test/Ice/optional/TestAMD.ice
+++ /dev/null
@@ -1,315 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-module Test
-{
-
-class OneOptional
-{
-    optional(1) int a;
-};
-
-enum MyEnum
-{
-    MyEnumMember
-};
-
-struct SmallStruct
-{
-    byte m;
-};
-
-struct FixedStruct
-{
-    int m;
-};
-
-struct VarStruct
-{
-    string m;
-};
-
-struct ClassVarStruct
-{
-    int a;
-};
-
-sequence<byte> ByteSeq;
-sequence<bool> BoolSeq;
-sequence<short> ShortSeq;
-sequence<int> IntSeq;
-sequence<long> LongSeq;
-sequence<float> FloatSeq;
-sequence<double> DoubleSeq;
-sequence<string> StringSeq;
-sequence<MyEnum> MyEnumSeq;
-sequence<SmallStruct> SmallStructSeq;
-["python:seq:tuple"] sequence<SmallStruct> SmallStructList;
-sequence<FixedStruct> FixedStructSeq;
-["python:seq:tuple"] sequence<FixedStruct> FixedStructList;
-sequence<VarStruct> VarStructSeq;
-sequence<OneOptional> OneOptionalSeq;
-sequence<OneOptional*> OneOptionalPrxSeq;
-
-sequence<byte> Serializable;
-
-dictionary<int, int> IntIntDict;
-dictionary<string, int> StringIntDict;
-dictionary<int, MyEnum> IntEnumDict;
-dictionary<int, FixedStruct> IntFixedStructDict;
-dictionary<int, VarStruct> IntVarStructDict;
-dictionary<int, OneOptional> IntOneOptionalDict;
-dictionary<int, OneOptional*> IntOneOptionalPrxDict;
-
-class MultiOptional
-{
-    optional(1) byte a;
-    optional(2) bool b;
-    optional(3) short c;
-    optional(4) int d;
-    optional(5) long e;
-    optional(6) float f;
-    optional(7) double g;
-    optional(8) string h;
-    optional(9) MyEnum i;
-    optional(10) MultiOptional* j;
-    optional(11) MultiOptional k;
-    optional(12) ByteSeq bs;
-    optional(13) StringSeq ss;
-    optional(14) IntIntDict iid;
-    optional(15) StringIntDict sid;
-    optional(16) FixedStruct fs;
-    optional(17) VarStruct vs;
-
-    optional(18) ShortSeq shs;
-    optional(19) MyEnumSeq es;
-    optional(20) FixedStructSeq fss;
-    optional(21) VarStructSeq vss;
-    optional(22) OneOptionalSeq oos;
-    optional(23) OneOptionalPrxSeq oops;
-
-    optional(24) IntEnumDict ied;
-    optional(25) IntFixedStructDict ifsd;
-    optional(26) IntVarStructDict ivsd;
-    optional(27) IntOneOptionalDict iood;
-    optional(28) IntOneOptionalPrxDict ioopd;
-
-    optional(29) BoolSeq bos;
-
-    optional(30) Serializable ser;
-};
-
-class A
-{
-    int requiredA;
-    optional(1) int ma;
-    optional(50) int mb;
-    optional(500) int mc;
-};
-
-["preserve-slice"]
-class B extends A
-{
-    int requiredB;
-    optional(10) int md;
-};
-
-class C extends B
-{
-    string ss;
-    optional(890) string ms;
-};
-
-class WD
-{
-    optional(1) int a = 5;
-    optional(2) string s = "test";
-};
-
-exception OptionalException
-{
-    bool req = false;
-    optional(1) int a = 5;
-    optional(2) string b;
-    optional(50) OneOptional o;
-};
-
-exception DerivedException extends OptionalException
-{
-    optional(600) string ss = "test";
-    optional(601) OneOptional o2;
-};
-
-exception RequiredException extends OptionalException
-{
-    string ss = "test";
-    OneOptional o2;
-};
-
-class OptionalWithCustom
-{
-    optional(1) SmallStructList l;
-    ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
-};
-
-class E
-{
-    A ae;
-};
-
-class F extends E
-{
-    optional(1) A af;
-};
-
-class G1
-{
-    string a;
-};
-
-class G2
-{
-    long a;
-};
-
-class G
-{
-    optional(1) G1 gg1Opt;
-    G2 gg2;
-    optional(0) G2 gg2Opt;
-    G1 gg1;
-};
-
-class Recursive;
-sequence<Recursive> RecursiveSeq;
-
-class Recursive
-{
-    optional(0) RecursiveSeq value;
-};
-
-["amd"]
-interface Initial
-{
-    void shutdown();
-
-    Object pingPong(Object o);
-
-    void opOptionalException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
-        throws OptionalException;
-
-    void opDerivedException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
-        throws OptionalException;
-
-    void opRequiredException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
-        throws OptionalException;
-
-    optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3);
-
-    optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3);
-
-    optional(1) short opShort(optional(2) short p1, out optional(3) short p3);
-
-    optional(1) int opInt(optional(2) int p1, out optional(3) int p3);
-
-    optional(3) long opLong(optional(1) long p1, out optional(2) long p3);
-
-    optional(1) float opFloat(optional(2) float p1, out optional(3) float p3);
-
-    optional(1) double opDouble(optional(2) double p1, out optional(3) double p3);
-
-    optional(1) string opString(optional(2) string p1, out optional(3) string p3);
-
-    optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3);
-
-    optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3);
-
-    optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3);
-
-    optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3);
-
-    optional(1) OneOptional opOneOptional(optional(2) OneOptional p1, out optional(3) OneOptional p3);
-
-    optional(1) OneOptional* opOneOptionalProxy(optional(2) OneOptional* p1, out optional(3) OneOptional* p3);
-
-    optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3);
-
-    optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3);
-
-    optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3);
-
-    optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3);
-
-    optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3);
-
-    optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3);
-
-    optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3);
-
-    optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
-
-    optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3);
-
-    optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3);
-
-    optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3);
-
-    optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3);
-
-    optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
-
-    optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);
-
-    optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);
-
-    optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3);
-
-    optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1,
-                                                        out optional(3) IntOneOptionalDict p3);
-
-    void opClassAndUnknownOptional(A p);
-
-    void sendOptionalClass(bool req, optional(1) OneOptional o);
-
-    void returnOptionalClass(bool req, out optional(1) OneOptional o);
-
-    G opG(G g);
-
-    void opVoid();
-
-    ["marshaled-result"] optional(1) SmallStruct opMStruct1();
-    ["marshaled-result"] optional(1) SmallStruct opMStruct2(optional(2) SmallStruct p1,
-                                                            out optional(3)SmallStruct p2);
-
-    ["marshaled-result"] optional(1) StringSeq opMSeq1();
-    ["marshaled-result"] optional(1) StringSeq opMSeq2(optional(2) StringSeq p1,
-                                                       out optional(3) StringSeq p2);
-
-    ["marshaled-result"] optional(1) StringIntDict opMDict1();
-    ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1,
-                                                            out optional(3) StringIntDict p2);
-
-    ["marshaled-result"] optional(1) G opMG1();
-    ["marshaled-result"] optional(1) G opMG2(optional(2) G p1, out optional(3) G p2);
-
-    bool supportsRequiredParams();
-
-    bool supportsJavaSerializable();
-
-    bool supportsCsharpSerializable();
-
-    bool supportsCppStringView();
-
-    bool supportsNullOptional();
-};
-
-};
diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index 72d6e41bc55..2f285d4fc8a 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -16,7 +16,7 @@ if not slice_dir:
     print(sys.argv[0] + ': Slice directory not found.')
     sys.exit(1)
 
-Ice.loadSlice("'-I" + slice_dir + "' TestAMD.ice")
+Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
 import Test
 
 class MyDerivedClassI(Test.MyDerivedClass):
diff --git a/python/test/Ice/proxy/TestAMD.ice b/python/test/Ice/proxy/TestAMD.ice
deleted file mode 100644
index d0312f701b1..00000000000
--- a/python/test/Ice/proxy/TestAMD.ice
+++ /dev/null
@@ -1,29 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-#include <Ice/Current.ice>
-
-module Test
-{
-
-["amd"] interface MyClass
-{
-    void shutdown();
-
-    Ice::Context getContext();
-};
-
-["amd"] interface MyDerivedClass extends MyClass
-{
-    Object* echo(Object* obj);
-};
-
-};
diff --git a/python/test/Ice/servantLocator/ServerAMD.py b/python/test/Ice/servantLocator/ServerAMD.py
index b29f6f5aa7d..faefcf9190c 100755
--- a/python/test/Ice/servantLocator/ServerAMD.py
+++ b/python/test/Ice/servantLocator/ServerAMD.py
@@ -11,7 +11,7 @@
 import os, sys, traceback, time
 
 import Ice
-Ice.loadSlice('TestAMD.ice')
+Ice.loadSlice('Test.ice')
 import Test, TestAMDI, TestActivationAMDI
 
 class TestServer(Ice.Application):
diff --git a/python/test/Ice/servantLocator/TestAMD.ice b/python/test/Ice/servantLocator/TestAMD.ice
deleted file mode 100644
index 7510f141ce1..00000000000
--- a/python/test/Ice/servantLocator/TestAMD.ice
+++ /dev/null
@@ -1,54 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-module Test
-{
-
-exception TestIntfUserException
-{
-};
-
-exception TestImpossibleException
-{
-};
-
-["amd"] interface TestIntf
-{
-    void requestFailedException();
-    void unknownUserException();
-    void unknownLocalException();
-    void unknownException();
-    void localException();
-    void userException();
-    void pythonException();
-
-    void unknownExceptionWithServantException();
-
-    string impossibleException(bool throw) throws TestImpossibleException;
-    string intfUserException(bool throw) throws TestIntfUserException, TestImpossibleException;
-
-    void asyncResponse() throws TestIntfUserException, TestImpossibleException;
-    void asyncException() throws TestIntfUserException, TestImpossibleException;
-
-    void shutdown();
-};
-
-interface TestActivation
-{
-    void activateServantLocator(bool activate);
-};
-
-local class Cookie
-{
-    ["cpp:const"] string message();
-};
-
-};
diff --git a/python/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index c4a3ab4336b..8c0513cc4e8 100755
--- a/python/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
@@ -11,7 +11,7 @@
 import os, sys, traceback
 
 import Ice
-Ice.loadSlice('-I. --all ServerPrivateAMD.ice')
+Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
 class TestI(Test.TestIntf):
diff --git a/python/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/python/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
deleted file mode 100644
index dade40f59b9..00000000000
--- a/python/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ /dev/null
@@ -1,52 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-#include <TestAMD.ice>
-
-module Test
-{
-
-exception UnknownDerived extends Base
-{
-    string ud;
-};
-
-exception UnknownIntermediate extends Base
-{
-   string ui;
-};
-
-exception UnknownMostDerived1 extends KnownIntermediate
-{
-   string umd1;
-};
-
-exception UnknownMostDerived2 extends UnknownIntermediate
-{
-   string umd2;
-};
-
-class SPreservedClass extends BaseClass
-{
-    string spc;
-};
-
-exception SPreserved1 extends KnownPreservedDerived
-{
-    BaseClass p1;
-};
-
-exception SPreserved2 extends SPreserved1
-{
-    BaseClass p2;
-};
-
-};
diff --git a/python/test/Ice/slicing/exceptions/TestAMD.ice b/python/test/Ice/slicing/exceptions/TestAMD.ice
deleted file mode 100644
index 18a20b1e0ac..00000000000
--- a/python/test/Ice/slicing/exceptions/TestAMD.ice
+++ /dev/null
@@ -1,98 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-module Test
-{
-
-exception Base
-{
-    string b;
-};
-
-exception KnownDerived extends Base
-{
-    string kd;
-};
-
-exception KnownIntermediate extends Base
-{
-    string ki;
-};
-
-exception KnownMostDerived extends KnownIntermediate
-{
-    string kmd;
-};
-
-["preserve-slice"]
-exception KnownPreserved extends Base
-{
-    string kp;
-};
-
-exception KnownPreservedDerived extends KnownPreserved
-{
-    string kpd;
-};
-
-["preserve-slice"]
-class BaseClass
-{
-    string bc;
-};
-
-["format:sliced"]
-interface Relay
-{
-    void knownPreservedAsBase() throws Base;
-    void knownPreservedAsKnownPreserved() throws KnownPreserved;
-
-    void unknownPreservedAsBase() throws Base;
-    void unknownPreservedAsKnownPreserved() throws KnownPreserved;
-};
-
-["amd", "format:sliced"]
-interface TestIntf
-{
-    void baseAsBase() throws Base;
-    void unknownDerivedAsBase() throws Base;
-    void knownDerivedAsBase() throws Base;
-    void knownDerivedAsKnownDerived() throws KnownDerived;
-
-    void unknownIntermediateAsBase() throws Base;
-    void knownIntermediateAsBase() throws Base;
-    void knownMostDerivedAsBase() throws Base;
-    void knownIntermediateAsKnownIntermediate() throws KnownIntermediate;
-    void knownMostDerivedAsKnownIntermediate() throws KnownIntermediate;
-    void knownMostDerivedAsKnownMostDerived() throws KnownMostDerived;
-
-    void unknownMostDerived1AsBase() throws Base;
-    void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate;
-    void unknownMostDerived2AsBase() throws Base;
-
-    ["format:compact"] void unknownMostDerived2AsBaseCompact() throws Base;
-
-    void knownPreservedAsBase() throws Base;
-    void knownPreservedAsKnownPreserved() throws KnownPreserved;
-
-    void relayKnownPreservedAsBase(Relay* r) throws Base;
-    void relayKnownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
-
-    void unknownPreservedAsBase() throws Base;
-    void unknownPreservedAsKnownPreserved() throws KnownPreserved;
-
-    void relayUnknownPreservedAsBase(Relay* r) throws Base;
-    void relayUnknownPreservedAsKnownPreserved(Relay* r) throws KnownPreserved;
-
-    void shutdown();
-};
-
-};
diff --git a/python/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py
index 2cdc89e5f7d..fd17c70913e 100755
--- a/python/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
@@ -11,7 +11,7 @@
 import os, sys, traceback
 
 import Ice
-Ice.loadSlice('-I. --all ServerPrivateAMD.ice')
+Ice.loadSlice('-I. --all ServerPrivate.ice')
 import Test
 
 def test(b):
diff --git a/python/test/Ice/slicing/objects/ServerPrivateAMD.ice b/python/test/Ice/slicing/objects/ServerPrivateAMD.ice
deleted file mode 100644
index 118dc768839..00000000000
--- a/python/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ /dev/null
@@ -1,67 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-#include <TestAMD.ice>
-
-module Test
-{
-
-class SBSUnknownDerived extends SBase
-{
-    string sbsud;
-};
-
-class SUnknown
-{
-    string su;
-};
-
-class D2 extends B
-{
-    string sd2;
-    B pd2;
-};
-
-class D4 extends B
-{
-    B p1;
-    B p2;
-};
-
-exception UnknownDerivedException extends BaseException
-{
-    string sude;
-    D2 pd2;
-};
-
-class MyClass
-{
-    int i;
-};
-
-class PSUnknown extends Preserved
-{
-    string psu;
-    PNode graph;
-    MyClass cl;
-};
-
-class PSUnknown2 extends Preserved
-{
-    PBase pb;
-};
-
-exception PSUnknownException extends PreservedException
-{
-    PSUnknown2 p;
-};
-
-};
diff --git a/python/test/Ice/slicing/objects/TestAMD.ice b/python/test/Ice/slicing/objects/TestAMD.ice
deleted file mode 100644
index dc034da87ab..00000000000
--- a/python/test/Ice/slicing/objects/TestAMD.ice
+++ /dev/null
@@ -1,168 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
-
-#pragma once
-
-module Test
-{
-
-class SBase
-{
-    string sb;
-};
-
-class SBSKnownDerived extends SBase
-{
-    string sbskd;
-};
-
-class B
-{
-    string sb;
-    B pb;
-};
-
-class D1 extends B
-{
-    string sd1;
-    B pd1;
-};
-
-sequence<B> BSeq;
-
-class SS1
-{
-    BSeq s;
-};
-
-class SS2
-{
-    BSeq s;
-};
-
-struct SS3
-{
-    SS1 c1;
-    SS2 c2;
-};
-
-dictionary<int, B> BDict;
-
-exception BaseException
-{
-    string sbe;
-    B pb;
-};
-
-exception DerivedException extends BaseException
-{
-    string sde;
-    D1 pd1;
-};
-
-class Forward;
-
-class PBase
-{
-    int pi;
-};
-
-sequence<PBase> PBaseSeq;
-
-["preserve-slice"]
-class Preserved extends PBase
-{
-    string ps;
-};
-
-class PDerived extends Preserved
-{
-    PBase pb;
-};
-
-["preserve-slice"]
-class PNode
-{
-    PNode next;
-};
-
-["preserve-slice"]
-exception PreservedException
-{
-};
-
-["amd", "format:sliced"]
-interface TestIntf
-{
-    Object SBaseAsObject();
-    SBase SBaseAsSBase();
-    SBase SBSKnownDerivedAsSBase();
-    SBSKnownDerived SBSKnownDerivedAsSBSKnownDerived();
-
-    SBase SBSUnknownDerivedAsSBase();
-
-    ["format:compact"] SBase SBSUnknownDerivedAsSBaseCompact();
-
-    Object SUnknownAsObject();
-    void checkSUnknown(Object o);
-
-    B oneElementCycle();
-    B twoElementCycle();
-    B D1AsB();
-    D1 D1AsD1();
-    B D2AsB();
-
-    void paramTest1(out B p1, out B p2);
-    void paramTest2(out B p2, out B p1);
-    B paramTest3(out B p1, out B p2);
-    B paramTest4(out B p);
-
-    B returnTest1(out B p1, out B p2);
-    B returnTest2(out B p2, out B p1);
-    B returnTest3(B p1, B p2);
-
-    SS3 sequenceTest(SS1 p1, SS2 p2);
-
-    BDict dictionaryTest(BDict bin, out BDict bout);
-
-    PBase exchangePBase(PBase pb);
-
-    Preserved PBSUnknownAsPreserved();
-    void checkPBSUnknown(Preserved p);
-
-    Preserved PBSUnknownAsPreservedWithGraph();
-    void checkPBSUnknownWithGraph(Preserved p);
-
-    Preserved PBSUnknown2AsPreservedWithGraph();
-    void checkPBSUnknown2WithGraph(Preserved p);
-
-    PNode exchangePNode(PNode pn);
-
-    void throwBaseAsBase() throws BaseException;
-    void throwDerivedAsBase() throws BaseException;
-    void throwDerivedAsDerived() throws DerivedException;
-    void throwUnknownDerivedAsBase() throws BaseException;
-    void throwPreservedException() throws PreservedException;
-
-    void useForward(out Forward f); /* Use of forward-declared class to verify that code is generated correctly. */
-
-    void shutdown();
-};
-
-class Hidden
-{
-    Forward f;
-};
-
-class Forward
-{
-    Hidden h;
-};
-
-};