Merge pull request #68 from ModelDriven/ST6RI-41

ST6RI-41 Textual notation name resolution

Author: seidewitz

org.omg.sysml.xpect.tests/src/DependencyVisibilityPackage.alf

@@ -7,23 +7,27 @@ package VisibilityPackage {
 			public class c_Public{
 				private class c_private{}
 				public class c_public{}
+				protected class c_protected{}
 			}
 
 			public class c_Public_alias{
 				public class c_public{}
 				private class alias_private is c_public; 
+				protected class alias_protected is c_public;
 				public class alias_public is c_public;
 			}
 
 			private class c_Private_alias{
 				public class c_public{}
 				private class alias_private is c_public; 
+				protected class alias_protected is c_public;
 				public class alias_public is c_public;
 			}
 
 			public class c_clazz{
 				protected class c_Protect{
 					public class c_publicc{}
+					protected class c_protect{}
 				}
 				packaged class c_Package{
 					public class c_publicc{}
@@ -32,6 +36,7 @@ package VisibilityPackage {
 				public class c_Public{
 					protected class c_protect{}
 					packaged class c_packagee{}
+					public class c_publicc{}
 				}
 			}
 		}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/AllSysMLXpectTests.java

@@ -12,6 +12,7 @@
 import org.omg.sysml.xpect.tests.scoping.SysMLScopingTest;
 import org.omg.sysml.xpect.tests.testsuite.SysMLXtextTest;
 import org.omg.sysml.xpect.tests.validation.SysMLValidationTest;
+import org.omg.sysml.xpect.tests.visibility.SysMLVisibilityTest;
 
 @SuiteClasses({ SysMLLinkingTest.class, //
 		SysMLGeneratorTest.class, //
@@ -22,7 +23,8 @@
 		SysMLScopingTest.class, //
 		SysMLXtextTest.class, //
 		SysMLValidationTest.class, //
-		SysMLQueryTest.class
+		SysMLQueryTest.class,
+		SysMLVisibilityTest.class
 })
 @RunWith(Suite.class)
 public class AllSysMLXpectTests {

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/failing/MemberNameTests_MultipleInheritance_nestedScopeLinkingTest.alf.xt

@@ -1,57 +1,63 @@
-//* 
-XPECT_SETUP org.omg.sysml.xpect.tests.testsuite.SysMLXtextTest
-	ResourceSet {
-		ThisFile {}
-		File {from ="/library/Base.alf"}
-	}
-	Workspace {
-		JavaProject {
-			SrcFolder {
-				ThisFile {}
-				File {from ="/library/Base.alf"}
-			}
-		}
-	}
-END_SETUP 
-*/
-//The linking/scoping tests for "b" pass but not "a"
-//"a" causes Rnti
-
-//XPECT noErrors ---> ""
-package test{
-	class A{
-		class a {}
-		class AA {}
-		class xx {}
-	}
-	class B specializes A {
-//pass
-		//XPECT linkedName at A::a --> test.A.a
-		class b specializes A::a {}
-//fail  java.lang.RuntimeException: Error creating value for argument org.eclipse.xpect.xtext.lib.tests.LinkingTest.linkedName(..., ICrossEReferenceAndEObject arg1)
-//Caused by: java.lang.RuntimeException: no EStructuralFeature found at '...\n	--- */\n		cl|ass b1 specia...'
-		//XPECT linkedName at a --> test.A.a
-		class b1 specializes a{}
-//pass
-		//XPECT linkedName at A::AA --> test.A.AA
-//pass
-		class b2 specializes A::AA{}
-		//XPECT linkedName at AA --> test.A.AA
-		class b3 specializes AA{}
-	}
-	class C specializes B{
-//fail
-		//XPECT linkedName at a --> test.A.a
-		class c0 specializes a {}
-//pass
-		//XPECT linkedName at b --> test.B.b
-		class c1 specializes b {}
-//pass
-		//XPECT linkedName at b1 --> test.B.b1
-		class c2 specializes b1{}
-//pass		
-		//XPECT linkedName at AA --> test.A.AA
-		class c3 specializes AA{}
-	}
-	class D specializes A::xx{} 
-}
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.testsuite.SysMLXtextTest
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library/Base.alf"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library/Base.alf"}
+			}
+		}
+	}
+END_SETUP 
+*/
+//X P E C T bug?????????
+//The linking/scoping tests for "b" pass but not "a"
+//"a" causes Rnti
+
+//XPECT noErrors ---> ""
+package test{
+	class A{
+		class a {}
+		class AA {}
+		class xx {}
+		class aa{}
+	}
+	
+	class B specializes A {
+//pass 0		
+		//XPECT linkedName at aa --> test.A.aa
+	class b4 specializes aa{}	
+//pass 2
+		//XPECT linkedName at A::a --> test.A.a
+		class b specializes A::a {}
+//fail  2 - java.lang.RuntimeException: Error creating value for argument org.eclipse.xpect.xtext.lib.tests.LinkingTest.linkedName(..., ICrossEReferenceAndEObject arg1)
+//Caused by: java.lang.RuntimeException: no EStructuralFeature found at '...\n	--- */\n		cl|ass b1 specia...'
+		//XPECT linkedName at a --> test.A.a
+		class b1 specializes a{}
+//pass 3
+		//XPECT linkedName at A::AA --> test.A.AA
+//pass 4
+		class b2 specializes A::AA{}
+		//XPECT linkedName at AA --> test.A.AA
+		class b3 specializes AA{}
+	}
+	class C specializes B{
+//fail 5
+		//XPECT linkedName at a --> test.A.a
+		class c0 specializes a {}
+//pass 6
+		//XPECT linkedName at b --> test.B.b
+		class c1 specializes b {}
+//pass 7
+		//XPECT linkedName at b1 --> test.B.b1
+		class c2 specializes b1{}
+//pass	8	
+		//XPECT linkedName at AA --> test.A.AA
+		class c3 specializes AA{}
+	}
+	class D specializes A::xx{} 
+}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/failing/ParsingTests_BadScopeWithOnlyTwoDot.alf.xt

@@ -29,7 +29,8 @@ package Test3{
 	    VisibilityPackage.c_Public_alias.alias_public, 
 	    VisibilityPackage.c_Public_alias.c_public, 
 	    VisibilityPackage.c_clazz,
-	    VisibilityPackage.c_clazz.c_Public
+	    VisibilityPackage.c_clazz.c_Public,
+	    VisibilityPackage.c_clazz.c_Public.c_publicc
 	--- */
 	import VisibilityPackage::c_Public;
 }