INTEGRATION: CWS jsc14 (1.3.40); FILE MERGED

2006/10/25 13:51:07 jsc 1.3.40.1: #i69727# adapt and simplify tests

2 files changed, 94 insertions, 213 deletions

diff --git a/idlc/test/parser/published.tests b/idlc/test/parser/published.tests
index 9f73867aa..07b18d769 100644
--- a/idlc/test/parser/published.tests
+++ b/idlc/test/parser/published.tests
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: published.tests,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-07 18:19:07 $
+#   last change: $Author: kz $ $Date: 2006-11-06 14:42:27 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -23,7 +23,7 @@
 #
 #     This library is distributed in the hope that it will be useful,
 #     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
 #     Lesser General Public License for more details.
 #
 #     You should have received a copy of the GNU Lesser General Public
@@ -34,20 +34,18 @@
 #*************************************************************************
 
 EXPECT SUCCESS "published.tests 1":
-module com { module sun { module star { module uno {
 published enum Enum { VALUE };
 published struct Struct1 { long member; };
 published struct Struct2<T> { T member; };
-published exception Exception {};
-published interface XInterface {};
+published exception E1 {};
+published interface I1 {};
 published typedef long Typedef;
 published const long Constant = 1;
 published constants Constants { const long Constant = 1; };
-published service Service1: XInterface {};
-published service Service2 { interface XInterface; };
-published singleton Singleton1: XInterface;
+published service Service1: I1 {};
+published service Service2 { interface I1; };
+published singleton Singleton1: I1;
 published singleton Singleton2 { service Service2; };
-}; }; }; };
 
 
 EXPECT FAILURE "published.tests 2":
@@ -63,31 +61,23 @@ published module m {};
 
 
 EXPECT SUCCESS "published.tests 5":
-module com { module sun { module star { module uno {
-interface XInterface;
-interface XInterface {};
-}; }; }; };
+interface I1;
+interface I1 {};
 
 
 EXPECT SUCCESS "published.tests 6":
-module com { module sun { module star { module uno {
-interface XInterface;
-published interface XInterface {};
-}; }; }; };
+interface I1;
+published interface I1 {};
 
 
 EXPECT FAILURE "published.tests 7":
-module com { module sun { module star { module uno {
-published interface XInterface;
-interface XInterface {};
-}; }; }; };
+published interface I1;
+interface I1 {};
 
 
 EXPECT SUCCESS "published.tests 8":
-module com { module sun { module star { module uno {
-published interface XInterface;
-published interface XInterface {};
-}; }; }; };
+published interface I1;
+published interface I1 {};
 
 
 EXPECT SUCCESS "published.tests 9":
@@ -215,72 +205,56 @@ published exception Exception { E m; };
 
 
 EXPECT SUCCESS "published.tests 29":
-module com { module sun { module star { module uno {
-interface XInterface {};
-interface I2: XInterface {};
-}; }; }; };
+interface I1 {};
+interface I2: I1 {};
 
 
 EXPECT FAILURE "published.tests 30":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published interface I2: XInterface {};
-}; }; }; };
+interface I1 {};
+published interface I2: I1 {};
 
 
 EXPECT SUCCESS "published.tests 31":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-interface I2: XInterface {};
-}; }; }; };
+published interface I1 {};
+interface I2: I1 {};
 
 
 EXPECT SUCCESS "published.tests 32":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published interface I2: XInterface {};
-}; }; }; };
+published interface I1 {};
+published interface I2: I1 {};
 
 
 EXPECT SUCCESS "published.tests 33":
 enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { [attribute] E m; };
-}; }; }; };
+interface I1 { [attribute] E m; };
 
 
 EXPECT FAILURE "published.tests 34":
 enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { [attribute] E m; };
-}; }; }; };
+published interface I1 { [attribute] E m; };
 
 
 EXPECT SUCCESS "published.tests 35":
 published enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { [attribute] E m; };
-}; }; }; };
+interface I1 { [attribute] E m; };
 
 
 EXPECT SUCCESS "published.tests 36":
 published enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { [attribute] E m; };
-}; }; }; };
+published interface I1 { [attribute] E m; };
 
 
 EXPECT SUCCESS "published.tests 36a.1":
 module com { module sun { module star { module uno {
 exception Exception {};
-interface XInterface { [attribute] long m { get raises (Exception); }; };
+interface I1 { [attribute] long m { get raises (Exception); }; };
 }; }; }; };
 
 
 EXPECT FAILURE "published.tests 36a.2":
 module com { module sun { module star { module uno {
 exception Exception {};
-published interface XInterface {
+published interface I1 {
 	[attribute] long m { get raises (Exception); }; };
 }; }; }; };
 
@@ -288,156 +262,104 @@ published interface XInterface {
 EXPECT SUCCESS "published.tests 36a.3":
 module com { module sun { module star { module uno {
 published exception Exception {};
-interface XInterface { [attribute] long m { get raises (Exception); }; };
+interface I1 { [attribute] long m { get raises (Exception); }; };
 }; }; }; };
 
 
 EXPECT SUCCESS "published.tests 36a.4":
 module com { module sun { module star { module uno {
 published exception Exception {};
-published interface XInterface {
+published interface I1 {
 	 [attribute] long m { get raises (Exception); }; };
 }; }; }; };
 
 
 EXPECT SUCCESS "published.tests 37":
 enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { E f(); };
-}; }; }; };
+interface I1 { E f(); };
 
 
 EXPECT FAILURE "published.tests 38":
 enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { E f(); };
-}; }; }; };
+published interface I1 { E f(); };
 
 
 EXPECT SUCCESS "published.tests 39":
 published enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { E f(); };
-}; }; }; };
+interface I1 { E f(); };
 
 
 EXPECT SUCCESS "published.tests 40":
 published enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { E f(); };
-}; }; }; };
+published interface I1 { E f(); };
 
 
 EXPECT SUCCESS "published.tests 41":
 enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { void f([in] E p); };
-}; }; }; };
+interface I1 { void f([in] E p); };
 
 
 EXPECT FAILURE "published.tests 42":
 enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { void f([in] E p); };
-}; }; }; };
+published interface I1 { void f([in] E p); };
 
 
 EXPECT SUCCESS "published.tests 43":
 published enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface { void f([in] E p); };
-}; }; }; };
+interface I1 { void f([in] E p); };
 
 
 EXPECT SUCCESS "published.tests 44":
 published enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface { void f([in] E p); };
-}; }; }; };
+published interface I1 { void f([in] E p); };
 
 
 EXPECT SUCCESS "published.tests 45":
 module com { module sun { module star { module uno {
 exception Exception {};
-interface XInterface { void f() raises (Exception); };
+interface I1 { void f() raises (Exception); };
 }; }; }; };
 
 
 EXPECT FAILURE "published.tests 46":
 module com { module sun { module star { module uno {
 exception Exception {};
-published interface XInterface { void f() raises (Exception); };
+published interface I1 { void f() raises (Exception); };
 }; }; }; };
 
 
 EXPECT SUCCESS "published.tests 47":
 module com { module sun { module star { module uno {
 published exception Exception {};
-interface XInterface { void f() raises (Exception); };
+interface I1 { void f() raises (Exception); };
 }; }; }; };
 
 
 EXPECT SUCCESS "published.tests 48":
 module com { module sun { module star { module uno {
 published exception Exception {};
-published interface XInterface { void f() raises (Exception); };
+published interface I1 { void f() raises (Exception); };
 }; }; }; };
 
 
 EXPECT SUCCESS "published.tests 49":
-module com { module sun { module star { module uno {
-interface XInterface {};
-interface I2 { interface XInterface; };
-}; }; }; };
+interface I1 {};
+interface I2 { interface I1; };
 
 
 EXPECT FAILURE "published.tests 50":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published interface I2 { interface XInterface; };
-}; }; }; };
+interface I1 {};
+published interface I2 { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 51":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-interface I2 { interface XInterface; };
-}; }; }; };
+published interface I1 {};
+interface I2 { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 52":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published interface I2 { interface XInterface; };
-}; }; }; };
-
-
-EXPECT SUCCESS "published.tests 53":
-module com { module sun { module star { module uno {
-interface XInterface {};
-interface I2 {};
-}; }; }; };
-
-
-EXPECT FAILURE "published.tests 54":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published interface I2 {};
-}; }; }; };
-
-
-EXPECT SUCCESS "published.tests 55":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-interface I2 {};
-}; }; }; };
-
-
-EXPECT SUCCESS "published.tests 56":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published interface I2 {};
-}; }; }; };
+published interface I1 {};
+published interface I2 { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 57":
@@ -643,106 +565,82 @@ published service S2 { service S1; };
 
 
 EXPECT SUCCESS "published.tests 95":
-module com { module sun { module star { module uno {
-interface XInterface {};
-service S { interface XInterface; };
-}; }; }; };
+interface I1 {};
+service S { interface I1; };
 
 
 EXPECT FAILURE "published.tests 96":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published service S { interface XInterface; };
-}; }; }; };
+interface I1 {};
+published service S { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 97":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-service S { interface XInterface; };
-}; }; }; };
+published interface I1 {};
+service S { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 98":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published service S { interface XInterface; };
-}; }; }; };
+published interface I1 {};
+published service S { interface I1; };
 
 
 EXPECT SUCCESS "published.tests 99":
-module com { module sun { module star { module uno {
-interface XInterface {};
-service S: XInterface;
-}; }; }; };
+interface I1 {};
+service S: I1;
 
 
 EXPECT FAILURE "published.tests 100":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published service S: XInterface;
-}; }; }; };
+interface I1 {};
+published service S: I1;
 
 
 EXPECT SUCCESS "published.tests 101":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-service S: XInterface;
-}; }; }; };
+published interface I1 {};
+service S: I1;
 
 
 EXPECT SUCCESS "published.tests 102":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published service S: XInterface;
-}; }; }; };
+published interface I1 {};
+published service S: I1;
 
 
 EXPECT SUCCESS "published.tests 103":
 enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface {};
-service S: XInterface {
+interface I1 {};
+service S: I1 {
 	f([in] E p);
 };
-}; }; }; };
 
 
 EXPECT FAILURE "published.tests 104":
 enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published service S: XInterface {
+published interface I1 {};
+published service S: I1 {
 	f([in] E p);
 };
-}; }; }; };
 
 
 EXPECT SUCCESS "published.tests 105":
 published enum E { V };
-module com { module sun { module star { module uno {
-interface XInterface {};
-service S: XInterface {
+interface I1 {};
+service S: I1 {
 	f([in] E p);
 };
-}; }; }; };
 
 
 EXPECT SUCCESS "published.tests 106":
 published enum E { V };
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published service S: XInterface {
+published interface I1 {};
+published service S: I1 {
 	f([in] E p);
 };
-}; }; }; };
 
 
 EXPECT SUCCESS "published.tests 107":
 module com { module sun { module star { module uno {
 exception Exception {};
-interface XInterface {};
-service S: XInterface {
+interface I1 {};
+service S: I1 {
 	f() raises (Exception);
 };
 }; }; }; };
@@ -751,8 +649,8 @@ service S: XInterface {
 EXPECT FAILURE "published.tests 108":
 module com { module sun { module star { module uno {
 exception Exception {};
-published interface XInterface {};
-published service S: XInterface {
+published interface I1 {};
+published service S: I1 {
 	f() raises (Exception);
 };
 }; }; }; };
@@ -761,8 +659,8 @@ published service S: XInterface {
 EXPECT SUCCESS "published.tests 109":
 module com { module sun { module star { module uno {
 published exception Exception {};
-interface XInterface {};
-service S: XInterface {
+interface I1 {};
+service S: I1 {
 	f() raises (Exception);
 };
 }; }; }; };
@@ -771,8 +669,8 @@ service S: XInterface {
 EXPECT SUCCESS "published.tests 110":
 module com { module sun { module star { module uno {
 published exception Exception {};
-published interface XInterface {};
-published service S: XInterface {
+published interface I1 {};
+published service S: I1 {
 	f() raises (Exception);
 };
 }; }; }; };
@@ -799,28 +697,20 @@ published singleton S2 { service S1; };
 
 
 EXPECT SUCCESS "published.tests 115":
-module com { module sun { module star { module uno {
-interface XInterface {};
-singleton S: XInterface;
-}; }; }; };
+interface I1 {};
+singleton S: I1;
 
 
 EXPECT FAILURE "published.tests 116":
-module com { module sun { module star { module uno {
-interface XInterface {};
-published singleton S: XInterface;
-}; }; }; };
+interface I1 {};
+published singleton S: I1;
 
 
 EXPECT SUCCESS "published.tests 117":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-singleton S: XInterface;
-}; }; }; };
+published interface I1 {};
+singleton S: I1;
 
 
 EXPECT SUCCESS "published.tests 118":
-module com { module sun { module star { module uno {
-published interface XInterface {};
-published singleton S: XInterface;
-}; }; }; };
+published interface I1 {};
+published singleton S: I1;
diff --git a/idlc/test/parser/typedef.tests b/idlc/test/parser/typedef.tests
index 3a41883c7..5f66f0408 100644
--- a/idlc/test/parser/typedef.tests
+++ b/idlc/test/parser/typedef.tests
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: typedef.tests,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-07 18:19:49 $
+#   last change: $Author: kz $ $Date: 2006-11-06 14:42:41 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -47,9 +47,6 @@ struct Struct: T2 { long member2; };
 
 
 EXPECT SUCCESS "typedef.tests 3":
-module com { module sun { module star { module uno {
-    interface XInterface { void acquire(); };
-}; }; }; };
 interface Interface1 {};
 typedef Interface1 T1;
 typedef T1 T2;
@@ -57,9 +54,6 @@ interface Interface2: T2 {};
 
 
 EXPECT FAILURE "typedef.tests 4":
-module com { module sun { module star { module uno {
-    interface XInterface { void acquire(); };
-}; }; }; };
 interface Interface1;
 typedef Interface1 T1;
 typedef T1 T2;
@@ -67,9 +61,6 @@ interface Interface2: T2 {};
 
 
 EXPECT FAILURE "typedef.tests 5":
-module com { module sun { module star { module uno {
-    interface XInterface { void acquire(); };
-}; }; }; };
 typedef long T1;
 typedef T1 T2;
 interface Interface: T2 {};