diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee')
3 files changed, 53 insertions, 53 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtilTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtilTest.java index 5cf26bf9187..525f27beec5 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtilTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtilTest.java @@ -166,7 +166,8 @@ public class ModelUtilTest { } private static void modelEquals(String rawExpected, String actual) { - String expected = rawExpected.replaceAll("\n", System.getProperty("line.separator")); - Assert.assertEquals(expected, actual); + String expected = rawExpected.replaceAll("[\r\n]", ""); + String actualactual = actual.replaceAll("[\r\n]", ""); + Assert.assertEquals(expected, actualactual); } } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testAccessModel.osee b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testAccessModel.osee index 61e709c3c45..73b4576e236 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testAccessModel.osee +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testAccessModel.osee @@ -1,9 +1,9 @@ -attributeType "Qualification Method" extends StringAttribute { - id 1152921504606847062 - dataProvider DefaultAttributeDataProvider - min 0 - max 1 - defaultValue "test" +artifactType "Artifact" { + id 1 +} + +artifactType "Software Requirement" extends "Artifact" { + id 2 } relationType "Requirement Relation" { @@ -16,16 +16,20 @@ relationType "Requirement Relation" { multiplicity ONE_TO_MANY } -artifactType "Artifact" { - id 1 -} - -artifactType "Software Requirement" extends "Artifact" { - id 2 +attributeType "Qualification Method" extends StringAttribute { + id 1152921504606847062 + dataProvider DefaultAttributeDataProvider + min 0 + max 1 + defaultValue "test" } +artifactMatcher "Software Items" where artifactId EQ "AAMFEcWy0xc4e3tcem99"; +artifactMatcher "Systems" where branchName LIKE "\\w+"; +artifactMatcher "SubSystems" where artifactName EQ "xx"; accessContext "System Context" { guid "AAMFEcWy0xc4e3tcem11"; + DENY edit artifactType "Artifact"; childrenOf "Software Items" { DENY edit artifactType "Artifact"; } @@ -38,7 +42,6 @@ accessContext "System Context" { DENY edit artifactType "Artifact"; } - DENY edit artifactType "Artifact"; } accessContext "subsystem.requirement.writer" extends "System Context" { @@ -47,8 +50,4 @@ accessContext "subsystem.requirement.writer" extends "System Context" { ALLOW edit attributeType "Qualification Method" of artifactType "Software Requirement"; ALLOW edit attributeType "Qualification Method" of artifactType "Software Requirement"; DENY edit relationType "Requirement Relation" SIDE_A; -} - -artifactMatcher "Software Items" where artifactId EQ "AAMFEcWy0xc4e3tcem99"; -artifactMatcher "Systems" where branchName LIKE "\\w+"; -artifactMatcher "SubSystems" where artifactName EQ "xx";
\ No newline at end of file +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testTypeModel.osee b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testTypeModel.osee index 576875f338d..4d11e1c869a 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testTypeModel.osee +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/testTypeModel.osee @@ -1,3 +1,36 @@ +artifactType "Artifact" { + id 1 + attribute "Name" + attribute "Annotation" +} + +abstract artifactType "Requirement" extends "Artifact" { + id 21 + attribute "WordML" +} + +artifactType "Software Requirement" extends "Requirement" { + id 24 +} + +artifactType "System Requirement" extends "Requirement" { + id 30 +} + +artifactType "SubSystem Requirement" extends "Requirement" { + id 29 +} + +relationType "Requirement Relation" { + id 2305843009213694295 + sideAName "requirement-sideA" + sideAArtifactType "Requirement" + sideBName "subsystem-sideB" + sideBArtifactType "SubSystem Requirement" + defaultOrderType Lexicographical_Ascending + multiplicity ONE_TO_MANY +} + attributeType "Name" extends StringAttribute { id 1152921504606847088 dataProvider DefaultAttributeDataProvider @@ -29,37 +62,4 @@ attributeType "WordML" extends WordAttribute { defaultValue "<w:p xmlns:w=\"http://schemas.microsoft.com/office/word/2003/wordml\"><w:r><w:t></w:t></w:r></w:p>" fileExtension "xml" mediaType "application/msword" -} - -relationType "Requirement Relation" { - id 2305843009213694295 - sideAName "requirement-sideA" - sideAArtifactType "Requirement" - sideBName "subsystem-sideB" - sideBArtifactType "SubSystem Requirement" - defaultOrderType Lexicographical_Ascending - multiplicity ONE_TO_MANY -} - -artifactType "Artifact" { - id 1 - attribute "Name" - attribute "Annotation" -} - -abstract artifactType "Requirement" extends "Artifact" { - id 21 - attribute "WordML" -} - -artifactType "Software Requirement" extends "Requirement" { - id 24 -} - -artifactType "System Requirement" extends "Requirement" { - id 30 -} - -artifactType "SubSystem Requirement" extends "Requirement" { - id 29 }
\ No newline at end of file |