Skip to content

Commit e9bc46a

Browse files
miyakowilsonmiyakowilson
committed
Refactor VisiblityTest, Add to test protected, Add not passing test cases in visibility_not_passing.
1 parent 830b019 commit e9bc46a

59 files changed

Lines changed: 1050 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,27 @@ package VisibilityPackage {
77
public class c_Public{
88
private class c_private{}
99
public class c_public{}
10+
protected class c_protected{}
1011
}
1112

1213
public class c_Public_alias{
1314
public class c_public{}
1415
private class alias_private is c_public;
16+
protected class alias_protected is c_public;
1517
public class alias_public is c_public;
1618
}
1719

1820
private class c_Private_alias{
1921
public class c_public{}
2022
private class alias_private is c_public;
23+
protected class alias_protected is c_public;
2124
public class alias_public is c_public;
2225
}
2326

2427
public class c_clazz{
2528
protected class c_Protect{
2629
public class c_publicc{}
30+
protected class c_protect{}
2731
}
2832
packaged class c_Package{
2933
public class c_publicc{}
@@ -32,6 +36,7 @@ package VisibilityPackage {
3236
public class c_Public{
3337
protected class c_protect{}
3438
packaged class c_packagee{}
39+
public class c_publicc{}
3540
}
3641
}
3742
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.omg.sysml.xpect.tests.scoping.SysMLScopingTest;
1313
import org.omg.sysml.xpect.tests.testsuite.SysMLXtextTest;
1414
import org.omg.sysml.xpect.tests.validation.SysMLValidationTest;
15+
import org.omg.sysml.xpect.tests.visibility.SysMLVisibilityTest;
1516

1617
@SuiteClasses({ SysMLLinkingTest.class, //
1718
SysMLGeneratorTest.class, //
@@ -22,7 +23,8 @@
2223
SysMLScopingTest.class, //
2324
SysMLXtextTest.class, //
2425
SysMLValidationTest.class, //
25-
SysMLQueryTest.class
26+
SysMLQueryTest.class,
27+
SysMLVisibilityTest.class
2628
})
2729
@RunWith(Suite.class)
2830
public class AllSysMLXpectTests {

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/imports/global/DependencyVisibilityPackage.alf.xt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ package Test3{
2929
VisibilityPackage.c_Public_alias.alias_public,
3030
VisibilityPackage.c_Public_alias.c_public,
3131
VisibilityPackage.c_clazz,
32-
VisibilityPackage.c_clazz.c_Public
32+
VisibilityPackage.c_clazz.c_Public,
33+
VisibilityPackage.c_clazz.c_Public.c_publicc
3334
--- */
3435
import VisibilityPackage::c_Public;
3536
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_ImportAsFeatureInheritance.alf.xt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ package Classes {
2626
c_Public, c_Public.c_public, Classes.c_Public, Classes.c_Public.c_public,
2727
VisibilityPackage.c_Public_alias.alias_public,
2828
VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias, VisibilityPackage.c_Public_alias.c_public,
29-
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public,
29+
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_clazz.c_Public.c_publicc
3030

3131
--- */
3232
class Try specializes c_Public {
@@ -38,7 +38,7 @@ package Classes {
3838
c_Public, c_Public.c_public, Classes.c_Public, Classes.c_Public.c_public,
3939
VisibilityPackage.c_Public_alias.alias_public,
4040
VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias, VisibilityPackage.c_Public_alias.c_public,
41-
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public,
41+
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_clazz.c_Public.c_publicc
4242
--- */
4343
feature feature4 : c_public;
4444
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_ImportAsFeatureInheritanceAlias.alf.xt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package Classes {
2525
Classes.Try, Classes.Try.c_public, Classes.aliass, Classes.aliass.c_public,
2626
Try, Try.c_public, aliass, aliass.c_public,
2727
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
28-
VisibilityPackage.c_Public_alias,
28+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
2929
--- */
3030
class Try specializes aliass{
3131
//XPECT linkedName at c_public --> VisibilityPackage.c_Public.c_public
@@ -34,7 +34,7 @@ package Classes {
3434
Classes.Try, Classes.Try.c_public, Classes.aliass, Classes.aliass.c_public,
3535
Try, Try.c_public, aliass, aliass.c_public,
3636
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
37-
VisibilityPackage.c_Public_alias,
37+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
3838
--- */
3939
feature feature4 : c_public;
4040
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_ImportClassAndUseAlias2.alf.xt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ package Classes {
2222
import VisibilityPackage::*;
2323
//XPECT linkedName at c_Public_alias::alias_public --> VisibilityPackage.c_Public_alias.c_public
2424
//* XPECT scope at c_Public_alias::alias_public ---
25-
c_Public_alias, c_Public_alias.alias_public, c_Public_alias.c_public, c_clazz,
26-
c_clazz.c_Public, f, c_Public, c_Public.c_public,
27-
Classes.c_Public, Classes.c_Public.c_public, Classes.c_Public_alias, Classes.c_Public_alias.alias_public, Classes.c_Public_alias.c_public, Classes.c_clazz, Classes.c_clazz.c_Public, Classes.f,
28-
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public,
29-
VisibilityPackage.c_Public_alias, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
25+
Classes.c_Public, Classes.c_Public.c_public, Classes.c_Public_alias,
26+
Classes.c_Public_alias.alias_public, Classes.c_Public_alias.c_public, Classes.c_clazz, Classes.c_clazz.c_Public,
27+
Classes.c_clazz.c_Public.c_publicc, Classes.f, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public,
28+
VisibilityPackage.c_Public_alias, VisibilityPackage.c_Public_alias.alias_public,
29+
VisibilityPackage.c_Public_alias.c_public, VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public,
30+
VisibilityPackage.c_clazz.c_Public.c_publicc, c_Public, c_Public.c_public, c_Public_alias, c_Public_alias.alias_public,
31+
c_Public_alias.c_public, c_clazz, c_clazz.c_Public, c_clazz.c_Public.c_publicc, f
3032
--- */
3133
feature f : c_Public_alias::alias_public;
3234
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_PublicImportAsFeature.alf.xt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ package Classes {
3232
c_Public, c_Public.c_public, c_public,
3333
feature4, featurepublic,
3434
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
35-
VisibilityPackage.c_Public_alias,
35+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
3636
--- */
3737
feature feature4 : c_public;
3838
//XPECT linkedName at c_Public --> VisibilityPackage.c_Public
@@ -44,7 +44,7 @@ package Classes {
4444
c_Public, c_Public.c_public, c_public,
4545
feature4, featurepublic,
4646
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
47-
VisibilityPackage.c_Public_alias,
47+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
4848
--- */
4949
feature featurepublic : c_Public;
5050
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_PublicImportAsFeatureAlias.alf.xt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package Classes {
3030
Try.feature4, Try.featurepublic,
3131
Try, Classes.Aliass, Classes.Aliass.c_public, Classes.Try, Classes.Try.feature4, Classes.Try.featurepublic, Classes.aliass,
3232
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
33-
VisibilityPackage.c_Public_alias,
33+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
3434
--- */
3535
//XPECT linkedName at aliass --> VisibilityPackage.c_Public.c_public
3636
feature feature4 : aliass;
@@ -42,7 +42,7 @@ package Classes {
4242
Try.feature4, Try.featurepublic,
4343
Try, Classes.Aliass, Classes.Aliass.c_public, Classes.Try, Classes.Try.feature4, Classes.Try.featurepublic, Classes.aliass,
4444
VisibilityPackage.c_clazz, VisibilityPackage.c_clazz.c_Public, VisibilityPackage.c_Public, VisibilityPackage.c_Public.c_public, VisibilityPackage.c_Public_alias.alias_public, VisibilityPackage.c_Public_alias.c_public,
45-
VisibilityPackage.c_Public_alias,
45+
VisibilityPackage.c_Public_alias,VisibilityPackage.c_clazz.c_Public.c_publicc
4646
--- */
4747
feature featurepublic : Aliass;
4848
}

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/testsuite/VisibilityTests_PublicPackImport.alf.xt‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,7 @@ package Test3{
3333
VisibilityPackage.c_Public_alias.c_public,
3434
VisibilityPackage.c_clazz,
3535
VisibilityPackage.c_clazz.c_Public,
36-
37-
38-
36+
VisibilityPackage.c_clazz.c_Public.c_publicc
3937
--- */
4038
feature f : c_public;
4139
}
42-
//*
43-
for DependencyVisibilityPackage.alf
44-
Current globalscope implementation includes the below in the globalscope, but they should not be.
45-
VisibilityPackage.c_clazz.c_Package,
46-
VisibilityPackage.c_clazz.c_Package.c_publicc,
47-
VisibilityPackage.c_clazz.c_Public.c_packagee,
48-
VisibilityPackage.c_Private_alias.alias_public,
49-
VisibilityPackage.c_Private,
50-
VisibilityPackage.c_Private.c_private,
51-
VisibilityPackage.c_Private.c_public,
52-
VisibilityPackage.c_Private_alias,
53-
VisibilityPackage.c_Private_alias.c_public,
54-
VisibilityPackage.c_Public.c_private,
55-
VisibilityPackage.c_clazz.c_Protect,
56-
VisibilityPackage.c_clazz.c_Protect.c_publicc,
57-
VisibilityPackage.c_clazz.c_Public.c_protect,
58-
Base.Anything, Base.BehaviorOccurrence, Base.BinaryLink, Base.BinaryLink.linkage, Base.BinaryLink.participant, Base.BinaryLink.sourceEnd, Base.BinaryLink.sourceParticipant, Base.BinaryLink.targetEnd, Base.BinaryLink.targetParticipant, Base.EnumeratedValue, Base.FunctionEvaluation, Base.Link, Base.Link.participant, Base.LiteralEvaluation, Base.NullEvaluation, Base.Object, Base.Occurrence, Base.SelfLink, Base.SelfLink.myself, Base.SelfLink.self, Base.SelfLink.sourceParticipant, Base.SelfLink.targetParticipant, Base.Value, Base.behaviorOccurrences, Base.binaryLinks, Base.functionEvaluations, Base.links, Base.literalEvaluations, Base.nullEvaluations, Base.objects, Base.selfLinks, Base.things, Base.values,
59-
*/

‎org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/VisibilityTests_Import3.alf.xt‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)