summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAustin Henriksen <austin@zeroc.com>2019-10-30 05:14:29 -0400
committerJoe George <joe@zeroc.com>2021-02-01 16:46:35 -0500
commit452f57976a135c8b72fc8d8f580d5d50618c0cae (patch)
tree0233eedd3cdc380126fd613b04b8b468beb289c0 /java
parentRemove IcePatch2 (#602) (diff)
downloadice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.bz2
ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.xz
ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.zip
Remove checksum support (#607)
* Removed checksum sources from swift mapping project file. * Removed checksum tests from Python. * Removed checksum from Python mapping. * Removed checksum tests from PHP mapping. * Removed checksum support from PHP mapping. * Removed checksum sources from MATLAB project file. * Removed checksum option from slice2x manpages. * Removed checksum sources from JavaScript mapping. * Removed checksum tests from Java mapping. * Removed outdated checksum metadata from Java mapping. * Removed checksum support from Java mapping. * Removed checksum tests from csharp. * Removed checksum support from csharp mapping. * Removed checksum tests from cpp * Removed checksum support from IceBox. * Removed checksum support from IceStorm. * Removed Slice checksum support from IceGrid. * Fixed broken filters file for Slice VS project. * Removed checksum support from cpp mapping. * Removed checksum support from Slice definitions. * Removed checksum support from cpp98 mapping.
Diffstat (limited to 'java')
-rw-r--r--java/src/Glacier2/build.gradle1
-rw-r--r--java/src/IceBox/build.gradle1
-rw-r--r--java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java6
-rw-r--r--java/src/IceGrid/build.gradle1
-rw-r--r--java/src/IceStorm/build.gradle1
-rw-r--r--java/test/slice.gradle12
-rw-r--r--java/test/src/main/java/test/Ice/checksum/AllTests.java88
-rw-r--r--java/test/src/main/java/test/Ice/checksum/ChecksumI.java26
-rw-r--r--java/test/src/main/java/test/Ice/checksum/Client.java21
-rw-r--r--java/test/src/main/java/test/Ice/checksum/Server.java23
-rw-r--r--java/test/src/main/java/test/Ice/checksum/Test.ice20
-rw-r--r--java/test/src/main/java/test/Ice/checksum/TestServer.ice21
-rw-r--r--java/test/src/main/java/test/Ice/checksum/Types.ice610
-rw-r--r--java/test/src/main/java/test/Ice/checksum/TypesServer.ice609
14 files changed, 1 insertions, 1439 deletions
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index a95264612a7..f4b141c5e34 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -16,7 +16,6 @@ sourceSets {
slice {
java {
- args = "--checksum com.zeroc.Glacier2.SliceChecksums"
files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
}
}
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index a6cc45677cd..22c742cda5c 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -8,7 +8,6 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio
slice {
java {
- args = "--checksum com.zeroc.IceBox.SliceChecksums"
files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
}
}
diff --git a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java
index b9fde6d039a..06c4cacb207 100644
--- a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java
@@ -50,12 +50,6 @@ public class ServiceManagerI implements ServiceManager
}
@Override
- public java.util.Map<String, String> getSliceChecksums(Current current)
- {
- return SliceChecksums.checksums;
- }
-
- @Override
public void
startService(String name, Current current)
throws AlreadyStartedException, NoSuchServiceException
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 3d30b1bf6a7..8ad6d8ffdb0 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -7,7 +7,6 @@ project.ext.description = "Locate, deploy, and manage Ice servers"
slice {
java {
- args = "--checksum com.zeroc.IceGrid.SliceChecksums"
files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
}
}
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 1cee467433e..cbff612fa23 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -16,7 +16,6 @@ sourceSets {
slice {
java {
- args = "--checksum com.zeroc.IceStorm.SliceChecksums"
files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
}
}
diff --git a/java/test/slice.gradle b/java/test/slice.gradle
index 432ba4d3f53..288290d483d 100644
--- a/java/test/slice.gradle
+++ b/java/test/slice.gradle
@@ -61,20 +61,10 @@ task testSliceTask {
'Slice/structure/*.ice'])
}
set2 {
- args = "--checksum test.Ice.checksum.Test.SliceChecksums"
- files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice',
- 'Ice/checksum/Types.ice'])
- }
- set3 {
- args = "--checksum test.Ice.checksum.server.Test.SliceChecksums"
- files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice',
- 'Ice/checksum/TypesServer.ice'])
- }
- set4 {
include = ["${testDir}/Ice/packagemd"]
files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice'])
}
- set5 {
+ set3 {
args = "--impl"
files = fileTree(dir: testDir, includes:['Ice/impl/Test.ice',
'Ice/impl/TestAMD.ice'])
diff --git a/java/test/src/main/java/test/Ice/checksum/AllTests.java b/java/test/src/main/java/test/Ice/checksum/AllTests.java
deleted file mode 100644
index ebe505599b7..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/AllTests.java
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-package test.Ice.checksum;
-
-import java.io.PrintWriter;
-import test.Ice.checksum.Test.*;
-
-public class AllTests
-{
- private static void test(boolean b)
- {
- if(!b)
- {
- throw new RuntimeException();
- }
- }
-
- public static ChecksumPrx allTests(test.TestHelper helper, boolean collocated)
- {
- com.zeroc.Ice.Communicator communicator = helper.communicator();
- PrintWriter out = helper.getWriter();
-
- String ref = "test:" + helper.getTestEndpoint(0);
- com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref);
- test(base != null);
-
- ChecksumPrx checksum = ChecksumPrx.checkedCast(base);
- test(checksum != null);
-
- //
- // Verify that no checksums are present for local types.
- //
- out.print("testing checksums... ");
- out.flush();
- for(java.util.Map.Entry<String, String> p : SliceChecksums.checksums.entrySet())
- {
- String key = p.getKey();
- int pos = key.indexOf("Local");
- test(pos == -1);
- }
-
- //
- // Get server's Slice checksums.
- //
- java.util.Map<String, String> d = checksum.getSliceChecksums();
-
- //
- // Compare the checksums. For a type FooN whose name ends in an integer N,
- // we assume that the server's type does not change for N = 1, and does
- // change for N > 1.
- //
- java.util.regex.Pattern patt = java.util.regex.Pattern.compile("\\d+");
- for(java.util.Map.Entry<String, String> p : d.entrySet())
- {
- int n = 0;
- String key = p.getKey();
- java.util.regex.Matcher m = patt.matcher(key);
- if(m.find())
- {
- try
- {
- n = Integer.parseInt(key.substring(m.start(), m.end()));
- }
- catch(NumberFormatException ex)
- {
- test(false);
- }
- }
-
- String value = SliceChecksums.checksums.get(key);
- test(value != null);
-
- if(n <= 1)
- {
- test(value.equals(p.getValue()));
- }
- else
- {
- test(!value.equals(p.getValue()));
- }
- }
- out.println("ok");
-
- return checksum;
- }
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/ChecksumI.java b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
deleted file mode 100644
index 14f78ee5ca9..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/ChecksumI.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-package test.Ice.checksum;
-
-import test.Ice.checksum.server.Test.*;
-
-public final class ChecksumI implements Checksum
-{
- public ChecksumI()
- {
- }
-
- @Override
- public java.util.Map<String, String> getSliceChecksums(com.zeroc.Ice.Current current)
- {
- return SliceChecksums.checksums;
- }
-
- @Override
- public void shutdown(com.zeroc.Ice.Current current)
- {
- current.adapter.getCommunicator().shutdown();
- }
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java
deleted file mode 100644
index 75b1ccf5b81..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/Client.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-package test.Ice.checksum;
-
-import test.Ice.checksum.Test.ChecksumPrx;
-
-public class Client extends test.TestHelper
-{
- public void run(String[] args)
- {
- com.zeroc.Ice.Properties properties = createTestProperties(args);
- properties.setProperty("Ice.Package.Test", "test.Ice.checksum");
- try(com.zeroc.Ice.Communicator communicator = initialize(properties))
- {
- ChecksumPrx checksum = AllTests.allTests(this, false);
- checksum.shutdown();
- }
- }
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java
deleted file mode 100644
index e30afed1b90..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/Server.java
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-package test.Ice.checksum;
-
-public class Server extends test.TestHelper
-{
- public void run(String[] args)
- {
- com.zeroc.Ice.Properties properties = createTestProperties(args);
- properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server");
- try(com.zeroc.Ice.Communicator communicator = initialize(properties))
- {
- communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
- com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
- adapter.add(new ChecksumI(), com.zeroc.Ice.Util.stringToIdentity("test"));
- adapter.activate();
- serverReady();
- communicator.waitForShutdown();
- }
- }
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice
deleted file mode 100644
index f3e116d2577..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/Test.ice
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-#include <Ice/SliceChecksumDict.ice>
-
-[["java:package:test.Ice.checksum"]]
-module Test
-{
-
-interface Checksum
-{
- idempotent Ice::SliceChecksumDict getSliceChecksums();
-
- void shutdown();
-}
-
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice
deleted file mode 100644
index 3ef0e593a88..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/TestServer.ice
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-#include <Ice/SliceChecksumDict.ice>
-
-[["java:package:test.Ice.checksum.server"]] // For classes with operations
-
-module Test
-{
-
-interface Checksum
-{
- idempotent Ice::SliceChecksumDict getSliceChecksums();
-
- void shutdown();
-}
-
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice
deleted file mode 100644
index 7ecbd2940de..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/Types.ice
+++ /dev/null
@@ -1,610 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-[["java:package:test.Ice.checksum"]]
-module Test
-{
-
-//
-// TEST: Same
-//
-const int IntConst1 = 100;
-
-//
-// TEST: Value changed
-//
-const int IntConst2 = 100;
-
-//
-// TEST: Type changed
-//
-const int IntConst3 = 100;
-
-//
-// TEST: Same
-//
-enum Enum1 { Enum11, Enum12, Enum13 }
-
-//
-// TEST: Add enumerator
-//
-enum Enum2 { Enum21, Enum22, Enum23 }
-
-//
-// TEST: Remove enumerator
-//
-enum Enum3 { Enum31, Enum32, Enum33 }
-
-//
-// TEST: Change to a different type
-//
-enum Enum4 { Enum41, Enum42, Enum43 }
-
-//
-// TEST: Enum with explicit values.
-//
-enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }
-
-//
-// TEST: Enum with same explicit values, different order.
-//
-enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 }
-
-//
-// TEST: Enum with different explicit values.
-//
-enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3}
-
-//
-// TEST: Enum with explicit values, removed enumerator.
-//
-enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3}
-
-//
-// TEST: Same
-//
-sequence<int> Sequence1;
-
-//
-// TEST: Change sequence type
-//
-sequence<int> Sequence2;
-
-//
-// TEST: Change to a different type
-//
-sequence<int> Sequence3;
-
-//
-// TEST: Same
-//
-dictionary<string, int> Dictionary1;
-
-//
-// TEST: Change key type
-//
-dictionary<string, int> Dictionary2;
-
-//
-// TEST: Change value type
-//
-dictionary<string, int> Dictionary3;
-
-//
-// TEST: Change to a different type
-//
-dictionary<string, int> Dictionary4;
-
-//
-// TEST: Same
-//
-struct Struct1
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Add member
-//
-struct Struct2
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Change member type
-//
-struct Struct3
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Remove member
-//
-struct Struct4
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Change to a different type
-//
-struct Struct5
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Same
-//
-interface Interface1
-{
-}
-
-//
-// TEST: Change interface to class
-//
-interface Interface2
-{
-}
-
-//
-// TEST: Add base interface
-//
-interface Interface3
-{
-}
-
-//
-// TEST: Add operation
-//
-interface Interface4
-{
-}
-
-//
-// TEST: Same
-//
-class EmptyClass1
-{
-}
-
-//
-// TEST: Add data member
-//
-class EmptyClass2
-{
-}
-
-//
-// TEST: Add operation
-//
-class EmptyClass3
-{
-}
-
-//
-// TEST: Add base class
-//
-class EmptyClass4
-{
-}
-
-//
-// TEST: Add interface
-//
-class EmptyClass5
-{
-}
-
-//
-// TEST: Same
-//
-class SimpleClass1
-{
- string str;
- float f;
-}
-
-//
-// TEST: Add operation
-//
-class SimpleClass2
-{
- string str;
- float f;
-}
-
-//
-// TEST: Rename member
-//
-class SimpleClass3
-{
- string str;
- float f;
-}
-
-//
-// TEST: Add member
-//
-class SimpleClass4
-{
- string str;
- float f;
-}
-
-//
-// TEST: Remove member
-//
-class SimpleClass5
-{
- string str;
- float f;
-}
-
-//
-// TEST: Reorder members
-//
-class SimpleClass6
-{
- string str;
- float f;
-}
-
-//
-// TEST: Change member type
-//
-class SimpleClass7
-{
- string str;
- float f;
-}
-
-//
-// TEST: Same
-//
-exception Exception1
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Add member
-//
-exception Exception2
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Change member type
-//
-exception Exception3
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Remove member
-//
-exception Exception4
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Add base exception
-//
-exception Exception5
-{
-}
-
-//
-// TEST: Change to a different type
-//
-exception Exception6
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Exception with optional members.
-//
-exception OptionalEx0
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Exception with optional members, different order, same tags.
-//
-exception OptionalEx1
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Exception with different optional members.
-//
-exception OptionalEx2
-{
- string firstName;
- string secondName;
- optional(1) string emailAddress;
-}
-
-//
-// TEST: Exception with different optional members.
-//
-exception OptionalEx3
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Exception with optional members using different tags.
-//
-exception OptionalEx4
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Same
-//
-interface BaseInterface1
-{
- void baseOp1();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Change return type
-//
-interface BaseInterface2
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add parameter
-//
-interface BaseInterface3
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add exception
-//
-interface BaseInterface4
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Change out parameter to in parameter
-//
-interface BaseInterface5
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Remove parameter
-//
-interface BaseInterface6
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Remove exception
-//
-interface BaseInterface7
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Remove operation
-//
-interface BaseInterface8
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add base interface
-//
-interface BaseInterface9
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Class with compact id
-//
-class Compact1(1)
-{
- int id;
-}
-
-//
-// TEST: Derived from class with compact id
-//
-class Derived1 extends Compact1
-{
-}
-
-//
-// TEST: Same class names but different compact id
-//
-class Compact2(2)
-{
- int id;
-}
-
-//
-// TEST: Class with optional members.
-//
-class Optional0
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Class with optional members, different order, same tags.
-//
-class Optional1
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Class with different optional members.
-//
-class Optional2
-{
- string firstName;
- string secondName;
- optional(1) string emailAddress;
-}
-
-//
-// TEST: Class with different optional members.
-//
-class Optional3
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Class with optional members using different tags.
-//
-class Optional4
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Interface with optional parameters.
-//
-interface OptionalParameters0
-{
- void op1(string firstName, optional(1) string secondName,
- optional(2) string emailAddress);
-}
-
-//
-// TEST: Interface with optional parameters, different order.
-//
-interface OptionalParameters1
-{
- void op1(string firstName, optional(1) string secondName,
- optional(2) string emailAddress);
-}
-
-//
-// TEST: Interface with optional parameters, different tags.
-//
-interface OptionalParameters2
-{
- void op1(string firstName, optional(1) string emailAddress,
- optional(2) string secondName);
-}
-
-//
-// TEST: Interface with different optional parameters.
-//
-interface OptionalParameters3
-{
- void op1(string firstName, optional(1) string emailAddress,
- string secondName);
-}
-
-//
-// TEST: Interface with optional return type.
-//
-interface OptionalReturn0
-{
- optional(1) int op();
-}
-
-//
-// TEST: Interface that changes optional return type.
-//
-interface OptionalReturn2
-{
- optional(1) int op();
-}
-
-//
-// TEST: Local
-//
-local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }
-
-//
-// TEST: Local
-//
-local sequence<string> LocalSequence;
-
-//
-// TEST: Local
-//
-local dictionary<string, string> LocalDictionary;
-
-//
-// TEST: Local
-//
-local struct LocalStruct
-{
- string str;
-}
-
-//
-// TEST: Local
-//
-local class LocalClass
-{
-}
-
-}
diff --git a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
deleted file mode 100644
index ff3a082ce27..00000000000
--- a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice
+++ /dev/null
@@ -1,609 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#pragma once
-
-[["java:package:test.Ice.checksum.server"]]
-[["suppress-warning:deprecated"]]
-
-module Test
-{
-
-//
-// TEST: Same
-//
-const int IntConst1 = 100;
-
-//
-// TEST: Value changed
-//
-const int IntConst2 = 1000;
-
-//
-// TEST: Type changed
-//
-const short IntConst3 = 100;
-
-//
-// TEST: Same
-//
-enum Enum1 { Enum11, Enum12, Enum13 }
-
-//
-// TEST: Add enumerator
-//
-enum Enum2 { Enum21, Enum22, Enum23, Enum24 }
-
-//
-// TEST: Remove enumerator
-//
-enum Enum3 { Enum32, Enum33 }
-
-//
-// TEST: Enum with explicit values.
-//
-enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 }
-
-//
-// TEST: Enum with same explicit values, different order.
-//
-enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 }
-
-//
-// TEST: Enum with different explicit values.
-//
-enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 }
-
-//
-// TEST: Enum with explicit values, removed enumerator.
-//
-enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2}
-
-//
-// TEST: Change to a different type
-//
-class Enum4 {}
-
-//
-// TEST: Same
-//
-sequence<int> Sequence1;
-
-//
-// TEST: Change sequence type
-//
-sequence<short> Sequence2;
-
-//
-// TEST: Change to a different type
-//
-class Sequence3 {}
-
-//
-// TEST: Same
-//
-dictionary<string, int> Dictionary1;
-
-//
-// TEST: Change key type
-//
-dictionary<long, int> Dictionary2;
-
-//
-// TEST: Change value type
-//
-dictionary<string, bool> Dictionary3;
-
-//
-// TEST: Change to a different type
-//
-class Dictionary4 {}
-
-//
-// TEST: Same
-//
-struct Struct1
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Add member
-//
-struct Struct2
-{
- string str;
- bool b;
- float f;
-}
-
-//
-// TEST: Change member type
-//
-struct Struct3
-{
- string str;
- double b;
-}
-
-//
-// TEST: Remove member
-//
-struct Struct4
-{
- bool b;
-}
-
-//
-// TEST: Change to a different type
-//
-class Struct5 {}
-
-//
-// TEST: Same
-//
-interface Interface1
-{
-}
-
-//
-// TEST: Change interface to class
-//
-class Interface2
-{
-}
-
-//
-// TEST: Add base interface
-//
-interface Interface3 extends Interface1
-{
-}
-
-//
-// TEST: Add operation
-//
-interface Interface4
-{
- void opInterface4();
-}
-
-//
-// TEST: Same
-//
-class EmptyClass1
-{
-}
-
-//
-// TEST: Add data member
-//
-class EmptyClass2
-{
- double d;
-}
-
-//
-// TEST: Add operation
-//
-class EmptyClass3
-{
- void newOp();
-}
-
-//
-// TEST: Add base class
-//
-class EmptyClass4 extends EmptyClass1
-{
-}
-
-//
-// TEST: Add interface
-//
-class EmptyClass5 implements Interface1
-{
-}
-
-//
-// TEST: Same
-//
-class SimpleClass1
-{
- string str;
- float f;
-}
-
-//
-// TEST: Add operation
-//
-class SimpleClass2
-{
- string str;
- float f;
- void newOp();
-}
-
-//
-// TEST: Rename member
-//
-class SimpleClass3
-{
- string str;
- float g;
-}
-
-//
-// TEST: Add member
-//
-class SimpleClass4
-{
- string str;
- float f;
- bool b;
-}
-
-//
-// TEST: Remove member
-//
-class SimpleClass5
-{
- string str;
-}
-
-//
-// TEST: Reorder members
-//
-class SimpleClass6
-{
- float f;
- string str;
-}
-
-//
-// TEST: Change member type
-//
-class SimpleClass7
-{
- string str;
- double f;
-}
-
-//
-// TEST: Same
-//
-exception Exception1
-{
- string str;
- bool b;
-}
-
-//
-// TEST: Add member
-//
-exception Exception2
-{
- string str;
- bool b;
- float f;
-}
-
-//
-// TEST: Change member type
-//
-exception Exception3
-{
- string str;
- double b;
-}
-
-//
-// TEST: Remove member
-//
-exception Exception4
-{
- bool b;
-}
-
-//
-// TEST: Add base exception
-//
-exception Exception5 extends Exception1
-{
-}
-
-//
-// TEST: Change to a different type
-//
-class Exception6 {}
-
-//
-// TEST: Exception with optional members.
-//
-exception OptionalEx0
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Exception with optional members, different order, same tags.
-//
-exception OptionalEx1
-{
- string firstName;
- optional(2) string emailAddress;
- optional(1) string secondName;
-}
-
-//
-// TEST: Exception with different optional members.
-//
-exception OptionalEx2
-{
- string firstName;
- optional(1) string secondName;
- string emailAddress;
-}
-
-//
-// TEST: Exception with different optional members.
-//
-exception OptionalEx3
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
- optional(3) string phoneNumber;
-}
-
-//
-// TEST: Exception with optional members using different tags.
-//
-exception OptionalEx4
-{
- string firstName;
- optional(2) string secondName;
- optional(1) string emailAddress;
-}
-
-//
-// TEST: Same
-//
-interface BaseInterface1
-{
- void baseOp1();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Change return type
-//
-interface BaseInterface2
-{
- int baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add parameter
-//
-interface BaseInterface3
-{
- void baseOp(Object o);
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add exception
-//
-interface BaseInterface4
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1, Exception2;
-}
-
-//
-// TEST: Change out parameter to in parameter
-//
-interface BaseInterface5
-{
- void baseOp();
- void baseOp2(int i, string s) throws Exception1;
-}
-
-//
-// TEST: Remove parameter
-//
-interface BaseInterface6
-{
- void baseOp();
- void baseOp2(out string s) throws Exception1;
-}
-
-//
-// TEST: Remove exception
-//
-interface BaseInterface7
-{
- void baseOp();
- void baseOp2(int i, out string s);
-}
-
-//
-// TEST: Remove operation
-//
-interface BaseInterface8
-{
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Add base class
-//
-interface BaseInterface9 extends Interface1
-{
- void baseOp();
- void baseOp2(int i, out string s) throws Exception1;
-}
-
-//
-// TEST: Class with compact id
-//
-class Compact1(1)
-{
- int id;
-}
-
-//
-// TEST: Derived from class with compact id
-//
-class Derived1 extends Compact1
-{
-}
-
-//
-// TEST: Same class names but different compact id
-//
-class Compact2(3)
-{
- int id;
-}
-
-//
-// TEST: Class with optional members.
-//
-class Optional0
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
-}
-
-//
-// TEST: Class with optional members, different order, same tags.
-//
-class Optional1
-{
- string firstName;
- optional(2) string emailAddress;
- optional(1) string secondName;
-}
-
-//
-// TEST: Class with different optional members.
-//
-class Optional2
-{
- string firstName;
- optional(1) string secondName;
- string emailAddress;
-}
-
-//
-// TEST: Class with different optional members.
-//
-class Optional3
-{
- string firstName;
- optional(1) string secondName;
- optional(2) string emailAddress;
- optional(3) string phoneNumber;
-}
-
-//
-// TEST: Class with optional members using different tags.
-//
-class Optional4
-{
- string firstName;
- optional(2) string secondName;
- optional(1) string emailAddress;
-}
-
-//
-// TEST: Interface with optional parameters.
-//
-interface OptionalParameters0
-{
- void op1(string firstName, optional(1) string secondName,
- optional(2) string emailAddress);
-}
-
-//
-// TEST: Interface with optional parameters, different order.
-//
-interface OptionalParameters1
-{
- void op1(string firstName, optional(2) string emailAddress,
- optional(1) string secondName);
-}
-
-//
-// TEST: Interface with optional parameters, different tags.
-//
-interface OptionalParameters2
-{
- void op1(string firstName, optional(2) string emailAddress,
- optional(1) string secondName);
-}
-
-//
-// TEST: Interface with different optional parameters.
-//
-interface OptionalParameters3
-{
- void op1(string firstName, string emailAddress,
- optional(1) string secondName);
-}
-
-//
-// TEST: Interface with optional return type.
-//
-interface OptionalReturn0
-{
- optional(1) int op();
-}
-
-//
-// TEST: Interface that changes optional return type.
-//
-interface OptionalReturn2
-{
- int op();
-}
-
-//
-// TEST: Local
-//
-local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 }
-
-//
-// TEST: Local
-//
-local sequence<string> LocalSequence;
-
-//
-// TEST: Local
-//
-local dictionary<string, string> LocalDictionary;
-
-//
-// TEST: Local
-//
-local struct LocalStruct
-{
- string str;
-}
-
-//
-// TEST: Local
-//
-local class LocalClass
-{
-}
-
-}